]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.1.3-201507261932.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.1.3-201507261932.patch
CommitLineData
257b0f43
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 6726139..c825c0a 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1223,6 +1223,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@@ -2333,6 +2340,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@@ -2631,6 +2642,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/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
376index c831001..1bfbbf6 100644
377--- a/Documentation/sysctl/kernel.txt
378+++ b/Documentation/sysctl/kernel.txt
379@@ -41,6 +41,7 @@ show up in /proc/sys/kernel:
380 - kptr_restrict
381 - kstack_depth_to_print [ X86 only ]
382 - l2cr [ PPC only ]
383+- modify_ldt [ X86 only ]
384 - modprobe ==> Documentation/debugging-modules.txt
385 - modules_disabled
386 - msg_next_id [ sysv ipc ]
387@@ -391,6 +392,20 @@ This flag controls the L2 cache of G3 processor boards. If
388
389 ==============================================================
390
391+modify_ldt: (X86 only)
392+
393+Enables (1) or disables (0) the modify_ldt syscall. Modifying the LDT
394+(Local Descriptor Table) may be needed to run a 16-bit or segmented code
395+such as Dosemu or Wine. This is done via a system call which is not needed
396+to run portable applications, and which can sometimes be abused to exploit
397+some weaknesses of the architecture, opening new vulnerabilities.
398+
399+This sysctl allows one to increase the system's security by disabling the
400+system call, or to restore compatibility with specific applications when it
401+was already disabled.
402+
403+==============================================================
404+
405 modules_disabled:
406
407 A toggle value indicating if modules are allowed to be loaded
408diff --git a/Makefile b/Makefile
409index e3cdec4..56ae73d 100644
410--- a/Makefile
411+++ b/Makefile
412@@ -299,7 +299,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
413 HOSTCC = gcc
414 HOSTCXX = g++
415 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
416-HOSTCXXFLAGS = -O2
417+HOSTCFLAGS = -W -Wno-unused-parameter -Wno-missing-field-initializers -fno-delete-null-pointer-checks
418+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
419+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
420
421 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
422 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
423@@ -444,8 +446,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
424 # Rules shared between *config targets and build targets
425
426 # Basic helpers built in scripts/
427-PHONY += scripts_basic
428-scripts_basic:
429+PHONY += scripts_basic gcc-plugins
430+scripts_basic: gcc-plugins
431 $(Q)$(MAKE) $(build)=scripts/basic
432 $(Q)rm -f .tmp_quiet_recordmcount
433
434@@ -620,6 +622,74 @@ endif
435 # Tell gcc to never replace conditional load with a non-conditional one
436 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
437
438+ifndef DISABLE_PAX_PLUGINS
439+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
440+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
441+else
442+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
443+endif
444+ifneq ($(PLUGINCC),)
445+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
446+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
447+endif
448+ifdef CONFIG_PAX_MEMORY_STACKLEAK
449+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
450+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
451+endif
452+ifdef CONFIG_KALLOCSTAT_PLUGIN
453+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
454+endif
455+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
456+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
457+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
458+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
459+endif
460+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
461+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
462+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
463+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
464+endif
465+endif
466+ifdef CONFIG_CHECKER_PLUGIN
467+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
468+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
469+endif
470+endif
471+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
472+ifdef CONFIG_PAX_SIZE_OVERFLOW
473+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
474+endif
475+ifdef CONFIG_PAX_LATENT_ENTROPY
476+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
477+endif
478+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
479+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
480+endif
481+INITIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/initify_plugin.so -DINITIFY_PLUGIN
482+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
483+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
484+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
485+GCC_PLUGINS_CFLAGS += $(INITIFY_PLUGIN_CFLAGS)
486+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
487+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
488+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
489+ifeq ($(KBUILD_EXTMOD),)
490+gcc-plugins:
491+ $(Q)$(MAKE) $(build)=tools/gcc
492+else
493+gcc-plugins: ;
494+endif
495+else
496+gcc-plugins:
497+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
498+ $(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.))
499+else
500+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
501+endif
502+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
503+endif
504+endif
505+
506 ifdef CONFIG_READABLE_ASM
507 # Disable optimizations that make assembler listings hard to read.
508 # reorder blocks reorders the control in the function
509@@ -712,7 +782,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
510 else
511 KBUILD_CFLAGS += -g
512 endif
513-KBUILD_AFLAGS += -Wa,-gdwarf-2
514+KBUILD_AFLAGS += -Wa,--gdwarf-2
515 endif
516 ifdef CONFIG_DEBUG_INFO_DWARF4
517 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
518@@ -883,7 +953,7 @@ export mod_sign_cmd
519
520
521 ifeq ($(KBUILD_EXTMOD),)
522-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
523+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
524
525 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
526 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
527@@ -933,6 +1003,8 @@ endif
528
529 # The actual objects are generated when descending,
530 # make sure no implicit rule kicks in
531+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
532+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
533 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
534
535 # Handle descending into subdirectories listed in $(vmlinux-dirs)
536@@ -942,7 +1014,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
537 # Error messages still appears in the original language
538
539 PHONY += $(vmlinux-dirs)
540-$(vmlinux-dirs): prepare scripts
541+$(vmlinux-dirs): gcc-plugins prepare scripts
542 $(Q)$(MAKE) $(build)=$@
543
544 define filechk_kernel.release
545@@ -985,10 +1057,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
546
547 archprepare: archheaders archscripts prepare1 scripts_basic
548
549+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
550+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
551 prepare0: archprepare FORCE
552 $(Q)$(MAKE) $(build)=.
553
554 # All the preparing..
555+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
556 prepare: prepare0
557
558 # Generate some files
559@@ -1096,6 +1171,8 @@ all: modules
560 # using awk while concatenating to the final file.
561
562 PHONY += modules
563+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
564+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
565 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
566 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
567 @$(kecho) ' Building modules, stage 2.';
568@@ -1111,7 +1188,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
569
570 # Target to prepare building external modules
571 PHONY += modules_prepare
572-modules_prepare: prepare scripts
573+modules_prepare: gcc-plugins prepare scripts
574
575 # Target to install modules
576 PHONY += modules_install
577@@ -1177,7 +1254,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
578 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
579 signing_key.priv signing_key.x509 x509.genkey \
580 extra_certificates signing_key.x509.keyid \
581- signing_key.x509.signer vmlinux-gdb.py
582+ signing_key.x509.signer vmlinux-gdb.py \
583+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
584+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
585+ tools/gcc/randomize_layout_seed.h
586
587 # clean - Delete most, but leave enough to build external modules
588 #
589@@ -1216,7 +1296,7 @@ distclean: mrproper
590 @find $(srctree) $(RCS_FIND_IGNORE) \
591 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
592 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
593- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
594+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
595 -type f -print | xargs rm -f
596
597
598@@ -1382,6 +1462,8 @@ PHONY += $(module-dirs) modules
599 $(module-dirs): crmodverdir $(objtree)/Module.symvers
600 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
601
602+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
603+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
604 modules: $(module-dirs)
605 @$(kecho) ' Building modules, stage 2.';
606 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
607@@ -1522,17 +1604,21 @@ else
608 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
609 endif
610
611-%.s: %.c prepare scripts FORCE
612+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
613+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
614+%.s: %.c gcc-plugins prepare scripts FORCE
615 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
616 %.i: %.c prepare scripts FORCE
617 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
618-%.o: %.c prepare scripts FORCE
619+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
620+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
621+%.o: %.c gcc-plugins prepare scripts FORCE
622 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
623 %.lst: %.c prepare scripts FORCE
624 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
625-%.s: %.S prepare scripts FORCE
626+%.s: %.S gcc-plugins prepare scripts FORCE
627 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
628-%.o: %.S prepare scripts FORCE
629+%.o: %.S gcc-plugins prepare scripts FORCE
630 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
631 %.symtypes: %.c prepare scripts FORCE
632 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
633@@ -1544,11 +1630,15 @@ endif
634 $(build)=$(build-dir)
635 # Make sure the latest headers are built for Documentation
636 Documentation/: headers_install
637-%/: prepare scripts FORCE
638+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
639+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
640+%/: gcc-plugins prepare scripts FORCE
641 $(cmd_crmodverdir)
642 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
643 $(build)=$(build-dir)
644-%.ko: prepare scripts FORCE
645+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
646+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
647+%.ko: gcc-plugins prepare scripts FORCE
648 $(cmd_crmodverdir)
649 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
650 $(build)=$(build-dir) $(@:.ko=.o)
651diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
652index 8f8eafb..3405f46 100644
653--- a/arch/alpha/include/asm/atomic.h
654+++ b/arch/alpha/include/asm/atomic.h
655@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
656 #define atomic_dec(v) atomic_sub(1,(v))
657 #define atomic64_dec(v) atomic64_sub(1,(v))
658
659+#define atomic64_read_unchecked(v) atomic64_read(v)
660+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
661+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
662+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
663+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
664+#define atomic64_inc_unchecked(v) atomic64_inc(v)
665+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
666+#define atomic64_dec_unchecked(v) atomic64_dec(v)
667+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
668+
669 #endif /* _ALPHA_ATOMIC_H */
670diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
671index ad368a9..fbe0f25 100644
672--- a/arch/alpha/include/asm/cache.h
673+++ b/arch/alpha/include/asm/cache.h
674@@ -4,19 +4,19 @@
675 #ifndef __ARCH_ALPHA_CACHE_H
676 #define __ARCH_ALPHA_CACHE_H
677
678+#include <linux/const.h>
679
680 /* Bytes per L1 (data) cache line. */
681 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
682-# define L1_CACHE_BYTES 64
683 # define L1_CACHE_SHIFT 6
684 #else
685 /* Both EV4 and EV5 are write-through, read-allocate,
686 direct-mapped, physical.
687 */
688-# define L1_CACHE_BYTES 32
689 # define L1_CACHE_SHIFT 5
690 #endif
691
692+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
693 #define SMP_CACHE_BYTES L1_CACHE_BYTES
694
695 #endif
696diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
697index 968d999..d36b2df 100644
698--- a/arch/alpha/include/asm/elf.h
699+++ b/arch/alpha/include/asm/elf.h
700@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
701
702 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
703
704+#ifdef CONFIG_PAX_ASLR
705+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
706+
707+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
708+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
709+#endif
710+
711 /* $0 is set by ld.so to a pointer to a function which might be
712 registered using atexit. This provides a mean for the dynamic
713 linker to call DT_FINI functions for shared libraries that have
714diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
715index aab14a0..b4fa3e7 100644
716--- a/arch/alpha/include/asm/pgalloc.h
717+++ b/arch/alpha/include/asm/pgalloc.h
718@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
719 pgd_set(pgd, pmd);
720 }
721
722+static inline void
723+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
724+{
725+ pgd_populate(mm, pgd, pmd);
726+}
727+
728 extern pgd_t *pgd_alloc(struct mm_struct *mm);
729
730 static inline void
731diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
732index a9a1195..e9b8417 100644
733--- a/arch/alpha/include/asm/pgtable.h
734+++ b/arch/alpha/include/asm/pgtable.h
735@@ -101,6 +101,17 @@ struct vm_area_struct;
736 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
737 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
738 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
739+
740+#ifdef CONFIG_PAX_PAGEEXEC
741+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
742+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
743+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
744+#else
745+# define PAGE_SHARED_NOEXEC PAGE_SHARED
746+# define PAGE_COPY_NOEXEC PAGE_COPY
747+# define PAGE_READONLY_NOEXEC PAGE_READONLY
748+#endif
749+
750 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
751
752 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
753diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
754index 2fd00b7..cfd5069 100644
755--- a/arch/alpha/kernel/module.c
756+++ b/arch/alpha/kernel/module.c
757@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
758
759 /* The small sections were sorted to the end of the segment.
760 The following should definitely cover them. */
761- gp = (u64)me->module_core + me->core_size - 0x8000;
762+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
763 got = sechdrs[me->arch.gotsecindex].sh_addr;
764
765 for (i = 0; i < n; i++) {
766diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
767index 36dc91a..6769cb0 100644
768--- a/arch/alpha/kernel/osf_sys.c
769+++ b/arch/alpha/kernel/osf_sys.c
770@@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
771 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
772
773 static unsigned long
774-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
775- unsigned long limit)
776+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
777+ unsigned long limit, unsigned long flags)
778 {
779 struct vm_unmapped_area_info info;
780+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
781
782 info.flags = 0;
783 info.length = len;
784@@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
785 info.high_limit = limit;
786 info.align_mask = 0;
787 info.align_offset = 0;
788+ info.threadstack_offset = offset;
789 return vm_unmapped_area(&info);
790 }
791
792@@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
793 merely specific addresses, but regions of memory -- perhaps
794 this feature should be incorporated into all ports? */
795
796+#ifdef CONFIG_PAX_RANDMMAP
797+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
798+#endif
799+
800 if (addr) {
801- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
802+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
803 if (addr != (unsigned long) -ENOMEM)
804 return addr;
805 }
806
807 /* Next, try allocating at TASK_UNMAPPED_BASE. */
808- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
809- len, limit);
810+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
811+
812 if (addr != (unsigned long) -ENOMEM)
813 return addr;
814
815 /* Finally, try allocating in low memory. */
816- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
817+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
818
819 return addr;
820 }
821diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
822index 9d0ac09..479a962 100644
823--- a/arch/alpha/mm/fault.c
824+++ b/arch/alpha/mm/fault.c
825@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
826 __reload_thread(pcb);
827 }
828
829+#ifdef CONFIG_PAX_PAGEEXEC
830+/*
831+ * PaX: decide what to do with offenders (regs->pc = fault address)
832+ *
833+ * returns 1 when task should be killed
834+ * 2 when patched PLT trampoline was detected
835+ * 3 when unpatched PLT trampoline was detected
836+ */
837+static int pax_handle_fetch_fault(struct pt_regs *regs)
838+{
839+
840+#ifdef CONFIG_PAX_EMUPLT
841+ int err;
842+
843+ do { /* PaX: patched PLT emulation #1 */
844+ unsigned int ldah, ldq, jmp;
845+
846+ err = get_user(ldah, (unsigned int *)regs->pc);
847+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
848+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
849+
850+ if (err)
851+ break;
852+
853+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
854+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
855+ jmp == 0x6BFB0000U)
856+ {
857+ unsigned long r27, addr;
858+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
859+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
860+
861+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
862+ err = get_user(r27, (unsigned long *)addr);
863+ if (err)
864+ break;
865+
866+ regs->r27 = r27;
867+ regs->pc = r27;
868+ return 2;
869+ }
870+ } while (0);
871+
872+ do { /* PaX: patched PLT emulation #2 */
873+ unsigned int ldah, lda, br;
874+
875+ err = get_user(ldah, (unsigned int *)regs->pc);
876+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
877+ err |= get_user(br, (unsigned int *)(regs->pc+8));
878+
879+ if (err)
880+ break;
881+
882+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
883+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
884+ (br & 0xFFE00000U) == 0xC3E00000U)
885+ {
886+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
887+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
888+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
889+
890+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
891+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
892+ return 2;
893+ }
894+ } while (0);
895+
896+ do { /* PaX: unpatched PLT emulation */
897+ unsigned int br;
898+
899+ err = get_user(br, (unsigned int *)regs->pc);
900+
901+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
902+ unsigned int br2, ldq, nop, jmp;
903+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
904+
905+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
906+ err = get_user(br2, (unsigned int *)addr);
907+ err |= get_user(ldq, (unsigned int *)(addr+4));
908+ err |= get_user(nop, (unsigned int *)(addr+8));
909+ err |= get_user(jmp, (unsigned int *)(addr+12));
910+ err |= get_user(resolver, (unsigned long *)(addr+16));
911+
912+ if (err)
913+ break;
914+
915+ if (br2 == 0xC3600000U &&
916+ ldq == 0xA77B000CU &&
917+ nop == 0x47FF041FU &&
918+ jmp == 0x6B7B0000U)
919+ {
920+ regs->r28 = regs->pc+4;
921+ regs->r27 = addr+16;
922+ regs->pc = resolver;
923+ return 3;
924+ }
925+ }
926+ } while (0);
927+#endif
928+
929+ return 1;
930+}
931+
932+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
933+{
934+ unsigned long i;
935+
936+ printk(KERN_ERR "PAX: bytes at PC: ");
937+ for (i = 0; i < 5; i++) {
938+ unsigned int c;
939+ if (get_user(c, (unsigned int *)pc+i))
940+ printk(KERN_CONT "???????? ");
941+ else
942+ printk(KERN_CONT "%08x ", c);
943+ }
944+ printk("\n");
945+}
946+#endif
947
948 /*
949 * This routine handles page faults. It determines the address,
950@@ -133,8 +251,29 @@ retry:
951 good_area:
952 si_code = SEGV_ACCERR;
953 if (cause < 0) {
954- if (!(vma->vm_flags & VM_EXEC))
955+ if (!(vma->vm_flags & VM_EXEC)) {
956+
957+#ifdef CONFIG_PAX_PAGEEXEC
958+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
959+ goto bad_area;
960+
961+ up_read(&mm->mmap_sem);
962+ switch (pax_handle_fetch_fault(regs)) {
963+
964+#ifdef CONFIG_PAX_EMUPLT
965+ case 2:
966+ case 3:
967+ return;
968+#endif
969+
970+ }
971+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
972+ do_group_exit(SIGKILL);
973+#else
974 goto bad_area;
975+#endif
976+
977+ }
978 } else if (!cause) {
979 /* Allow reads even for write-only mappings */
980 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
981diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
982index 45df48b..952017a 100644
983--- a/arch/arm/Kconfig
984+++ b/arch/arm/Kconfig
985@@ -1716,7 +1716,7 @@ config ALIGNMENT_TRAP
986
987 config UACCESS_WITH_MEMCPY
988 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
989- depends on MMU
990+ depends on MMU && !PAX_MEMORY_UDEREF
991 default y if CPU_FEROCEON
992 help
993 Implement faster copy_to_user and clear_user methods for CPU
994@@ -1951,6 +1951,7 @@ config XIP_PHYS_ADDR
995 config KEXEC
996 bool "Kexec system call (EXPERIMENTAL)"
997 depends on (!SMP || PM_SLEEP_SMP)
998+ depends on !GRKERNSEC_KMEM
999 help
1000 kexec is a system call that implements the ability to shutdown your
1001 current kernel, and to start another kernel. It is like a reboot
1002diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
1003index e22c119..abe7041 100644
1004--- a/arch/arm/include/asm/atomic.h
1005+++ b/arch/arm/include/asm/atomic.h
1006@@ -18,17 +18,41 @@
1007 #include <asm/barrier.h>
1008 #include <asm/cmpxchg.h>
1009
1010+#ifdef CONFIG_GENERIC_ATOMIC64
1011+#include <asm-generic/atomic64.h>
1012+#endif
1013+
1014 #define ATOMIC_INIT(i) { (i) }
1015
1016 #ifdef __KERNEL__
1017
1018+#ifdef CONFIG_THUMB2_KERNEL
1019+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
1020+#else
1021+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
1022+#endif
1023+
1024+#define _ASM_EXTABLE(from, to) \
1025+" .pushsection __ex_table,\"a\"\n"\
1026+" .align 3\n" \
1027+" .long " #from ", " #to"\n" \
1028+" .popsection"
1029+
1030 /*
1031 * On ARM, ordinary assignment (str instruction) doesn't clear the local
1032 * strex/ldrex monitor on some implementations. The reason we can use it for
1033 * atomic_set() is the clrex or dummy strex done on every exception return.
1034 */
1035 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1036+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1037+{
1038+ return ACCESS_ONCE(v->counter);
1039+}
1040 #define atomic_set(v,i) (((v)->counter) = (i))
1041+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1042+{
1043+ v->counter = i;
1044+}
1045
1046 #if __LINUX_ARM_ARCH__ >= 6
1047
1048@@ -38,26 +62,50 @@
1049 * to ensure that the update happens.
1050 */
1051
1052-#define ATOMIC_OP(op, c_op, asm_op) \
1053-static inline void atomic_##op(int i, atomic_t *v) \
1054+#ifdef CONFIG_PAX_REFCOUNT
1055+#define __OVERFLOW_POST \
1056+ " bvc 3f\n" \
1057+ "2: " REFCOUNT_TRAP_INSN "\n"\
1058+ "3:\n"
1059+#define __OVERFLOW_POST_RETURN \
1060+ " bvc 3f\n" \
1061+" mov %0, %1\n" \
1062+ "2: " REFCOUNT_TRAP_INSN "\n"\
1063+ "3:\n"
1064+#define __OVERFLOW_EXTABLE \
1065+ "4:\n" \
1066+ _ASM_EXTABLE(2b, 4b)
1067+#else
1068+#define __OVERFLOW_POST
1069+#define __OVERFLOW_POST_RETURN
1070+#define __OVERFLOW_EXTABLE
1071+#endif
1072+
1073+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1074+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1075 { \
1076 unsigned long tmp; \
1077 int result; \
1078 \
1079 prefetchw(&v->counter); \
1080- __asm__ __volatile__("@ atomic_" #op "\n" \
1081+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1082 "1: ldrex %0, [%3]\n" \
1083 " " #asm_op " %0, %0, %4\n" \
1084+ post_op \
1085 " strex %1, %0, [%3]\n" \
1086 " teq %1, #0\n" \
1087-" bne 1b" \
1088+" bne 1b\n" \
1089+ extable \
1090 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1091 : "r" (&v->counter), "Ir" (i) \
1092 : "cc"); \
1093 } \
1094
1095-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1096-static inline int atomic_##op##_return(int i, atomic_t *v) \
1097+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1098+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1099+
1100+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1101+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1102 { \
1103 unsigned long tmp; \
1104 int result; \
1105@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1106 smp_mb(); \
1107 prefetchw(&v->counter); \
1108 \
1109- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1110+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1111 "1: ldrex %0, [%3]\n" \
1112 " " #asm_op " %0, %0, %4\n" \
1113+ post_op \
1114 " strex %1, %0, [%3]\n" \
1115 " teq %1, #0\n" \
1116-" bne 1b" \
1117+" bne 1b\n" \
1118+ extable \
1119 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1120 : "r" (&v->counter), "Ir" (i) \
1121 : "cc"); \
1122@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1123 return result; \
1124 }
1125
1126+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1127+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1128+
1129 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1130 {
1131 int oldval;
1132@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1133 __asm__ __volatile__ ("@ atomic_add_unless\n"
1134 "1: ldrex %0, [%4]\n"
1135 " teq %0, %5\n"
1136-" beq 2f\n"
1137-" add %1, %0, %6\n"
1138+" beq 4f\n"
1139+" adds %1, %0, %6\n"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+" bvc 3f\n"
1143+"2: " REFCOUNT_TRAP_INSN "\n"
1144+"3:\n"
1145+#endif
1146+
1147 " strex %2, %1, [%4]\n"
1148 " teq %2, #0\n"
1149 " bne 1b\n"
1150-"2:"
1151+"4:"
1152+
1153+#ifdef CONFIG_PAX_REFCOUNT
1154+ _ASM_EXTABLE(2b, 4b)
1155+#endif
1156+
1157 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1158 : "r" (&v->counter), "r" (u), "r" (a)
1159 : "cc");
1160@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1161 return oldval;
1162 }
1163
1164+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1165+{
1166+ unsigned long oldval, res;
1167+
1168+ smp_mb();
1169+
1170+ do {
1171+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1172+ "ldrex %1, [%3]\n"
1173+ "mov %0, #0\n"
1174+ "teq %1, %4\n"
1175+ "strexeq %0, %5, [%3]\n"
1176+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1177+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1178+ : "cc");
1179+ } while (res);
1180+
1181+ smp_mb();
1182+
1183+ return oldval;
1184+}
1185+
1186 #else /* ARM_ARCH_6 */
1187
1188 #ifdef CONFIG_SMP
1189 #error SMP not supported on pre-ARMv6 CPUs
1190 #endif
1191
1192-#define ATOMIC_OP(op, c_op, asm_op) \
1193-static inline void atomic_##op(int i, atomic_t *v) \
1194+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1195+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1196 { \
1197 unsigned long flags; \
1198 \
1199@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1200 raw_local_irq_restore(flags); \
1201 } \
1202
1203-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1204-static inline int atomic_##op##_return(int i, atomic_t *v) \
1205+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1206+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1207+
1208+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1209+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1210 { \
1211 unsigned long flags; \
1212 int val; \
1213@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1214 return val; \
1215 }
1216
1217+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1218+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1219+
1220 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1221 {
1222 int ret;
1223@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1224 return ret;
1225 }
1226
1227+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1228+{
1229+ return atomic_cmpxchg((atomic_t *)v, old, new);
1230+}
1231+
1232 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1233 {
1234 int c, old;
1235@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1236
1237 #undef ATOMIC_OPS
1238 #undef ATOMIC_OP_RETURN
1239+#undef __ATOMIC_OP_RETURN
1240 #undef ATOMIC_OP
1241+#undef __ATOMIC_OP
1242
1243 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1244+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1245+{
1246+ return xchg(&v->counter, new);
1247+}
1248
1249 #define atomic_inc(v) atomic_add(1, v)
1250+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1251+{
1252+ atomic_add_unchecked(1, v);
1253+}
1254 #define atomic_dec(v) atomic_sub(1, v)
1255+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1256+{
1257+ atomic_sub_unchecked(1, v);
1258+}
1259
1260 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1261+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1262+{
1263+ return atomic_add_return_unchecked(1, v) == 0;
1264+}
1265 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1266 #define atomic_inc_return(v) (atomic_add_return(1, v))
1267+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1268+{
1269+ return atomic_add_return_unchecked(1, v);
1270+}
1271 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1272 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1273
1274@@ -216,6 +336,14 @@ typedef struct {
1275 long long counter;
1276 } atomic64_t;
1277
1278+#ifdef CONFIG_PAX_REFCOUNT
1279+typedef struct {
1280+ long long counter;
1281+} atomic64_unchecked_t;
1282+#else
1283+typedef atomic64_t atomic64_unchecked_t;
1284+#endif
1285+
1286 #define ATOMIC64_INIT(i) { (i) }
1287
1288 #ifdef CONFIG_ARM_LPAE
1289@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1290 return result;
1291 }
1292
1293+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1294+{
1295+ long long result;
1296+
1297+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1298+" ldrd %0, %H0, [%1]"
1299+ : "=&r" (result)
1300+ : "r" (&v->counter), "Qo" (v->counter)
1301+ );
1302+
1303+ return result;
1304+}
1305+
1306 static inline void atomic64_set(atomic64_t *v, long long i)
1307 {
1308 __asm__ __volatile__("@ atomic64_set\n"
1309@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1310 : "r" (&v->counter), "r" (i)
1311 );
1312 }
1313+
1314+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1315+{
1316+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1317+" strd %2, %H2, [%1]"
1318+ : "=Qo" (v->counter)
1319+ : "r" (&v->counter), "r" (i)
1320+ );
1321+}
1322 #else
1323 static inline long long atomic64_read(const atomic64_t *v)
1324 {
1325@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1326 return result;
1327 }
1328
1329+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1330+{
1331+ long long result;
1332+
1333+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1334+" ldrexd %0, %H0, [%1]"
1335+ : "=&r" (result)
1336+ : "r" (&v->counter), "Qo" (v->counter)
1337+ );
1338+
1339+ return result;
1340+}
1341+
1342 static inline void atomic64_set(atomic64_t *v, long long i)
1343 {
1344 long long tmp;
1345@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1346 : "r" (&v->counter), "r" (i)
1347 : "cc");
1348 }
1349+
1350+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1351+{
1352+ long long tmp;
1353+
1354+ prefetchw(&v->counter);
1355+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1356+"1: ldrexd %0, %H0, [%2]\n"
1357+" strexd %0, %3, %H3, [%2]\n"
1358+" teq %0, #0\n"
1359+" bne 1b"
1360+ : "=&r" (tmp), "=Qo" (v->counter)
1361+ : "r" (&v->counter), "r" (i)
1362+ : "cc");
1363+}
1364 #endif
1365
1366-#define ATOMIC64_OP(op, op1, op2) \
1367-static inline void atomic64_##op(long long i, atomic64_t *v) \
1368+#undef __OVERFLOW_POST_RETURN
1369+#define __OVERFLOW_POST_RETURN \
1370+ " bvc 3f\n" \
1371+" mov %0, %1\n" \
1372+" mov %H0, %H1\n" \
1373+ "2: " REFCOUNT_TRAP_INSN "\n"\
1374+ "3:\n"
1375+
1376+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1377+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1378 { \
1379 long long result; \
1380 unsigned long tmp; \
1381 \
1382 prefetchw(&v->counter); \
1383- __asm__ __volatile__("@ atomic64_" #op "\n" \
1384+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1385 "1: ldrexd %0, %H0, [%3]\n" \
1386 " " #op1 " %Q0, %Q0, %Q4\n" \
1387 " " #op2 " %R0, %R0, %R4\n" \
1388+ post_op \
1389 " strexd %1, %0, %H0, [%3]\n" \
1390 " teq %1, #0\n" \
1391-" bne 1b" \
1392+" bne 1b\n" \
1393+ extable \
1394 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1395 : "r" (&v->counter), "r" (i) \
1396 : "cc"); \
1397 } \
1398
1399-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1400-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1401+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1402+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1403+
1404+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1405+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1406 { \
1407 long long result; \
1408 unsigned long tmp; \
1409@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1410 smp_mb(); \
1411 prefetchw(&v->counter); \
1412 \
1413- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1414+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1415 "1: ldrexd %0, %H0, [%3]\n" \
1416 " " #op1 " %Q0, %Q0, %Q4\n" \
1417 " " #op2 " %R0, %R0, %R4\n" \
1418+ post_op \
1419 " strexd %1, %0, %H0, [%3]\n" \
1420 " teq %1, #0\n" \
1421-" bne 1b" \
1422+" bne 1b\n" \
1423+ extable \
1424 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1425 : "r" (&v->counter), "r" (i) \
1426 : "cc"); \
1427@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1428 return result; \
1429 }
1430
1431+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1432+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1433+
1434 #define ATOMIC64_OPS(op, op1, op2) \
1435 ATOMIC64_OP(op, op1, op2) \
1436 ATOMIC64_OP_RETURN(op, op1, op2)
1437@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1438
1439 #undef ATOMIC64_OPS
1440 #undef ATOMIC64_OP_RETURN
1441+#undef __ATOMIC64_OP_RETURN
1442 #undef ATOMIC64_OP
1443+#undef __ATOMIC64_OP
1444+#undef __OVERFLOW_EXTABLE
1445+#undef __OVERFLOW_POST_RETURN
1446+#undef __OVERFLOW_POST
1447
1448 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1449 long long new)
1450@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1451 return oldval;
1452 }
1453
1454+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1455+ long long new)
1456+{
1457+ long long oldval;
1458+ unsigned long res;
1459+
1460+ smp_mb();
1461+
1462+ do {
1463+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1464+ "ldrexd %1, %H1, [%3]\n"
1465+ "mov %0, #0\n"
1466+ "teq %1, %4\n"
1467+ "teqeq %H1, %H4\n"
1468+ "strexdeq %0, %5, %H5, [%3]"
1469+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1470+ : "r" (&ptr->counter), "r" (old), "r" (new)
1471+ : "cc");
1472+ } while (res);
1473+
1474+ smp_mb();
1475+
1476+ return oldval;
1477+}
1478+
1479 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1480 {
1481 long long result;
1482@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1483 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1484 {
1485 long long result;
1486- unsigned long tmp;
1487+ u64 tmp;
1488
1489 smp_mb();
1490 prefetchw(&v->counter);
1491
1492 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1493-"1: ldrexd %0, %H0, [%3]\n"
1494-" subs %Q0, %Q0, #1\n"
1495-" sbc %R0, %R0, #0\n"
1496+"1: ldrexd %1, %H1, [%3]\n"
1497+" subs %Q0, %Q1, #1\n"
1498+" sbcs %R0, %R1, #0\n"
1499+
1500+#ifdef CONFIG_PAX_REFCOUNT
1501+" bvc 3f\n"
1502+" mov %Q0, %Q1\n"
1503+" mov %R0, %R1\n"
1504+"2: " REFCOUNT_TRAP_INSN "\n"
1505+"3:\n"
1506+#endif
1507+
1508 " teq %R0, #0\n"
1509-" bmi 2f\n"
1510+" bmi 4f\n"
1511 " strexd %1, %0, %H0, [%3]\n"
1512 " teq %1, #0\n"
1513 " bne 1b\n"
1514-"2:"
1515+"4:\n"
1516+
1517+#ifdef CONFIG_PAX_REFCOUNT
1518+ _ASM_EXTABLE(2b, 4b)
1519+#endif
1520+
1521 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1522 : "r" (&v->counter)
1523 : "cc");
1524@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1525 " teq %0, %5\n"
1526 " teqeq %H0, %H5\n"
1527 " moveq %1, #0\n"
1528-" beq 2f\n"
1529+" beq 4f\n"
1530 " adds %Q0, %Q0, %Q6\n"
1531-" adc %R0, %R0, %R6\n"
1532+" adcs %R0, %R0, %R6\n"
1533+
1534+#ifdef CONFIG_PAX_REFCOUNT
1535+" bvc 3f\n"
1536+"2: " REFCOUNT_TRAP_INSN "\n"
1537+"3:\n"
1538+#endif
1539+
1540 " strexd %2, %0, %H0, [%4]\n"
1541 " teq %2, #0\n"
1542 " bne 1b\n"
1543-"2:"
1544+"4:\n"
1545+
1546+#ifdef CONFIG_PAX_REFCOUNT
1547+ _ASM_EXTABLE(2b, 4b)
1548+#endif
1549+
1550 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1551 : "r" (&v->counter), "r" (u), "r" (a)
1552 : "cc");
1553@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1554
1555 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1556 #define atomic64_inc(v) atomic64_add(1LL, (v))
1557+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1558 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1559+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1560 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1561 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1562 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1563+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1564 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1565 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1566 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1567diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1568index d2f81e6..3c4dba5 100644
1569--- a/arch/arm/include/asm/barrier.h
1570+++ b/arch/arm/include/asm/barrier.h
1571@@ -67,7 +67,7 @@
1572 do { \
1573 compiletime_assert_atomic_type(*p); \
1574 smp_mb(); \
1575- ACCESS_ONCE(*p) = (v); \
1576+ ACCESS_ONCE_RW(*p) = (v); \
1577 } while (0)
1578
1579 #define smp_load_acquire(p) \
1580diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1581index 75fe66b..ba3dee4 100644
1582--- a/arch/arm/include/asm/cache.h
1583+++ b/arch/arm/include/asm/cache.h
1584@@ -4,8 +4,10 @@
1585 #ifndef __ASMARM_CACHE_H
1586 #define __ASMARM_CACHE_H
1587
1588+#include <linux/const.h>
1589+
1590 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1591-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1592+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1593
1594 /*
1595 * Memory returned by kmalloc() may be used for DMA, so we must make
1596@@ -24,5 +26,6 @@
1597 #endif
1598
1599 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1600+#define __read_only __attribute__ ((__section__(".data..read_only")))
1601
1602 #endif
1603diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1604index 2d46862..a35415b 100644
1605--- a/arch/arm/include/asm/cacheflush.h
1606+++ b/arch/arm/include/asm/cacheflush.h
1607@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1608 void (*dma_unmap_area)(const void *, size_t, int);
1609
1610 void (*dma_flush_range)(const void *, const void *);
1611-};
1612+} __no_const;
1613
1614 /*
1615 * Select the calling method
1616diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1617index 5233151..87a71fa 100644
1618--- a/arch/arm/include/asm/checksum.h
1619+++ b/arch/arm/include/asm/checksum.h
1620@@ -37,7 +37,19 @@ __wsum
1621 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1622
1623 __wsum
1624-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1625+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1626+
1627+static inline __wsum
1628+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1629+{
1630+ __wsum ret;
1631+ pax_open_userland();
1632+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1633+ pax_close_userland();
1634+ return ret;
1635+}
1636+
1637+
1638
1639 /*
1640 * Fold a partial checksum without adding pseudo headers
1641diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1642index abb2c37..96db950 100644
1643--- a/arch/arm/include/asm/cmpxchg.h
1644+++ b/arch/arm/include/asm/cmpxchg.h
1645@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1646
1647 #define xchg(ptr,x) \
1648 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1649+#define xchg_unchecked(ptr,x) \
1650+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1651
1652 #include <asm-generic/cmpxchg-local.h>
1653
1654diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
1655index 0f84249..8e83c55 100644
1656--- a/arch/arm/include/asm/cpuidle.h
1657+++ b/arch/arm/include/asm/cpuidle.h
1658@@ -32,7 +32,7 @@ struct device_node;
1659 struct cpuidle_ops {
1660 int (*suspend)(int cpu, unsigned long arg);
1661 int (*init)(struct device_node *, int cpu);
1662-};
1663+} __no_const;
1664
1665 struct of_cpuidle_method {
1666 const char *method;
1667diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1668index 6ddbe44..b5e38b1a 100644
1669--- a/arch/arm/include/asm/domain.h
1670+++ b/arch/arm/include/asm/domain.h
1671@@ -48,18 +48,37 @@
1672 * Domain types
1673 */
1674 #define DOMAIN_NOACCESS 0
1675-#define DOMAIN_CLIENT 1
1676 #ifdef CONFIG_CPU_USE_DOMAINS
1677+#define DOMAIN_USERCLIENT 1
1678+#define DOMAIN_KERNELCLIENT 1
1679 #define DOMAIN_MANAGER 3
1680+#define DOMAIN_VECTORS DOMAIN_USER
1681 #else
1682+
1683+#ifdef CONFIG_PAX_KERNEXEC
1684 #define DOMAIN_MANAGER 1
1685+#define DOMAIN_KERNEXEC 3
1686+#else
1687+#define DOMAIN_MANAGER 1
1688+#endif
1689+
1690+#ifdef CONFIG_PAX_MEMORY_UDEREF
1691+#define DOMAIN_USERCLIENT 0
1692+#define DOMAIN_UDEREF 1
1693+#define DOMAIN_VECTORS DOMAIN_KERNEL
1694+#else
1695+#define DOMAIN_USERCLIENT 1
1696+#define DOMAIN_VECTORS DOMAIN_USER
1697+#endif
1698+#define DOMAIN_KERNELCLIENT 1
1699+
1700 #endif
1701
1702 #define domain_val(dom,type) ((type) << (2*(dom)))
1703
1704 #ifndef __ASSEMBLY__
1705
1706-#ifdef CONFIG_CPU_USE_DOMAINS
1707+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1708 static inline void set_domain(unsigned val)
1709 {
1710 asm volatile(
1711@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1712 isb();
1713 }
1714
1715-#define modify_domain(dom,type) \
1716- do { \
1717- struct thread_info *thread = current_thread_info(); \
1718- unsigned int domain = thread->cpu_domain; \
1719- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1720- thread->cpu_domain = domain | domain_val(dom, type); \
1721- set_domain(thread->cpu_domain); \
1722- } while (0)
1723-
1724+extern void modify_domain(unsigned int dom, unsigned int type);
1725 #else
1726 static inline void set_domain(unsigned val) { }
1727 static inline void modify_domain(unsigned dom, unsigned type) { }
1728diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1729index d2315ff..f60b47b 100644
1730--- a/arch/arm/include/asm/elf.h
1731+++ b/arch/arm/include/asm/elf.h
1732@@ -117,7 +117,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1733 the loader. We need to make sure that it is out of the way of the program
1734 that it will "exec", and that there is sufficient room for the brk. */
1735
1736-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1737+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1738+
1739+#ifdef CONFIG_PAX_ASLR
1740+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1741+
1742+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1743+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1744+#endif
1745
1746 /* When the program starts, a1 contains a pointer to a function to be
1747 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1748diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1749index de53547..52b9a28 100644
1750--- a/arch/arm/include/asm/fncpy.h
1751+++ b/arch/arm/include/asm/fncpy.h
1752@@ -81,7 +81,9 @@
1753 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1754 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1755 \
1756+ pax_open_kernel(); \
1757 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1758+ pax_close_kernel(); \
1759 flush_icache_range((unsigned long)(dest_buf), \
1760 (unsigned long)(dest_buf) + (size)); \
1761 \
1762diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1763index 4e78065..f265b48 100644
1764--- a/arch/arm/include/asm/futex.h
1765+++ b/arch/arm/include/asm/futex.h
1766@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1767 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1768 return -EFAULT;
1769
1770+ pax_open_userland();
1771+
1772 smp_mb();
1773 /* Prefetching cannot fault */
1774 prefetchw(uaddr);
1775@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1776 : "cc", "memory");
1777 smp_mb();
1778
1779+ pax_close_userland();
1780+
1781 *uval = val;
1782 return ret;
1783 }
1784@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1785 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1786 return -EFAULT;
1787
1788+ pax_open_userland();
1789+
1790 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1791 "1: " TUSER(ldr) " %1, [%4]\n"
1792 " teq %1, %2\n"
1793@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1794 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1795 : "cc", "memory");
1796
1797+ pax_close_userland();
1798+
1799 *uval = val;
1800 return ret;
1801 }
1802@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1803 return -EFAULT;
1804
1805 pagefault_disable(); /* implies preempt_disable() */
1806+ pax_open_userland();
1807
1808 switch (op) {
1809 case FUTEX_OP_SET:
1810@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1811 ret = -ENOSYS;
1812 }
1813
1814+ pax_close_userland();
1815 pagefault_enable(); /* subsumes preempt_enable() */
1816
1817 if (!ret) {
1818diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1819index 83eb2f7..ed77159 100644
1820--- a/arch/arm/include/asm/kmap_types.h
1821+++ b/arch/arm/include/asm/kmap_types.h
1822@@ -4,6 +4,6 @@
1823 /*
1824 * This is the "bare minimum". AIO seems to require this.
1825 */
1826-#define KM_TYPE_NR 16
1827+#define KM_TYPE_NR 17
1828
1829 #endif
1830diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1831index 9e614a1..3302cca 100644
1832--- a/arch/arm/include/asm/mach/dma.h
1833+++ b/arch/arm/include/asm/mach/dma.h
1834@@ -22,7 +22,7 @@ struct dma_ops {
1835 int (*residue)(unsigned int, dma_t *); /* optional */
1836 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1837 const char *type;
1838-};
1839+} __do_const;
1840
1841 struct dma_struct {
1842 void *addr; /* single DMA address */
1843diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1844index f98c7f3..e5c626d 100644
1845--- a/arch/arm/include/asm/mach/map.h
1846+++ b/arch/arm/include/asm/mach/map.h
1847@@ -23,17 +23,19 @@ struct map_desc {
1848
1849 /* types 0-3 are defined in asm/io.h */
1850 enum {
1851- MT_UNCACHED = 4,
1852- MT_CACHECLEAN,
1853- MT_MINICLEAN,
1854+ MT_UNCACHED_RW = 4,
1855+ MT_CACHECLEAN_RO,
1856+ MT_MINICLEAN_RO,
1857 MT_LOW_VECTORS,
1858 MT_HIGH_VECTORS,
1859- MT_MEMORY_RWX,
1860+ __MT_MEMORY_RWX,
1861 MT_MEMORY_RW,
1862- MT_ROM,
1863- MT_MEMORY_RWX_NONCACHED,
1864+ MT_MEMORY_RX,
1865+ MT_ROM_RX,
1866+ MT_MEMORY_RW_NONCACHED,
1867+ MT_MEMORY_RX_NONCACHED,
1868 MT_MEMORY_RW_DTCM,
1869- MT_MEMORY_RWX_ITCM,
1870+ MT_MEMORY_RX_ITCM,
1871 MT_MEMORY_RW_SO,
1872 MT_MEMORY_DMA_READY,
1873 };
1874diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1875index 563b92f..689d58e 100644
1876--- a/arch/arm/include/asm/outercache.h
1877+++ b/arch/arm/include/asm/outercache.h
1878@@ -39,7 +39,7 @@ struct outer_cache_fns {
1879 /* This is an ARM L2C thing */
1880 void (*write_sec)(unsigned long, unsigned);
1881 void (*configure)(const struct l2x0_regs *);
1882-};
1883+} __no_const;
1884
1885 extern struct outer_cache_fns outer_cache;
1886
1887diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1888index 4355f0e..cd9168e 100644
1889--- a/arch/arm/include/asm/page.h
1890+++ b/arch/arm/include/asm/page.h
1891@@ -23,6 +23,7 @@
1892
1893 #else
1894
1895+#include <linux/compiler.h>
1896 #include <asm/glue.h>
1897
1898 /*
1899@@ -114,7 +115,7 @@ struct cpu_user_fns {
1900 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1901 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1902 unsigned long vaddr, struct vm_area_struct *vma);
1903-};
1904+} __no_const;
1905
1906 #ifdef MULTI_USER
1907 extern struct cpu_user_fns cpu_user;
1908diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1909index 19cfab5..3f5c7e9 100644
1910--- a/arch/arm/include/asm/pgalloc.h
1911+++ b/arch/arm/include/asm/pgalloc.h
1912@@ -17,6 +17,7 @@
1913 #include <asm/processor.h>
1914 #include <asm/cacheflush.h>
1915 #include <asm/tlbflush.h>
1916+#include <asm/system_info.h>
1917
1918 #define check_pgt_cache() do { } while (0)
1919
1920@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1921 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1922 }
1923
1924+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1925+{
1926+ pud_populate(mm, pud, pmd);
1927+}
1928+
1929 #else /* !CONFIG_ARM_LPAE */
1930
1931 /*
1932@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1933 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1934 #define pmd_free(mm, pmd) do { } while (0)
1935 #define pud_populate(mm,pmd,pte) BUG()
1936+#define pud_populate_kernel(mm,pmd,pte) BUG()
1937
1938 #endif /* CONFIG_ARM_LPAE */
1939
1940@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1941 __free_page(pte);
1942 }
1943
1944+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1945+{
1946+#ifdef CONFIG_ARM_LPAE
1947+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1948+#else
1949+ if (addr & SECTION_SIZE)
1950+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1951+ else
1952+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1953+#endif
1954+ flush_pmd_entry(pmdp);
1955+}
1956+
1957 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1958 pmdval_t prot)
1959 {
1960diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1961index 5e68278..1869bae 100644
1962--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1963+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1964@@ -27,7 +27,7 @@
1965 /*
1966 * - section
1967 */
1968-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1969+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1970 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1971 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1972 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1973@@ -39,6 +39,7 @@
1974 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1975 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1976 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1977+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1978
1979 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1980 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1981@@ -68,6 +69,7 @@
1982 * - extended small page/tiny page
1983 */
1984 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1985+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1986 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1987 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1988 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1989diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1990index bfd662e..f6cbb02 100644
1991--- a/arch/arm/include/asm/pgtable-2level.h
1992+++ b/arch/arm/include/asm/pgtable-2level.h
1993@@ -127,6 +127,9 @@
1994 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1995 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1996
1997+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1998+#define L_PTE_PXN (_AT(pteval_t, 0))
1999+
2000 /*
2001 * These are the memory types, defined to be compatible with
2002 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2003diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2004index a745a2a..481350a 100644
2005--- a/arch/arm/include/asm/pgtable-3level.h
2006+++ b/arch/arm/include/asm/pgtable-3level.h
2007@@ -80,6 +80,7 @@
2008 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
2009 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2010 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2011+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2012 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2013 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2014 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2015@@ -91,10 +92,12 @@
2016 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2017 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2018 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2019+#define PMD_SECT_RDONLY PMD_SECT_AP2
2020
2021 /*
2022 * To be used in assembly code with the upper page attributes.
2023 */
2024+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2025 #define L_PTE_XN_HIGH (1 << (54 - 32))
2026 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2027
2028diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2029index f403541..b10df68 100644
2030--- a/arch/arm/include/asm/pgtable.h
2031+++ b/arch/arm/include/asm/pgtable.h
2032@@ -33,6 +33,9 @@
2033 #include <asm/pgtable-2level.h>
2034 #endif
2035
2036+#define ktla_ktva(addr) (addr)
2037+#define ktva_ktla(addr) (addr)
2038+
2039 /*
2040 * Just any arbitrary offset to the start of the vmalloc VM area: the
2041 * current 8MB value just means that there will be a 8MB "hole" after the
2042@@ -48,6 +51,9 @@
2043 #define LIBRARY_TEXT_START 0x0c000000
2044
2045 #ifndef __ASSEMBLY__
2046+extern pteval_t __supported_pte_mask;
2047+extern pmdval_t __supported_pmd_mask;
2048+
2049 extern void __pte_error(const char *file, int line, pte_t);
2050 extern void __pmd_error(const char *file, int line, pmd_t);
2051 extern void __pgd_error(const char *file, int line, pgd_t);
2052@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2053 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2054 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2055
2056+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2057+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2058+
2059+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2060+#include <asm/domain.h>
2061+#include <linux/thread_info.h>
2062+#include <linux/preempt.h>
2063+
2064+static inline int test_domain(int domain, int domaintype)
2065+{
2066+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2067+}
2068+#endif
2069+
2070+#ifdef CONFIG_PAX_KERNEXEC
2071+static inline unsigned long pax_open_kernel(void) {
2072+#ifdef CONFIG_ARM_LPAE
2073+ /* TODO */
2074+#else
2075+ preempt_disable();
2076+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2077+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2078+#endif
2079+ return 0;
2080+}
2081+
2082+static inline unsigned long pax_close_kernel(void) {
2083+#ifdef CONFIG_ARM_LPAE
2084+ /* TODO */
2085+#else
2086+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2087+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2088+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2089+ preempt_enable_no_resched();
2090+#endif
2091+ return 0;
2092+}
2093+#else
2094+static inline unsigned long pax_open_kernel(void) { return 0; }
2095+static inline unsigned long pax_close_kernel(void) { return 0; }
2096+#endif
2097+
2098 /*
2099 * This is the lowest virtual address we can permit any user space
2100 * mapping to be mapped at. This is particularly important for
2101@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2102 /*
2103 * The pgprot_* and protection_map entries will be fixed up in runtime
2104 * to include the cachable and bufferable bits based on memory policy,
2105- * as well as any architecture dependent bits like global/ASID and SMP
2106- * shared mapping bits.
2107+ * as well as any architecture dependent bits like global/ASID, PXN,
2108+ * and SMP shared mapping bits.
2109 */
2110 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2111
2112@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2113 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2114 {
2115 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2116- L_PTE_NONE | L_PTE_VALID;
2117+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2118 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2119 return pte;
2120 }
2121diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2122index c25ef3e..735f14b 100644
2123--- a/arch/arm/include/asm/psci.h
2124+++ b/arch/arm/include/asm/psci.h
2125@@ -32,7 +32,7 @@ struct psci_operations {
2126 int (*affinity_info)(unsigned long target_affinity,
2127 unsigned long lowest_affinity_level);
2128 int (*migrate_info_type)(void);
2129-};
2130+} __no_const;
2131
2132 extern struct psci_operations psci_ops;
2133 extern struct smp_operations psci_smp_ops;
2134diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2135index 18f5a55..5072a40 100644
2136--- a/arch/arm/include/asm/smp.h
2137+++ b/arch/arm/include/asm/smp.h
2138@@ -107,7 +107,7 @@ struct smp_operations {
2139 int (*cpu_disable)(unsigned int cpu);
2140 #endif
2141 #endif
2142-};
2143+} __no_const;
2144
2145 struct of_cpu_method {
2146 const char *method;
2147diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2148index bd32ede..bd90a0b 100644
2149--- a/arch/arm/include/asm/thread_info.h
2150+++ b/arch/arm/include/asm/thread_info.h
2151@@ -74,9 +74,9 @@ struct thread_info {
2152 .flags = 0, \
2153 .preempt_count = INIT_PREEMPT_COUNT, \
2154 .addr_limit = KERNEL_DS, \
2155- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2156- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2157- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2158+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2159+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2160+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2161 }
2162
2163 #define init_thread_info (init_thread_union.thread_info)
2164@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2165 #define TIF_SYSCALL_AUDIT 9
2166 #define TIF_SYSCALL_TRACEPOINT 10
2167 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2168-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2169+/* within 8 bits of TIF_SYSCALL_TRACE
2170+ * to meet flexible second operand requirements
2171+ */
2172+#define TIF_GRSEC_SETXID 12
2173+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2174 #define TIF_USING_IWMMXT 17
2175 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2176 #define TIF_RESTORE_SIGMASK 20
2177@@ -166,10 +170,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2178 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2179 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2180 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2181+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2182
2183 /* Checks for any syscall work in entry-common.S */
2184 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2185- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2186+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2187
2188 /*
2189 * Change these and you break ASM code in entry-common.S
2190diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2191index 5f833f7..76e6644 100644
2192--- a/arch/arm/include/asm/tls.h
2193+++ b/arch/arm/include/asm/tls.h
2194@@ -3,6 +3,7 @@
2195
2196 #include <linux/compiler.h>
2197 #include <asm/thread_info.h>
2198+#include <asm/pgtable.h>
2199
2200 #ifdef __ASSEMBLY__
2201 #include <asm/asm-offsets.h>
2202@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2203 * at 0xffff0fe0 must be used instead. (see
2204 * entry-armv.S for details)
2205 */
2206+ pax_open_kernel();
2207 *((unsigned int *)0xffff0ff0) = val;
2208+ pax_close_kernel();
2209 #endif
2210 }
2211
2212diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2213index 74b17d0..57a4bf4 100644
2214--- a/arch/arm/include/asm/uaccess.h
2215+++ b/arch/arm/include/asm/uaccess.h
2216@@ -18,6 +18,7 @@
2217 #include <asm/domain.h>
2218 #include <asm/unified.h>
2219 #include <asm/compiler.h>
2220+#include <asm/pgtable.h>
2221
2222 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2223 #include <asm-generic/uaccess-unaligned.h>
2224@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2225 static inline void set_fs(mm_segment_t fs)
2226 {
2227 current_thread_info()->addr_limit = fs;
2228- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2229+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2230 }
2231
2232 #define segment_eq(a, b) ((a) == (b))
2233
2234+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2235+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2236+
2237+static inline void pax_open_userland(void)
2238+{
2239+
2240+#ifdef CONFIG_PAX_MEMORY_UDEREF
2241+ if (segment_eq(get_fs(), USER_DS)) {
2242+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2243+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2244+ }
2245+#endif
2246+
2247+}
2248+
2249+static inline void pax_close_userland(void)
2250+{
2251+
2252+#ifdef CONFIG_PAX_MEMORY_UDEREF
2253+ if (segment_eq(get_fs(), USER_DS)) {
2254+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2255+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2256+ }
2257+#endif
2258+
2259+}
2260+
2261 #define __addr_ok(addr) ({ \
2262 unsigned long flag; \
2263 __asm__("cmp %2, %0; movlo %0, #0" \
2264@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2265
2266 #define get_user(x, p) \
2267 ({ \
2268+ int __e; \
2269 might_fault(); \
2270- __get_user_check(x, p); \
2271+ pax_open_userland(); \
2272+ __e = __get_user_check((x), (p)); \
2273+ pax_close_userland(); \
2274+ __e; \
2275 })
2276
2277 extern int __put_user_1(void *, unsigned int);
2278@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2279
2280 #define put_user(x, p) \
2281 ({ \
2282+ int __e; \
2283 might_fault(); \
2284- __put_user_check(x, p); \
2285+ pax_open_userland(); \
2286+ __e = __put_user_check((x), (p)); \
2287+ pax_close_userland(); \
2288+ __e; \
2289 })
2290
2291 #else /* CONFIG_MMU */
2292@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2293
2294 #endif /* CONFIG_MMU */
2295
2296+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2297 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2298
2299 #define user_addr_max() \
2300@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2301 #define __get_user(x, ptr) \
2302 ({ \
2303 long __gu_err = 0; \
2304+ pax_open_userland(); \
2305 __get_user_err((x), (ptr), __gu_err); \
2306+ pax_close_userland(); \
2307 __gu_err; \
2308 })
2309
2310 #define __get_user_error(x, ptr, err) \
2311 ({ \
2312+ pax_open_userland(); \
2313 __get_user_err((x), (ptr), err); \
2314+ pax_close_userland(); \
2315 (void) 0; \
2316 })
2317
2318@@ -368,13 +409,17 @@ do { \
2319 #define __put_user(x, ptr) \
2320 ({ \
2321 long __pu_err = 0; \
2322+ pax_open_userland(); \
2323 __put_user_err((x), (ptr), __pu_err); \
2324+ pax_close_userland(); \
2325 __pu_err; \
2326 })
2327
2328 #define __put_user_error(x, ptr, err) \
2329 ({ \
2330+ pax_open_userland(); \
2331 __put_user_err((x), (ptr), err); \
2332+ pax_close_userland(); \
2333 (void) 0; \
2334 })
2335
2336@@ -474,11 +519,44 @@ do { \
2337
2338
2339 #ifdef CONFIG_MMU
2340-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2341-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2342+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2343+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2344+
2345+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2346+{
2347+ unsigned long ret;
2348+
2349+ check_object_size(to, n, false);
2350+ pax_open_userland();
2351+ ret = ___copy_from_user(to, from, n);
2352+ pax_close_userland();
2353+ return ret;
2354+}
2355+
2356+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2357+{
2358+ unsigned long ret;
2359+
2360+ check_object_size(from, n, true);
2361+ pax_open_userland();
2362+ ret = ___copy_to_user(to, from, n);
2363+ pax_close_userland();
2364+ return ret;
2365+}
2366+
2367 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2368-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2369+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2370 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2371+
2372+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2373+{
2374+ unsigned long ret;
2375+ pax_open_userland();
2376+ ret = ___clear_user(addr, n);
2377+ pax_close_userland();
2378+ return ret;
2379+}
2380+
2381 #else
2382 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2383 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2384@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2385
2386 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2387 {
2388+ if ((long)n < 0)
2389+ return n;
2390+
2391 if (access_ok(VERIFY_READ, from, n))
2392 n = __copy_from_user(to, from, n);
2393 else /* security hole - plug it */
2394@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2395
2396 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2397 {
2398+ if ((long)n < 0)
2399+ return n;
2400+
2401 if (access_ok(VERIFY_WRITE, to, n))
2402 n = __copy_to_user(to, from, n);
2403 return n;
2404diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2405index 5af0ed1..cea83883 100644
2406--- a/arch/arm/include/uapi/asm/ptrace.h
2407+++ b/arch/arm/include/uapi/asm/ptrace.h
2408@@ -92,7 +92,7 @@
2409 * ARMv7 groups of PSR bits
2410 */
2411 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2412-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2413+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2414 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2415 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2416
2417diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2418index a88671c..1cc895e 100644
2419--- a/arch/arm/kernel/armksyms.c
2420+++ b/arch/arm/kernel/armksyms.c
2421@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2422
2423 /* networking */
2424 EXPORT_SYMBOL(csum_partial);
2425-EXPORT_SYMBOL(csum_partial_copy_from_user);
2426+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2427 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2428 EXPORT_SYMBOL(__csum_ipv6_magic);
2429
2430@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2431 #ifdef CONFIG_MMU
2432 EXPORT_SYMBOL(copy_page);
2433
2434-EXPORT_SYMBOL(__copy_from_user);
2435-EXPORT_SYMBOL(__copy_to_user);
2436-EXPORT_SYMBOL(__clear_user);
2437+EXPORT_SYMBOL(___copy_from_user);
2438+EXPORT_SYMBOL(___copy_to_user);
2439+EXPORT_SYMBOL(___clear_user);
2440
2441 EXPORT_SYMBOL(__get_user_1);
2442 EXPORT_SYMBOL(__get_user_2);
2443diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
2444index 318da33..373689f 100644
2445--- a/arch/arm/kernel/cpuidle.c
2446+++ b/arch/arm/kernel/cpuidle.c
2447@@ -19,7 +19,7 @@ extern struct of_cpuidle_method __cpuidle_method_of_table[];
2448 static const struct of_cpuidle_method __cpuidle_method_of_table_sentinel
2449 __used __section(__cpuidle_method_of_table_end);
2450
2451-static struct cpuidle_ops cpuidle_ops[NR_CPUS];
2452+static struct cpuidle_ops cpuidle_ops[NR_CPUS] __read_only;
2453
2454 /**
2455 * arm_cpuidle_simple_enter() - a wrapper to cpu_do_idle()
2456diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2457index 570306c..c87f193 100644
2458--- a/arch/arm/kernel/entry-armv.S
2459+++ b/arch/arm/kernel/entry-armv.S
2460@@ -48,6 +48,87 @@
2461 9997:
2462 .endm
2463
2464+ .macro pax_enter_kernel
2465+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2466+ @ make aligned space for saved DACR
2467+ sub sp, sp, #8
2468+ @ save regs
2469+ stmdb sp!, {r1, r2}
2470+ @ read DACR from cpu_domain into r1
2471+ mov r2, sp
2472+ @ assume 8K pages, since we have to split the immediate in two
2473+ bic r2, r2, #(0x1fc0)
2474+ bic r2, r2, #(0x3f)
2475+ ldr r1, [r2, #TI_CPU_DOMAIN]
2476+ @ store old DACR on stack
2477+ str r1, [sp, #8]
2478+#ifdef CONFIG_PAX_KERNEXEC
2479+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2480+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2481+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2482+#endif
2483+#ifdef CONFIG_PAX_MEMORY_UDEREF
2484+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2485+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2486+#endif
2487+ @ write r1 to current_thread_info()->cpu_domain
2488+ str r1, [r2, #TI_CPU_DOMAIN]
2489+ @ write r1 to DACR
2490+ mcr p15, 0, r1, c3, c0, 0
2491+ @ instruction sync
2492+ instr_sync
2493+ @ restore regs
2494+ ldmia sp!, {r1, r2}
2495+#endif
2496+ .endm
2497+
2498+ .macro pax_open_userland
2499+#ifdef CONFIG_PAX_MEMORY_UDEREF
2500+ @ save regs
2501+ stmdb sp!, {r0, r1}
2502+ @ read DACR from cpu_domain into r1
2503+ mov r0, sp
2504+ @ assume 8K pages, since we have to split the immediate in two
2505+ bic r0, r0, #(0x1fc0)
2506+ bic r0, r0, #(0x3f)
2507+ ldr r1, [r0, #TI_CPU_DOMAIN]
2508+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2509+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2510+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2511+ @ write r1 to current_thread_info()->cpu_domain
2512+ str r1, [r0, #TI_CPU_DOMAIN]
2513+ @ write r1 to DACR
2514+ mcr p15, 0, r1, c3, c0, 0
2515+ @ instruction sync
2516+ instr_sync
2517+ @ restore regs
2518+ ldmia sp!, {r0, r1}
2519+#endif
2520+ .endm
2521+
2522+ .macro pax_close_userland
2523+#ifdef CONFIG_PAX_MEMORY_UDEREF
2524+ @ save regs
2525+ stmdb sp!, {r0, r1}
2526+ @ read DACR from cpu_domain into r1
2527+ mov r0, sp
2528+ @ assume 8K pages, since we have to split the immediate in two
2529+ bic r0, r0, #(0x1fc0)
2530+ bic r0, r0, #(0x3f)
2531+ ldr r1, [r0, #TI_CPU_DOMAIN]
2532+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2533+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2534+ @ write r1 to current_thread_info()->cpu_domain
2535+ str r1, [r0, #TI_CPU_DOMAIN]
2536+ @ write r1 to DACR
2537+ mcr p15, 0, r1, c3, c0, 0
2538+ @ instruction sync
2539+ instr_sync
2540+ @ restore regs
2541+ ldmia sp!, {r0, r1}
2542+#endif
2543+ .endm
2544+
2545 .macro pabt_helper
2546 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2547 #ifdef MULTI_PABORT
2548@@ -90,11 +171,15 @@
2549 * Invalid mode handlers
2550 */
2551 .macro inv_entry, reason
2552+
2553+ pax_enter_kernel
2554+
2555 sub sp, sp, #S_FRAME_SIZE
2556 ARM( stmib sp, {r1 - lr} )
2557 THUMB( stmia sp, {r0 - r12} )
2558 THUMB( str sp, [sp, #S_SP] )
2559 THUMB( str lr, [sp, #S_LR] )
2560+
2561 mov r1, #\reason
2562 .endm
2563
2564@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2565 .macro svc_entry, stack_hole=0, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.save {r0 - pc} )
2568+
2569+ pax_enter_kernel
2570+
2571 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2572+
2573 #ifdef CONFIG_THUMB2_KERNEL
2574 SPFIX( str r0, [sp] ) @ temporarily saved
2575 SPFIX( mov r0, sp )
2576@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2577 ldmia r0, {r3 - r5}
2578 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2579 mov r6, #-1 @ "" "" "" ""
2580+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2581+ @ offset sp by 8 as done in pax_enter_kernel
2582+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2583+#else
2584 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2585+#endif
2586 SPFIX( addeq r2, r2, #4 )
2587 str r3, [sp, #-4]! @ save the "real" r0 copied
2588 @ from the exception stack
2589@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2590 .macro usr_entry, trace=1
2591 UNWIND(.fnstart )
2592 UNWIND(.cantunwind ) @ don't unwind the user space
2593+
2594+ pax_enter_kernel_user
2595+
2596 sub sp, sp, #S_FRAME_SIZE
2597 ARM( stmib sp, {r1 - r12} )
2598 THUMB( stmia sp, {r0 - r12} )
2599@@ -479,7 +576,9 @@ __und_usr:
2600 tst r3, #PSR_T_BIT @ Thumb mode?
2601 bne __und_usr_thumb
2602 sub r4, r2, #4 @ ARM instr at LR - 4
2603+ pax_open_userland
2604 1: ldrt r0, [r4]
2605+ pax_close_userland
2606 ARM_BE8(rev r0, r0) @ little endian instruction
2607
2608 @ r0 = 32-bit ARM instruction which caused the exception
2609@@ -513,11 +612,15 @@ __und_usr_thumb:
2610 */
2611 .arch armv6t2
2612 #endif
2613+ pax_open_userland
2614 2: ldrht r5, [r4]
2615+ pax_close_userland
2616 ARM_BE8(rev16 r5, r5) @ little endian instruction
2617 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2618 blo __und_usr_fault_16 @ 16bit undefined instruction
2619+ pax_open_userland
2620 3: ldrht r0, [r2]
2621+ pax_close_userland
2622 ARM_BE8(rev16 r0, r0) @ little endian instruction
2623 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2624 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2625@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2626 */
2627 .pushsection .text.fixup, "ax"
2628 .align 2
2629-4: str r4, [sp, #S_PC] @ retry current instruction
2630+4: pax_close_userland
2631+ str r4, [sp, #S_PC] @ retry current instruction
2632 ret r9
2633 .popsection
2634 .pushsection __ex_table,"a"
2635@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2636 THUMB( str lr, [ip], #4 )
2637 ldr r4, [r2, #TI_TP_VALUE]
2638 ldr r5, [r2, #TI_TP_VALUE + 4]
2639-#ifdef CONFIG_CPU_USE_DOMAINS
2640+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2641 ldr r6, [r2, #TI_CPU_DOMAIN]
2642 #endif
2643 switch_tls r1, r4, r5, r3, r7
2644@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2645 ldr r8, =__stack_chk_guard
2646 ldr r7, [r7, #TSK_STACK_CANARY]
2647 #endif
2648-#ifdef CONFIG_CPU_USE_DOMAINS
2649+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2650 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2651 #endif
2652 mov r5, r0
2653diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2654index 4e7f40c..0f9ee2c 100644
2655--- a/arch/arm/kernel/entry-common.S
2656+++ b/arch/arm/kernel/entry-common.S
2657@@ -11,18 +11,46 @@
2658 #include <asm/assembler.h>
2659 #include <asm/unistd.h>
2660 #include <asm/ftrace.h>
2661+#include <asm/domain.h>
2662 #include <asm/unwind.h>
2663
2664+#include "entry-header.S"
2665+
2666 #ifdef CONFIG_NEED_RET_TO_USER
2667 #include <mach/entry-macro.S>
2668 #else
2669 .macro arch_ret_to_user, tmp1, tmp2
2670+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2671+ @ save regs
2672+ stmdb sp!, {r1, r2}
2673+ @ read DACR from cpu_domain into r1
2674+ mov r2, sp
2675+ @ assume 8K pages, since we have to split the immediate in two
2676+ bic r2, r2, #(0x1fc0)
2677+ bic r2, r2, #(0x3f)
2678+ ldr r1, [r2, #TI_CPU_DOMAIN]
2679+#ifdef CONFIG_PAX_KERNEXEC
2680+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2681+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2682+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2683+#endif
2684+#ifdef CONFIG_PAX_MEMORY_UDEREF
2685+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2686+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2687+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2688+#endif
2689+ @ write r1 to current_thread_info()->cpu_domain
2690+ str r1, [r2, #TI_CPU_DOMAIN]
2691+ @ write r1 to DACR
2692+ mcr p15, 0, r1, c3, c0, 0
2693+ @ instruction sync
2694+ instr_sync
2695+ @ restore regs
2696+ ldmia sp!, {r1, r2}
2697+#endif
2698 .endm
2699 #endif
2700
2701-#include "entry-header.S"
2702-
2703-
2704 .align 5
2705 /*
2706 * This is the fast syscall return path. We do as little as
2707@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2708 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2709 #endif
2710
2711+ /*
2712+ * do this here to avoid a performance hit of wrapping the code above
2713+ * that directly dereferences userland to parse the SWI instruction
2714+ */
2715+ pax_enter_kernel_user
2716+
2717 adr tbl, sys_call_table @ load syscall table pointer
2718
2719 #if defined(CONFIG_OABI_COMPAT)
2720diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2721index 1a0045a..9b4f34d 100644
2722--- a/arch/arm/kernel/entry-header.S
2723+++ b/arch/arm/kernel/entry-header.S
2724@@ -196,6 +196,60 @@
2725 msr cpsr_c, \rtemp @ switch back to the SVC mode
2726 .endm
2727
2728+ .macro pax_enter_kernel_user
2729+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2730+ @ save regs
2731+ stmdb sp!, {r0, r1}
2732+ @ read DACR from cpu_domain into r1
2733+ mov r0, sp
2734+ @ assume 8K pages, since we have to split the immediate in two
2735+ bic r0, r0, #(0x1fc0)
2736+ bic r0, r0, #(0x3f)
2737+ ldr r1, [r0, #TI_CPU_DOMAIN]
2738+#ifdef CONFIG_PAX_MEMORY_UDEREF
2739+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2740+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2741+#endif
2742+#ifdef CONFIG_PAX_KERNEXEC
2743+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2744+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2745+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2746+#endif
2747+ @ write r1 to current_thread_info()->cpu_domain
2748+ str r1, [r0, #TI_CPU_DOMAIN]
2749+ @ write r1 to DACR
2750+ mcr p15, 0, r1, c3, c0, 0
2751+ @ instruction sync
2752+ instr_sync
2753+ @ restore regs
2754+ ldmia sp!, {r0, r1}
2755+#endif
2756+ .endm
2757+
2758+ .macro pax_exit_kernel
2759+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2760+ @ save regs
2761+ stmdb sp!, {r0, r1}
2762+ @ read old DACR from stack into r1
2763+ ldr r1, [sp, #(8 + S_SP)]
2764+ sub r1, r1, #8
2765+ ldr r1, [r1]
2766+
2767+ @ write r1 to current_thread_info()->cpu_domain
2768+ mov r0, sp
2769+ @ assume 8K pages, since we have to split the immediate in two
2770+ bic r0, r0, #(0x1fc0)
2771+ bic r0, r0, #(0x3f)
2772+ str r1, [r0, #TI_CPU_DOMAIN]
2773+ @ write r1 to DACR
2774+ mcr p15, 0, r1, c3, c0, 0
2775+ @ instruction sync
2776+ instr_sync
2777+ @ restore regs
2778+ ldmia sp!, {r0, r1}
2779+#endif
2780+ .endm
2781+
2782 #ifndef CONFIG_THUMB2_KERNEL
2783 .macro svc_exit, rpsr, irq = 0
2784 .if \irq != 0
2785@@ -215,6 +269,9 @@
2786 blne trace_hardirqs_off
2787 #endif
2788 .endif
2789+
2790+ pax_exit_kernel
2791+
2792 msr spsr_cxsf, \rpsr
2793 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2794 @ We must avoid clrex due to Cortex-A15 erratum #830321
2795@@ -291,6 +348,9 @@
2796 blne trace_hardirqs_off
2797 #endif
2798 .endif
2799+
2800+ pax_exit_kernel
2801+
2802 ldr lr, [sp, #S_SP] @ top of the stack
2803 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2804
2805diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2806index 059c3da..8e45cfc 100644
2807--- a/arch/arm/kernel/fiq.c
2808+++ b/arch/arm/kernel/fiq.c
2809@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2810 void *base = vectors_page;
2811 unsigned offset = FIQ_OFFSET;
2812
2813+ pax_open_kernel();
2814 memcpy(base + offset, start, length);
2815+ pax_close_kernel();
2816+
2817 if (!cache_is_vipt_nonaliasing())
2818 flush_icache_range((unsigned long)base + offset, offset +
2819 length);
2820diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2821index 3637973..cb29657 100644
2822--- a/arch/arm/kernel/head.S
2823+++ b/arch/arm/kernel/head.S
2824@@ -444,7 +444,7 @@ __enable_mmu:
2825 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2826 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2827 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2828- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2829+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2830 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2831 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2832 #endif
2833diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2834index af791f4..3ff9821 100644
2835--- a/arch/arm/kernel/module.c
2836+++ b/arch/arm/kernel/module.c
2837@@ -38,12 +38,39 @@
2838 #endif
2839
2840 #ifdef CONFIG_MMU
2841-void *module_alloc(unsigned long size)
2842+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2843 {
2844+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2845+ return NULL;
2846 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2847- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2848+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2849 __builtin_return_address(0));
2850 }
2851+
2852+void *module_alloc(unsigned long size)
2853+{
2854+
2855+#ifdef CONFIG_PAX_KERNEXEC
2856+ return __module_alloc(size, PAGE_KERNEL);
2857+#else
2858+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2859+#endif
2860+
2861+}
2862+
2863+#ifdef CONFIG_PAX_KERNEXEC
2864+void module_memfree_exec(void *module_region)
2865+{
2866+ module_memfree(module_region);
2867+}
2868+EXPORT_SYMBOL(module_memfree_exec);
2869+
2870+void *module_alloc_exec(unsigned long size)
2871+{
2872+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2873+}
2874+EXPORT_SYMBOL(module_alloc_exec);
2875+#endif
2876 #endif
2877
2878 int
2879diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2880index 69bda1a..755113a 100644
2881--- a/arch/arm/kernel/patch.c
2882+++ b/arch/arm/kernel/patch.c
2883@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2884 else
2885 __acquire(&patch_lock);
2886
2887+ pax_open_kernel();
2888 if (thumb2 && __opcode_is_thumb16(insn)) {
2889 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2890 size = sizeof(u16);
2891@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2892 *(u32 *)waddr = insn;
2893 size = sizeof(u32);
2894 }
2895+ pax_close_kernel();
2896
2897 if (waddr != addr) {
2898 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2899diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2900index f192a2a..1a40523 100644
2901--- a/arch/arm/kernel/process.c
2902+++ b/arch/arm/kernel/process.c
2903@@ -105,8 +105,8 @@ void __show_regs(struct pt_regs *regs)
2904
2905 show_regs_print_info(KERN_DEFAULT);
2906
2907- print_symbol("PC is at %s\n", instruction_pointer(regs));
2908- print_symbol("LR is at %s\n", regs->ARM_lr);
2909+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2910+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2911 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2912 "sp : %08lx ip : %08lx fp : %08lx\n",
2913 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2914@@ -283,12 +283,6 @@ unsigned long get_wchan(struct task_struct *p)
2915 return 0;
2916 }
2917
2918-unsigned long arch_randomize_brk(struct mm_struct *mm)
2919-{
2920- unsigned long range_end = mm->brk + 0x02000000;
2921- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2922-}
2923-
2924 #ifdef CONFIG_MMU
2925 #ifdef CONFIG_KUSER_HELPERS
2926 /*
2927@@ -304,7 +298,7 @@ static struct vm_area_struct gate_vma = {
2928
2929 static int __init gate_vma_init(void)
2930 {
2931- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2932+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2933 return 0;
2934 }
2935 arch_initcall(gate_vma_init);
2936@@ -333,91 +327,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2937 return is_gate_vma(vma) ? "[vectors]" : NULL;
2938 }
2939
2940-/* If possible, provide a placement hint at a random offset from the
2941- * stack for the sigpage and vdso pages.
2942- */
2943-static unsigned long sigpage_addr(const struct mm_struct *mm,
2944- unsigned int npages)
2945-{
2946- unsigned long offset;
2947- unsigned long first;
2948- unsigned long last;
2949- unsigned long addr;
2950- unsigned int slots;
2951-
2952- first = PAGE_ALIGN(mm->start_stack);
2953-
2954- last = TASK_SIZE - (npages << PAGE_SHIFT);
2955-
2956- /* No room after stack? */
2957- if (first > last)
2958- return 0;
2959-
2960- /* Just enough room? */
2961- if (first == last)
2962- return first;
2963-
2964- slots = ((last - first) >> PAGE_SHIFT) + 1;
2965-
2966- offset = get_random_int() % slots;
2967-
2968- addr = first + (offset << PAGE_SHIFT);
2969-
2970- return addr;
2971-}
2972-
2973-static struct page *signal_page;
2974-extern struct page *get_signal_page(void);
2975-
2976-static const struct vm_special_mapping sigpage_mapping = {
2977- .name = "[sigpage]",
2978- .pages = &signal_page,
2979-};
2980-
2981 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2982 {
2983 struct mm_struct *mm = current->mm;
2984- struct vm_area_struct *vma;
2985- unsigned long npages;
2986- unsigned long addr;
2987- unsigned long hint;
2988- int ret = 0;
2989-
2990- if (!signal_page)
2991- signal_page = get_signal_page();
2992- if (!signal_page)
2993- return -ENOMEM;
2994-
2995- npages = 1; /* for sigpage */
2996- npages += vdso_total_pages;
2997
2998 down_write(&mm->mmap_sem);
2999- hint = sigpage_addr(mm, npages);
3000- addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
3001- if (IS_ERR_VALUE(addr)) {
3002- ret = addr;
3003- goto up_fail;
3004- }
3005-
3006- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
3007- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
3008- &sigpage_mapping);
3009-
3010- if (IS_ERR(vma)) {
3011- ret = PTR_ERR(vma);
3012- goto up_fail;
3013- }
3014-
3015- mm->context.sigpage = addr;
3016-
3017- /* Unlike the sigpage, failure to install the vdso is unlikely
3018- * to be fatal to the process, so no error check needed
3019- * here.
3020- */
3021- arm_install_vdso(mm, addr + PAGE_SIZE);
3022-
3023- up_fail:
3024+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3025 up_write(&mm->mmap_sem);
3026- return ret;
3027+ return 0;
3028 }
3029 #endif
3030diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3031index f90fdf4..24e8c84 100644
3032--- a/arch/arm/kernel/psci.c
3033+++ b/arch/arm/kernel/psci.c
3034@@ -26,7 +26,7 @@
3035 #include <asm/psci.h>
3036 #include <asm/system_misc.h>
3037
3038-struct psci_operations psci_ops;
3039+struct psci_operations psci_ops __read_only;
3040
3041 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3042 typedef int (*psci_initcall_t)(const struct device_node *);
3043diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3044index ef9119f..31995a3 100644
3045--- a/arch/arm/kernel/ptrace.c
3046+++ b/arch/arm/kernel/ptrace.c
3047@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3048 regs->ARM_ip = ip;
3049 }
3050
3051+#ifdef CONFIG_GRKERNSEC_SETXID
3052+extern void gr_delayed_cred_worker(void);
3053+#endif
3054+
3055 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3056 {
3057 current_thread_info()->syscall = scno;
3058
3059+#ifdef CONFIG_GRKERNSEC_SETXID
3060+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3061+ gr_delayed_cred_worker();
3062+#endif
3063+
3064 /* Do the secure computing check first; failures should be fast. */
3065 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3066 if (secure_computing() == -1)
3067diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
3068index 1a4d232..2677169 100644
3069--- a/arch/arm/kernel/reboot.c
3070+++ b/arch/arm/kernel/reboot.c
3071@@ -122,6 +122,7 @@ void machine_power_off(void)
3072
3073 if (pm_power_off)
3074 pm_power_off();
3075+ while (1);
3076 }
3077
3078 /*
3079diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3080index 6c777e9..3d2d0ca 100644
3081--- a/arch/arm/kernel/setup.c
3082+++ b/arch/arm/kernel/setup.c
3083@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3084 unsigned int elf_hwcap2 __read_mostly;
3085 EXPORT_SYMBOL(elf_hwcap2);
3086
3087+pteval_t __supported_pte_mask __read_only;
3088+pmdval_t __supported_pmd_mask __read_only;
3089
3090 #ifdef MULTI_CPU
3091-struct processor processor __read_mostly;
3092+struct processor processor __read_only;
3093 #endif
3094 #ifdef MULTI_TLB
3095-struct cpu_tlb_fns cpu_tlb __read_mostly;
3096+struct cpu_tlb_fns cpu_tlb __read_only;
3097 #endif
3098 #ifdef MULTI_USER
3099-struct cpu_user_fns cpu_user __read_mostly;
3100+struct cpu_user_fns cpu_user __read_only;
3101 #endif
3102 #ifdef MULTI_CACHE
3103-struct cpu_cache_fns cpu_cache __read_mostly;
3104+struct cpu_cache_fns cpu_cache __read_only;
3105 #endif
3106 #ifdef CONFIG_OUTER_CACHE
3107-struct outer_cache_fns outer_cache __read_mostly;
3108+struct outer_cache_fns outer_cache __read_only;
3109 EXPORT_SYMBOL(outer_cache);
3110 #endif
3111
3112@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3113 * Register 0 and check for VMSAv7 or PMSAv7 */
3114 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3115 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3116- (mmfr0 & 0x000000f0) >= 0x00000030)
3117+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3118 cpu_arch = CPU_ARCH_ARMv7;
3119- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3120+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3121+ __supported_pte_mask |= L_PTE_PXN;
3122+ __supported_pmd_mask |= PMD_PXNTABLE;
3123+ }
3124+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3125 (mmfr0 & 0x000000f0) == 0x00000020)
3126 cpu_arch = CPU_ARCH_ARMv6;
3127 else
3128diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3129index 423663e..bfeb0ff 100644
3130--- a/arch/arm/kernel/signal.c
3131+++ b/arch/arm/kernel/signal.c
3132@@ -24,8 +24,6 @@
3133
3134 extern const unsigned long sigreturn_codes[7];
3135
3136-static unsigned long signal_return_offset;
3137-
3138 #ifdef CONFIG_CRUNCH
3139 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3140 {
3141@@ -385,8 +383,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3142 * except when the MPU has protected the vectors
3143 * page from PL0
3144 */
3145- retcode = mm->context.sigpage + signal_return_offset +
3146- (idx << 2) + thumb;
3147+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3148 } else
3149 #endif
3150 {
3151@@ -592,33 +589,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3152 } while (thread_flags & _TIF_WORK_MASK);
3153 return 0;
3154 }
3155-
3156-struct page *get_signal_page(void)
3157-{
3158- unsigned long ptr;
3159- unsigned offset;
3160- struct page *page;
3161- void *addr;
3162-
3163- page = alloc_pages(GFP_KERNEL, 0);
3164-
3165- if (!page)
3166- return NULL;
3167-
3168- addr = page_address(page);
3169-
3170- /* Give the signal return code some randomness */
3171- offset = 0x200 + (get_random_int() & 0x7fc);
3172- signal_return_offset = offset;
3173-
3174- /*
3175- * Copy signal return handlers into the vector page, and
3176- * set sigreturn to be a pointer to these.
3177- */
3178- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3179-
3180- ptr = (unsigned long)addr + offset;
3181- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3182-
3183- return page;
3184-}
3185diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3186index cca5b87..68f0f73 100644
3187--- a/arch/arm/kernel/smp.c
3188+++ b/arch/arm/kernel/smp.c
3189@@ -76,7 +76,7 @@ enum ipi_msg_type {
3190
3191 static DECLARE_COMPLETION(cpu_running);
3192
3193-static struct smp_operations smp_ops;
3194+static struct smp_operations smp_ops __read_only;
3195
3196 void __init smp_set_ops(struct smp_operations *ops)
3197 {
3198diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3199index 7a3be1d..b00c7de 100644
3200--- a/arch/arm/kernel/tcm.c
3201+++ b/arch/arm/kernel/tcm.c
3202@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3203 .virtual = ITCM_OFFSET,
3204 .pfn = __phys_to_pfn(ITCM_OFFSET),
3205 .length = 0,
3206- .type = MT_MEMORY_RWX_ITCM,
3207+ .type = MT_MEMORY_RX_ITCM,
3208 }
3209 };
3210
3211@@ -267,7 +267,9 @@ no_dtcm:
3212 start = &__sitcm_text;
3213 end = &__eitcm_text;
3214 ram = &__itcm_start;
3215+ pax_open_kernel();
3216 memcpy(start, ram, itcm_code_sz);
3217+ pax_close_kernel();
3218 pr_debug("CPU ITCM: copied code from %p - %p\n",
3219 start, end);
3220 itcm_present = true;
3221diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3222index 3dce1a3..60e857f 100644
3223--- a/arch/arm/kernel/traps.c
3224+++ b/arch/arm/kernel/traps.c
3225@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3226 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3227 {
3228 #ifdef CONFIG_KALLSYMS
3229- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3230+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3231 #else
3232 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3233 #endif
3234@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3235 static int die_owner = -1;
3236 static unsigned int die_nest_count;
3237
3238+extern void gr_handle_kernel_exploit(void);
3239+
3240 static unsigned long oops_begin(void)
3241 {
3242 int cpu;
3243@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3244 panic("Fatal exception in interrupt");
3245 if (panic_on_oops)
3246 panic("Fatal exception");
3247+
3248+ gr_handle_kernel_exploit();
3249+
3250 if (signr)
3251 do_exit(signr);
3252 }
3253@@ -878,7 +883,11 @@ void __init early_trap_init(void *vectors_base)
3254 kuser_init(vectors_base);
3255
3256 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3257- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3258+
3259+#ifndef CONFIG_PAX_MEMORY_UDEREF
3260+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3261+#endif
3262+
3263 #else /* ifndef CONFIG_CPU_V7M */
3264 /*
3265 * on V7-M there is no need to copy the vector table to a dedicated
3266diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3267index 8b60fde..8d986dd 100644
3268--- a/arch/arm/kernel/vmlinux.lds.S
3269+++ b/arch/arm/kernel/vmlinux.lds.S
3270@@ -37,7 +37,7 @@
3271 #endif
3272
3273 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3274- defined(CONFIG_GENERIC_BUG)
3275+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3276 #define ARM_EXIT_KEEP(x) x
3277 #define ARM_EXIT_DISCARD(x)
3278 #else
3279@@ -120,6 +120,8 @@ SECTIONS
3280 #ifdef CONFIG_DEBUG_RODATA
3281 . = ALIGN(1<<SECTION_SHIFT);
3282 #endif
3283+ _etext = .; /* End of text section */
3284+
3285 RO_DATA(PAGE_SIZE)
3286
3287 . = ALIGN(4);
3288@@ -150,8 +152,6 @@ SECTIONS
3289
3290 NOTES
3291
3292- _etext = .; /* End of text and rodata section */
3293-
3294 #ifndef CONFIG_XIP_KERNEL
3295 # ifdef CONFIG_ARM_KERNMEM_PERMS
3296 . = ALIGN(1<<SECTION_SHIFT);
3297diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3298index d9631ec..b0c966c 100644
3299--- a/arch/arm/kvm/arm.c
3300+++ b/arch/arm/kvm/arm.c
3301@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3302 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3303
3304 /* The VMID used in the VTTBR */
3305-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3306+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3307 static u8 kvm_next_vmid;
3308 static DEFINE_SPINLOCK(kvm_vmid_lock);
3309
3310@@ -373,7 +373,7 @@ void force_vm_exit(const cpumask_t *mask)
3311 */
3312 static bool need_new_vmid_gen(struct kvm *kvm)
3313 {
3314- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3315+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3316 }
3317
3318 /**
3319@@ -406,7 +406,7 @@ static void update_vttbr(struct kvm *kvm)
3320
3321 /* First user of a new VMID generation? */
3322 if (unlikely(kvm_next_vmid == 0)) {
3323- atomic64_inc(&kvm_vmid_gen);
3324+ atomic64_inc_unchecked(&kvm_vmid_gen);
3325 kvm_next_vmid = 1;
3326
3327 /*
3328@@ -423,7 +423,7 @@ static void update_vttbr(struct kvm *kvm)
3329 kvm_call_hyp(__kvm_flush_vm_context);
3330 }
3331
3332- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3333+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3334 kvm->arch.vmid = kvm_next_vmid;
3335 kvm_next_vmid++;
3336
3337@@ -1098,7 +1098,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3338 /**
3339 * Initialize Hyp-mode and memory mappings on all CPUs.
3340 */
3341-int kvm_arch_init(void *opaque)
3342+int kvm_arch_init(const void *opaque)
3343 {
3344 int err;
3345 int ret, cpu;
3346diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3347index 1710fd7..ec3e014 100644
3348--- a/arch/arm/lib/clear_user.S
3349+++ b/arch/arm/lib/clear_user.S
3350@@ -12,14 +12,14 @@
3351
3352 .text
3353
3354-/* Prototype: int __clear_user(void *addr, size_t sz)
3355+/* Prototype: int ___clear_user(void *addr, size_t sz)
3356 * Purpose : clear some user memory
3357 * Params : addr - user memory address to clear
3358 * : sz - number of bytes to clear
3359 * Returns : number of bytes NOT cleared
3360 */
3361 ENTRY(__clear_user_std)
3362-WEAK(__clear_user)
3363+WEAK(___clear_user)
3364 stmfd sp!, {r1, lr}
3365 mov r2, #0
3366 cmp r1, #4
3367@@ -44,7 +44,7 @@ WEAK(__clear_user)
3368 USER( strnebt r2, [r0])
3369 mov r0, #0
3370 ldmfd sp!, {r1, pc}
3371-ENDPROC(__clear_user)
3372+ENDPROC(___clear_user)
3373 ENDPROC(__clear_user_std)
3374
3375 .pushsection .text.fixup,"ax"
3376diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3377index 7a235b9..73a0556 100644
3378--- a/arch/arm/lib/copy_from_user.S
3379+++ b/arch/arm/lib/copy_from_user.S
3380@@ -17,7 +17,7 @@
3381 /*
3382 * Prototype:
3383 *
3384- * size_t __copy_from_user(void *to, const void *from, size_t n)
3385+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3386 *
3387 * Purpose:
3388 *
3389@@ -89,11 +89,11 @@
3390
3391 .text
3392
3393-ENTRY(__copy_from_user)
3394+ENTRY(___copy_from_user)
3395
3396 #include "copy_template.S"
3397
3398-ENDPROC(__copy_from_user)
3399+ENDPROC(___copy_from_user)
3400
3401 .pushsection .fixup,"ax"
3402 .align 0
3403diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3404index 6ee2f67..d1cce76 100644
3405--- a/arch/arm/lib/copy_page.S
3406+++ b/arch/arm/lib/copy_page.S
3407@@ -10,6 +10,7 @@
3408 * ASM optimised string functions
3409 */
3410 #include <linux/linkage.h>
3411+#include <linux/const.h>
3412 #include <asm/assembler.h>
3413 #include <asm/asm-offsets.h>
3414 #include <asm/cache.h>
3415diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3416index 9648b06..19c333c 100644
3417--- a/arch/arm/lib/copy_to_user.S
3418+++ b/arch/arm/lib/copy_to_user.S
3419@@ -17,7 +17,7 @@
3420 /*
3421 * Prototype:
3422 *
3423- * size_t __copy_to_user(void *to, const void *from, size_t n)
3424+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3425 *
3426 * Purpose:
3427 *
3428@@ -93,11 +93,11 @@
3429 .text
3430
3431 ENTRY(__copy_to_user_std)
3432-WEAK(__copy_to_user)
3433+WEAK(___copy_to_user)
3434
3435 #include "copy_template.S"
3436
3437-ENDPROC(__copy_to_user)
3438+ENDPROC(___copy_to_user)
3439 ENDPROC(__copy_to_user_std)
3440
3441 .pushsection .text.fixup,"ax"
3442diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3443index 1d0957e..f708846 100644
3444--- a/arch/arm/lib/csumpartialcopyuser.S
3445+++ b/arch/arm/lib/csumpartialcopyuser.S
3446@@ -57,8 +57,8 @@
3447 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3448 */
3449
3450-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3451-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3452+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3453+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3454
3455 #include "csumpartialcopygeneric.S"
3456
3457diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3458index 8044591..c9b2609 100644
3459--- a/arch/arm/lib/delay.c
3460+++ b/arch/arm/lib/delay.c
3461@@ -29,7 +29,7 @@
3462 /*
3463 * Default to the loop-based delay implementation.
3464 */
3465-struct arm_delay_ops arm_delay_ops = {
3466+struct arm_delay_ops arm_delay_ops __read_only = {
3467 .delay = __loop_delay,
3468 .const_udelay = __loop_const_udelay,
3469 .udelay = __loop_udelay,
3470diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3471index 3e58d71..029817c 100644
3472--- a/arch/arm/lib/uaccess_with_memcpy.c
3473+++ b/arch/arm/lib/uaccess_with_memcpy.c
3474@@ -136,7 +136,7 @@ out:
3475 }
3476
3477 unsigned long
3478-__copy_to_user(void __user *to, const void *from, unsigned long n)
3479+___copy_to_user(void __user *to, const void *from, unsigned long n)
3480 {
3481 /*
3482 * This test is stubbed out of the main function above to keep
3483@@ -190,7 +190,7 @@ out:
3484 return n;
3485 }
3486
3487-unsigned long __clear_user(void __user *addr, unsigned long n)
3488+unsigned long ___clear_user(void __user *addr, unsigned long n)
3489 {
3490 /* See rational for this in __copy_to_user() above. */
3491 if (n < 64)
3492diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3493index 7d23ce0..5ef383a 100644
3494--- a/arch/arm/mach-exynos/suspend.c
3495+++ b/arch/arm/mach-exynos/suspend.c
3496@@ -738,8 +738,10 @@ void __init exynos_pm_init(void)
3497 tmp |= pm_data->wake_disable_mask;
3498 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3499
3500- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3501- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3502+ pax_open_kernel();
3503+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3504+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3505+ pax_close_kernel();
3506
3507 register_syscore_ops(&exynos_pm_syscore_ops);
3508 suspend_set_ops(&exynos_suspend_ops);
3509diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3510index 0662087..004d163 100644
3511--- a/arch/arm/mach-keystone/keystone.c
3512+++ b/arch/arm/mach-keystone/keystone.c
3513@@ -27,7 +27,7 @@
3514
3515 #include "keystone.h"
3516
3517-static struct notifier_block platform_nb;
3518+static notifier_block_no_const platform_nb;
3519 static unsigned long keystone_dma_pfn_offset __read_mostly;
3520
3521 static int keystone_platform_notifier(struct notifier_block *nb,
3522diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3523index e46e9ea..9141c83 100644
3524--- a/arch/arm/mach-mvebu/coherency.c
3525+++ b/arch/arm/mach-mvebu/coherency.c
3526@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3527
3528 /*
3529 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3530- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3531+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3532 * is needed as a workaround for a deadlock issue between the PCIe
3533 * interface and the cache controller.
3534 */
3535@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3536 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3537
3538 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3539- mtype = MT_UNCACHED;
3540+ mtype = MT_UNCACHED_RW;
3541
3542 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3543 }
3544diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3545index b6443a4..20a0b74 100644
3546--- a/arch/arm/mach-omap2/board-n8x0.c
3547+++ b/arch/arm/mach-omap2/board-n8x0.c
3548@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3549 }
3550 #endif
3551
3552-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3553+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3554 .late_init = n8x0_menelaus_late_init,
3555 };
3556
3557diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3558index 79f49d9..70bf184 100644
3559--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3560+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3561@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3562 void (*resume)(void);
3563 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3564 void (*hotplug_restart)(void);
3565-};
3566+} __no_const;
3567
3568 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3569 static struct powerdomain *mpuss_pd;
3570@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3571 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3572 {}
3573
3574-struct cpu_pm_ops omap_pm_ops = {
3575+static struct cpu_pm_ops omap_pm_ops __read_only = {
3576 .finish_suspend = default_finish_suspend,
3577 .resume = dummy_cpu_resume,
3578 .scu_prepare = dummy_scu_prepare,
3579diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3580index 5305ec7..6d74045 100644
3581--- a/arch/arm/mach-omap2/omap-smp.c
3582+++ b/arch/arm/mach-omap2/omap-smp.c
3583@@ -19,6 +19,7 @@
3584 #include <linux/device.h>
3585 #include <linux/smp.h>
3586 #include <linux/io.h>
3587+#include <linux/irq.h>
3588 #include <linux/irqchip/arm-gic.h>
3589
3590 #include <asm/smp_scu.h>
3591diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3592index 3b56722..33ac281 100644
3593--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3594+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3595@@ -330,7 +330,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3596 return NOTIFY_OK;
3597 }
3598
3599-static struct notifier_block __refdata irq_hotplug_notifier = {
3600+static struct notifier_block irq_hotplug_notifier = {
3601 .notifier_call = irq_cpu_hotplug_notify,
3602 };
3603
3604diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3605index 166b18f..f985f04 100644
3606--- a/arch/arm/mach-omap2/omap_device.c
3607+++ b/arch/arm/mach-omap2/omap_device.c
3608@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3609 struct platform_device __init *omap_device_build(const char *pdev_name,
3610 int pdev_id,
3611 struct omap_hwmod *oh,
3612- void *pdata, int pdata_len)
3613+ const void *pdata, int pdata_len)
3614 {
3615 struct omap_hwmod *ohs[] = { oh };
3616
3617@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3618 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3619 int pdev_id,
3620 struct omap_hwmod **ohs,
3621- int oh_cnt, void *pdata,
3622+ int oh_cnt, const void *pdata,
3623 int pdata_len)
3624 {
3625 int ret = -ENOMEM;
3626diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3627index 78c02b3..c94109a 100644
3628--- a/arch/arm/mach-omap2/omap_device.h
3629+++ b/arch/arm/mach-omap2/omap_device.h
3630@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3631 /* Core code interface */
3632
3633 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3634- struct omap_hwmod *oh, void *pdata,
3635+ struct omap_hwmod *oh, const void *pdata,
3636 int pdata_len);
3637
3638 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3639 struct omap_hwmod **oh, int oh_cnt,
3640- void *pdata, int pdata_len);
3641+ const void *pdata, int pdata_len);
3642
3643 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3644 struct omap_hwmod **ohs, int oh_cnt);
3645diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3646index 752969f..a34b446 100644
3647--- a/arch/arm/mach-omap2/omap_hwmod.c
3648+++ b/arch/arm/mach-omap2/omap_hwmod.c
3649@@ -199,10 +199,10 @@ struct omap_hwmod_soc_ops {
3650 int (*init_clkdm)(struct omap_hwmod *oh);
3651 void (*update_context_lost)(struct omap_hwmod *oh);
3652 int (*get_context_lost)(struct omap_hwmod *oh);
3653-};
3654+} __no_const;
3655
3656 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3657-static struct omap_hwmod_soc_ops soc_ops;
3658+static struct omap_hwmod_soc_ops soc_ops __read_only;
3659
3660 /* omap_hwmod_list contains all registered struct omap_hwmods */
3661 static LIST_HEAD(omap_hwmod_list);
3662diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3663index 95fee54..cfa9cf1 100644
3664--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3665+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3666@@ -10,6 +10,7 @@
3667
3668 #include <linux/kernel.h>
3669 #include <linux/init.h>
3670+#include <asm/pgtable.h>
3671
3672 #include "powerdomain.h"
3673
3674@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3675
3676 void __init am43xx_powerdomains_init(void)
3677 {
3678- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3679+ pax_open_kernel();
3680+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3681+ pax_close_kernel();
3682 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3683 pwrdm_register_pwrdms(powerdomains_am43xx);
3684 pwrdm_complete_init();
3685diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3686index ff0a68c..b312aa0 100644
3687--- a/arch/arm/mach-omap2/wd_timer.c
3688+++ b/arch/arm/mach-omap2/wd_timer.c
3689@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3690 struct omap_hwmod *oh;
3691 char *oh_name = "wd_timer2";
3692 char *dev_name = "omap_wdt";
3693- struct omap_wd_timer_platform_data pdata;
3694+ static struct omap_wd_timer_platform_data pdata = {
3695+ .read_reset_sources = prm_read_reset_sources
3696+ };
3697
3698 if (!cpu_class_is_omap2() || of_have_populated_dt())
3699 return 0;
3700@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3701 return -EINVAL;
3702 }
3703
3704- pdata.read_reset_sources = prm_read_reset_sources;
3705-
3706 pdev = omap_device_build(dev_name, id, oh, &pdata,
3707 sizeof(struct omap_wd_timer_platform_data));
3708 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3709diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3710index 7469347..1ecc350 100644
3711--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3712+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3713@@ -177,7 +177,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3714 bool entered_lp2 = false;
3715
3716 if (tegra_pending_sgi())
3717- ACCESS_ONCE(abort_flag) = true;
3718+ ACCESS_ONCE_RW(abort_flag) = true;
3719
3720 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3721
3722diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3723index 3b9098d..15b390f 100644
3724--- a/arch/arm/mach-tegra/irq.c
3725+++ b/arch/arm/mach-tegra/irq.c
3726@@ -20,6 +20,7 @@
3727 #include <linux/cpu_pm.h>
3728 #include <linux/interrupt.h>
3729 #include <linux/io.h>
3730+#include <linux/irq.h>
3731 #include <linux/irqchip/arm-gic.h>
3732 #include <linux/irq.h>
3733 #include <linux/kernel.h>
3734diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3735index 2cb587b..6ddfebf 100644
3736--- a/arch/arm/mach-ux500/pm.c
3737+++ b/arch/arm/mach-ux500/pm.c
3738@@ -10,6 +10,7 @@
3739 */
3740
3741 #include <linux/kernel.h>
3742+#include <linux/irq.h>
3743 #include <linux/irqchip/arm-gic.h>
3744 #include <linux/delay.h>
3745 #include <linux/io.h>
3746diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3747index 2dea8b5..6499da2 100644
3748--- a/arch/arm/mach-ux500/setup.h
3749+++ b/arch/arm/mach-ux500/setup.h
3750@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3751 .type = MT_DEVICE, \
3752 }
3753
3754-#define __MEM_DEV_DESC(x, sz) { \
3755- .virtual = IO_ADDRESS(x), \
3756- .pfn = __phys_to_pfn(x), \
3757- .length = sz, \
3758- .type = MT_MEMORY_RWX, \
3759-}
3760-
3761 extern struct smp_operations ux500_smp_ops;
3762 extern void ux500_cpu_die(unsigned int cpu);
3763
3764diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3765index 52d768f..5f93180 100644
3766--- a/arch/arm/mach-zynq/platsmp.c
3767+++ b/arch/arm/mach-zynq/platsmp.c
3768@@ -24,6 +24,7 @@
3769 #include <linux/io.h>
3770 #include <asm/cacheflush.h>
3771 #include <asm/smp_scu.h>
3772+#include <linux/irq.h>
3773 #include <linux/irqchip/arm-gic.h>
3774 #include "common.h"
3775
3776diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3777index b4f92b9..ffefea9 100644
3778--- a/arch/arm/mm/Kconfig
3779+++ b/arch/arm/mm/Kconfig
3780@@ -446,6 +446,7 @@ config CPU_32v5
3781
3782 config CPU_32v6
3783 bool
3784+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3785 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3786
3787 config CPU_32v6K
3788@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3789
3790 config CPU_USE_DOMAINS
3791 bool
3792+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3793 help
3794 This option enables or disables the use of domain switching
3795 via the set_fs() function.
3796@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3797
3798 config KUSER_HELPERS
3799 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3800- depends on MMU
3801+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3802 default y
3803 help
3804 Warning: disabling this option may break user programs.
3805@@ -812,7 +814,7 @@ config KUSER_HELPERS
3806 See Documentation/arm/kernel_user_helpers.txt for details.
3807
3808 However, the fixed address nature of these helpers can be used
3809- by ROP (return orientated programming) authors when creating
3810+ by ROP (Return Oriented Programming) authors when creating
3811 exploits.
3812
3813 If all of the binaries and libraries which run on your platform
3814diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3815index 9769f1e..16aaa55 100644
3816--- a/arch/arm/mm/alignment.c
3817+++ b/arch/arm/mm/alignment.c
3818@@ -216,10 +216,12 @@ union offset_union {
3819 #define __get16_unaligned_check(ins,val,addr) \
3820 do { \
3821 unsigned int err = 0, v, a = addr; \
3822+ pax_open_userland(); \
3823 __get8_unaligned_check(ins,v,a,err); \
3824 val = v << ((BE) ? 8 : 0); \
3825 __get8_unaligned_check(ins,v,a,err); \
3826 val |= v << ((BE) ? 0 : 8); \
3827+ pax_close_userland(); \
3828 if (err) \
3829 goto fault; \
3830 } while (0)
3831@@ -233,6 +235,7 @@ union offset_union {
3832 #define __get32_unaligned_check(ins,val,addr) \
3833 do { \
3834 unsigned int err = 0, v, a = addr; \
3835+ pax_open_userland(); \
3836 __get8_unaligned_check(ins,v,a,err); \
3837 val = v << ((BE) ? 24 : 0); \
3838 __get8_unaligned_check(ins,v,a,err); \
3839@@ -241,6 +244,7 @@ union offset_union {
3840 val |= v << ((BE) ? 8 : 16); \
3841 __get8_unaligned_check(ins,v,a,err); \
3842 val |= v << ((BE) ? 0 : 24); \
3843+ pax_close_userland(); \
3844 if (err) \
3845 goto fault; \
3846 } while (0)
3847@@ -254,6 +258,7 @@ union offset_union {
3848 #define __put16_unaligned_check(ins,val,addr) \
3849 do { \
3850 unsigned int err = 0, v = val, a = addr; \
3851+ pax_open_userland(); \
3852 __asm__( FIRST_BYTE_16 \
3853 ARM( "1: "ins" %1, [%2], #1\n" ) \
3854 THUMB( "1: "ins" %1, [%2]\n" ) \
3855@@ -273,6 +278,7 @@ union offset_union {
3856 " .popsection\n" \
3857 : "=r" (err), "=&r" (v), "=&r" (a) \
3858 : "0" (err), "1" (v), "2" (a)); \
3859+ pax_close_userland(); \
3860 if (err) \
3861 goto fault; \
3862 } while (0)
3863@@ -286,6 +292,7 @@ union offset_union {
3864 #define __put32_unaligned_check(ins,val,addr) \
3865 do { \
3866 unsigned int err = 0, v = val, a = addr; \
3867+ pax_open_userland(); \
3868 __asm__( FIRST_BYTE_32 \
3869 ARM( "1: "ins" %1, [%2], #1\n" ) \
3870 THUMB( "1: "ins" %1, [%2]\n" ) \
3871@@ -315,6 +322,7 @@ union offset_union {
3872 " .popsection\n" \
3873 : "=r" (err), "=&r" (v), "=&r" (a) \
3874 : "0" (err), "1" (v), "2" (a)); \
3875+ pax_close_userland(); \
3876 if (err) \
3877 goto fault; \
3878 } while (0)
3879diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3880index e309c8f..f8965e8 100644
3881--- a/arch/arm/mm/cache-l2x0.c
3882+++ b/arch/arm/mm/cache-l2x0.c
3883@@ -43,7 +43,7 @@ struct l2c_init_data {
3884 void (*save)(void __iomem *);
3885 void (*configure)(void __iomem *);
3886 struct outer_cache_fns outer_cache;
3887-};
3888+} __do_const;
3889
3890 #define CACHE_LINE_SIZE 32
3891
3892diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3893index 845769e..4278fd7 100644
3894--- a/arch/arm/mm/context.c
3895+++ b/arch/arm/mm/context.c
3896@@ -43,7 +43,7 @@
3897 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3898
3899 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3900-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3901+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3902 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3903
3904 static DEFINE_PER_CPU(atomic64_t, active_asids);
3905@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3906 {
3907 static u32 cur_idx = 1;
3908 u64 asid = atomic64_read(&mm->context.id);
3909- u64 generation = atomic64_read(&asid_generation);
3910+ u64 generation = atomic64_read_unchecked(&asid_generation);
3911
3912 if (asid != 0) {
3913 /*
3914@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3915 */
3916 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3917 if (asid == NUM_USER_ASIDS) {
3918- generation = atomic64_add_return(ASID_FIRST_VERSION,
3919+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3920 &asid_generation);
3921 flush_context(cpu);
3922 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3923@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3924 cpu_set_reserved_ttbr0();
3925
3926 asid = atomic64_read(&mm->context.id);
3927- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3928+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3929 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3930 goto switch_mm_fastpath;
3931
3932 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3933 /* Check that our ASID belongs to the current generation. */
3934 asid = atomic64_read(&mm->context.id);
3935- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3936+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3937 asid = new_context(mm, cpu);
3938 atomic64_set(&mm->context.id, asid);
3939 }
3940diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3941index 6333d9c..3bb19f2 100644
3942--- a/arch/arm/mm/fault.c
3943+++ b/arch/arm/mm/fault.c
3944@@ -25,6 +25,7 @@
3945 #include <asm/system_misc.h>
3946 #include <asm/system_info.h>
3947 #include <asm/tlbflush.h>
3948+#include <asm/sections.h>
3949
3950 #include "fault.h"
3951
3952@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3953 if (fixup_exception(regs))
3954 return;
3955
3956+#ifdef CONFIG_PAX_MEMORY_UDEREF
3957+ if (addr < TASK_SIZE) {
3958+ if (current->signal->curr_ip)
3959+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3960+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3961+ else
3962+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3963+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3964+ }
3965+#endif
3966+
3967+#ifdef CONFIG_PAX_KERNEXEC
3968+ if ((fsr & FSR_WRITE) &&
3969+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3970+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3971+ {
3972+ if (current->signal->curr_ip)
3973+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3974+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3975+ else
3976+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3977+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3978+ }
3979+#endif
3980+
3981 /*
3982 * No handler, we'll have to terminate things with extreme prejudice.
3983 */
3984@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3985 }
3986 #endif
3987
3988+#ifdef CONFIG_PAX_PAGEEXEC
3989+ if (fsr & FSR_LNX_PF) {
3990+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3991+ do_group_exit(SIGKILL);
3992+ }
3993+#endif
3994+
3995 tsk->thread.address = addr;
3996 tsk->thread.error_code = fsr;
3997 tsk->thread.trap_no = 14;
3998@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3999 }
4000 #endif /* CONFIG_MMU */
4001
4002+#ifdef CONFIG_PAX_PAGEEXEC
4003+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4004+{
4005+ long i;
4006+
4007+ printk(KERN_ERR "PAX: bytes at PC: ");
4008+ for (i = 0; i < 20; i++) {
4009+ unsigned char c;
4010+ if (get_user(c, (__force unsigned char __user *)pc+i))
4011+ printk(KERN_CONT "?? ");
4012+ else
4013+ printk(KERN_CONT "%02x ", c);
4014+ }
4015+ printk("\n");
4016+
4017+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4018+ for (i = -1; i < 20; i++) {
4019+ unsigned long c;
4020+ if (get_user(c, (__force unsigned long __user *)sp+i))
4021+ printk(KERN_CONT "???????? ");
4022+ else
4023+ printk(KERN_CONT "%08lx ", c);
4024+ }
4025+ printk("\n");
4026+}
4027+#endif
4028+
4029 /*
4030 * First Level Translation Fault Handler
4031 *
4032@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4033 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4034 struct siginfo info;
4035
4036+#ifdef CONFIG_PAX_MEMORY_UDEREF
4037+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4038+ if (current->signal->curr_ip)
4039+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4040+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4041+ else
4042+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4043+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4044+ goto die;
4045+ }
4046+#endif
4047+
4048 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4049 return;
4050
4051+die:
4052 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4053 inf->name, fsr, addr);
4054 show_pte(current->mm, addr);
4055@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4056 ifsr_info[nr].name = name;
4057 }
4058
4059+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4060+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4061+
4062 asmlinkage void __exception
4063 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4064 {
4065 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4066 struct siginfo info;
4067+ unsigned long pc = instruction_pointer(regs);
4068+
4069+ if (user_mode(regs)) {
4070+ unsigned long sigpage = current->mm->context.sigpage;
4071+
4072+ if (sigpage <= pc && pc < sigpage + 7*4) {
4073+ if (pc < sigpage + 3*4)
4074+ sys_sigreturn(regs);
4075+ else
4076+ sys_rt_sigreturn(regs);
4077+ return;
4078+ }
4079+ if (pc == 0xffff0f60UL) {
4080+ /*
4081+ * PaX: __kuser_cmpxchg64 emulation
4082+ */
4083+ // TODO
4084+ //regs->ARM_pc = regs->ARM_lr;
4085+ //return;
4086+ }
4087+ if (pc == 0xffff0fa0UL) {
4088+ /*
4089+ * PaX: __kuser_memory_barrier emulation
4090+ */
4091+ // dmb(); implied by the exception
4092+ regs->ARM_pc = regs->ARM_lr;
4093+ return;
4094+ }
4095+ if (pc == 0xffff0fc0UL) {
4096+ /*
4097+ * PaX: __kuser_cmpxchg emulation
4098+ */
4099+ // TODO
4100+ //long new;
4101+ //int op;
4102+
4103+ //op = FUTEX_OP_SET << 28;
4104+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4105+ //regs->ARM_r0 = old != new;
4106+ //regs->ARM_pc = regs->ARM_lr;
4107+ //return;
4108+ }
4109+ if (pc == 0xffff0fe0UL) {
4110+ /*
4111+ * PaX: __kuser_get_tls emulation
4112+ */
4113+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4114+ regs->ARM_pc = regs->ARM_lr;
4115+ return;
4116+ }
4117+ }
4118+
4119+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4120+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4121+ if (current->signal->curr_ip)
4122+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4123+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4124+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4125+ else
4126+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4127+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129+ goto die;
4130+ }
4131+#endif
4132+
4133+#ifdef CONFIG_PAX_REFCOUNT
4134+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4135+#ifdef CONFIG_THUMB2_KERNEL
4136+ unsigned short bkpt;
4137+
4138+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4139+#else
4140+ unsigned int bkpt;
4141+
4142+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4143+#endif
4144+ current->thread.error_code = ifsr;
4145+ current->thread.trap_no = 0;
4146+ pax_report_refcount_overflow(regs);
4147+ fixup_exception(regs);
4148+ return;
4149+ }
4150+ }
4151+#endif
4152
4153 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4154 return;
4155
4156+die:
4157 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4158 inf->name, ifsr, addr);
4159
4160diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4161index cf08bdf..772656c 100644
4162--- a/arch/arm/mm/fault.h
4163+++ b/arch/arm/mm/fault.h
4164@@ -3,6 +3,7 @@
4165
4166 /*
4167 * Fault status register encodings. We steal bit 31 for our own purposes.
4168+ * Set when the FSR value is from an instruction fault.
4169 */
4170 #define FSR_LNX_PF (1 << 31)
4171 #define FSR_WRITE (1 << 11)
4172@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4173 }
4174 #endif
4175
4176+/* valid for LPAE and !LPAE */
4177+static inline int is_xn_fault(unsigned int fsr)
4178+{
4179+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4180+}
4181+
4182+static inline int is_domain_fault(unsigned int fsr)
4183+{
4184+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4185+}
4186+
4187 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4188 unsigned long search_exception_table(unsigned long addr);
4189
4190diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4191index be92fa0..5252d7e 100644
4192--- a/arch/arm/mm/init.c
4193+++ b/arch/arm/mm/init.c
4194@@ -709,7 +709,46 @@ void free_tcmmem(void)
4195 {
4196 #ifdef CONFIG_HAVE_TCM
4197 extern char __tcm_start, __tcm_end;
4198+#endif
4199
4200+#ifdef CONFIG_PAX_KERNEXEC
4201+ unsigned long addr;
4202+ pgd_t *pgd;
4203+ pud_t *pud;
4204+ pmd_t *pmd;
4205+ int cpu_arch = cpu_architecture();
4206+ unsigned int cr = get_cr();
4207+
4208+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4209+ /* make pages tables, etc before .text NX */
4210+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4211+ pgd = pgd_offset_k(addr);
4212+ pud = pud_offset(pgd, addr);
4213+ pmd = pmd_offset(pud, addr);
4214+ __section_update(pmd, addr, PMD_SECT_XN);
4215+ }
4216+ /* make init NX */
4217+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4218+ pgd = pgd_offset_k(addr);
4219+ pud = pud_offset(pgd, addr);
4220+ pmd = pmd_offset(pud, addr);
4221+ __section_update(pmd, addr, PMD_SECT_XN);
4222+ }
4223+ /* make kernel code/rodata RX */
4224+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4225+ pgd = pgd_offset_k(addr);
4226+ pud = pud_offset(pgd, addr);
4227+ pmd = pmd_offset(pud, addr);
4228+#ifdef CONFIG_ARM_LPAE
4229+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4230+#else
4231+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4232+#endif
4233+ }
4234+ }
4235+#endif
4236+
4237+#ifdef CONFIG_HAVE_TCM
4238 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4239 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4240 #endif
4241diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4242index d1e5ad7..84dcbf2 100644
4243--- a/arch/arm/mm/ioremap.c
4244+++ b/arch/arm/mm/ioremap.c
4245@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4246 unsigned int mtype;
4247
4248 if (cached)
4249- mtype = MT_MEMORY_RWX;
4250+ mtype = MT_MEMORY_RX;
4251 else
4252- mtype = MT_MEMORY_RWX_NONCACHED;
4253+ mtype = MT_MEMORY_RX_NONCACHED;
4254
4255 return __arm_ioremap_caller(phys_addr, size, mtype,
4256 __builtin_return_address(0));
4257diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4258index 407dc78..047ce9d 100644
4259--- a/arch/arm/mm/mmap.c
4260+++ b/arch/arm/mm/mmap.c
4261@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4262 struct vm_area_struct *vma;
4263 int do_align = 0;
4264 int aliasing = cache_is_vipt_aliasing();
4265+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4266 struct vm_unmapped_area_info info;
4267
4268 /*
4269@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4270 if (len > TASK_SIZE)
4271 return -ENOMEM;
4272
4273+#ifdef CONFIG_PAX_RANDMMAP
4274+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4275+#endif
4276+
4277 if (addr) {
4278 if (do_align)
4279 addr = COLOUR_ALIGN(addr, pgoff);
4280@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4281 addr = PAGE_ALIGN(addr);
4282
4283 vma = find_vma(mm, addr);
4284- if (TASK_SIZE - len >= addr &&
4285- (!vma || addr + len <= vma->vm_start))
4286+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4287 return addr;
4288 }
4289
4290@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4291 info.high_limit = TASK_SIZE;
4292 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4293 info.align_offset = pgoff << PAGE_SHIFT;
4294+ info.threadstack_offset = offset;
4295 return vm_unmapped_area(&info);
4296 }
4297
4298@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4299 unsigned long addr = addr0;
4300 int do_align = 0;
4301 int aliasing = cache_is_vipt_aliasing();
4302+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4303 struct vm_unmapped_area_info info;
4304
4305 /*
4306@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4307 return addr;
4308 }
4309
4310+#ifdef CONFIG_PAX_RANDMMAP
4311+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4312+#endif
4313+
4314 /* requesting a specific address */
4315 if (addr) {
4316 if (do_align)
4317@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4318 else
4319 addr = PAGE_ALIGN(addr);
4320 vma = find_vma(mm, addr);
4321- if (TASK_SIZE - len >= addr &&
4322- (!vma || addr + len <= vma->vm_start))
4323+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4324 return addr;
4325 }
4326
4327@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4328 info.high_limit = mm->mmap_base;
4329 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4330 info.align_offset = pgoff << PAGE_SHIFT;
4331+ info.threadstack_offset = offset;
4332 addr = vm_unmapped_area(&info);
4333
4334 /*
4335@@ -183,14 +193,30 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4336 {
4337 unsigned long random_factor = 0UL;
4338
4339+#ifdef CONFIG_PAX_RANDMMAP
4340+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4341+#endif
4342+
4343 if (current->flags & PF_RANDOMIZE)
4344 random_factor = arch_mmap_rnd();
4345
4346 if (mmap_is_legacy()) {
4347 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4348+
4349+#ifdef CONFIG_PAX_RANDMMAP
4350+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4351+ mm->mmap_base += mm->delta_mmap;
4352+#endif
4353+
4354 mm->get_unmapped_area = arch_get_unmapped_area;
4355 } else {
4356 mm->mmap_base = mmap_base(random_factor);
4357+
4358+#ifdef CONFIG_PAX_RANDMMAP
4359+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4360+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4361+#endif
4362+
4363 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4364 }
4365 }
4366diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4367index 7186382..0c145cf 100644
4368--- a/arch/arm/mm/mmu.c
4369+++ b/arch/arm/mm/mmu.c
4370@@ -41,6 +41,22 @@
4371 #include "mm.h"
4372 #include "tcm.h"
4373
4374+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4375+void modify_domain(unsigned int dom, unsigned int type)
4376+{
4377+ struct thread_info *thread = current_thread_info();
4378+ unsigned int domain = thread->cpu_domain;
4379+ /*
4380+ * DOMAIN_MANAGER might be defined to some other value,
4381+ * use the arch-defined constant
4382+ */
4383+ domain &= ~domain_val(dom, 3);
4384+ thread->cpu_domain = domain | domain_val(dom, type);
4385+ set_domain(thread->cpu_domain);
4386+}
4387+EXPORT_SYMBOL(modify_domain);
4388+#endif
4389+
4390 /*
4391 * empty_zero_page is a special page that is used for
4392 * zero-initialized data and COW.
4393@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4394 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4395 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4396
4397-static struct mem_type mem_types[] = {
4398+#ifdef CONFIG_PAX_KERNEXEC
4399+#define L_PTE_KERNEXEC L_PTE_RDONLY
4400+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4401+#else
4402+#define L_PTE_KERNEXEC L_PTE_DIRTY
4403+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4404+#endif
4405+
4406+static struct mem_type mem_types[] __read_only = {
4407 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4408 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4409 L_PTE_SHARED,
4410@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4411 .prot_sect = PROT_SECT_DEVICE,
4412 .domain = DOMAIN_IO,
4413 },
4414- [MT_UNCACHED] = {
4415+ [MT_UNCACHED_RW] = {
4416 .prot_pte = PROT_PTE_DEVICE,
4417 .prot_l1 = PMD_TYPE_TABLE,
4418 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4419 .domain = DOMAIN_IO,
4420 },
4421- [MT_CACHECLEAN] = {
4422- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4423+ [MT_CACHECLEAN_RO] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427 #ifndef CONFIG_ARM_LPAE
4428- [MT_MINICLEAN] = {
4429- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4430+ [MT_MINICLEAN_RO] = {
4431+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4432 .domain = DOMAIN_KERNEL,
4433 },
4434 #endif
4435@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4436 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4437 L_PTE_RDONLY,
4438 .prot_l1 = PMD_TYPE_TABLE,
4439- .domain = DOMAIN_USER,
4440+ .domain = DOMAIN_VECTORS,
4441 },
4442 [MT_HIGH_VECTORS] = {
4443 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4444 L_PTE_USER | L_PTE_RDONLY,
4445 .prot_l1 = PMD_TYPE_TABLE,
4446- .domain = DOMAIN_USER,
4447+ .domain = DOMAIN_VECTORS,
4448 },
4449- [MT_MEMORY_RWX] = {
4450+ [__MT_MEMORY_RWX] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4452 .prot_l1 = PMD_TYPE_TABLE,
4453 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4454@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4455 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4456 .domain = DOMAIN_KERNEL,
4457 },
4458- [MT_ROM] = {
4459- .prot_sect = PMD_TYPE_SECT,
4460+ [MT_MEMORY_RX] = {
4461+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4462+ .prot_l1 = PMD_TYPE_TABLE,
4463+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4464+ .domain = DOMAIN_KERNEL,
4465+ },
4466+ [MT_ROM_RX] = {
4467+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4468 .domain = DOMAIN_KERNEL,
4469 },
4470- [MT_MEMORY_RWX_NONCACHED] = {
4471+ [MT_MEMORY_RW_NONCACHED] = {
4472 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4473 L_PTE_MT_BUFFERABLE,
4474 .prot_l1 = PMD_TYPE_TABLE,
4475 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4476 .domain = DOMAIN_KERNEL,
4477 },
4478+ [MT_MEMORY_RX_NONCACHED] = {
4479+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4480+ L_PTE_MT_BUFFERABLE,
4481+ .prot_l1 = PMD_TYPE_TABLE,
4482+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4483+ .domain = DOMAIN_KERNEL,
4484+ },
4485 [MT_MEMORY_RW_DTCM] = {
4486 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4487 L_PTE_XN,
4488@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4489 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4490 .domain = DOMAIN_KERNEL,
4491 },
4492- [MT_MEMORY_RWX_ITCM] = {
4493- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4494+ [MT_MEMORY_RX_ITCM] = {
4495+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4496 .prot_l1 = PMD_TYPE_TABLE,
4497+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498 .domain = DOMAIN_KERNEL,
4499 },
4500 [MT_MEMORY_RW_SO] = {
4501@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4502 * Mark cache clean areas and XIP ROM read only
4503 * from SVC mode and no access from userspace.
4504 */
4505- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4506- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4507- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4508+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4509+#ifdef CONFIG_PAX_KERNEXEC
4510+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4511+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4512+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4513+#endif
4514+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4515+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4516 #endif
4517
4518 /*
4519@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4520 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4521 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4522 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4523- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4524- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4525+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4526+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4527 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4528 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4529+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4530+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4531 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4532- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4533- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4534+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4535+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4536+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4537+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4538 }
4539 }
4540
4541@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4542 if (cpu_arch >= CPU_ARCH_ARMv6) {
4543 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4544 /* Non-cacheable Normal is XCB = 001 */
4545- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4547+ PMD_SECT_BUFFERED;
4548+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4549 PMD_SECT_BUFFERED;
4550 } else {
4551 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4552- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4553+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4554+ PMD_SECT_TEX(1);
4555+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4556 PMD_SECT_TEX(1);
4557 }
4558 } else {
4559- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4560+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4561+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4562 }
4563
4564 #ifdef CONFIG_ARM_LPAE
4565@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4566 user_pgprot |= PTE_EXT_PXN;
4567 #endif
4568
4569+ user_pgprot |= __supported_pte_mask;
4570+
4571 for (i = 0; i < 16; i++) {
4572 pteval_t v = pgprot_val(protection_map[i]);
4573 protection_map[i] = __pgprot(v | user_pgprot);
4574@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4575
4576 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4577 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4578- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4579- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4580+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4581+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4582 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4583 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4584+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4585+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4586 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4587- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4588- mem_types[MT_ROM].prot_sect |= cp->pmd;
4589+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4590+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4591+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4592
4593 switch (cp->pmd) {
4594 case PMD_SECT_WT:
4595- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4596+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4597 break;
4598 case PMD_SECT_WB:
4599 case PMD_SECT_WBWA:
4600- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4601+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4602 break;
4603 }
4604 pr_info("Memory policy: %sData cache %s\n",
4605@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4606 return;
4607 }
4608
4609- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4610+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4611 md->virtual >= PAGE_OFFSET &&
4612 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4613 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4614@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4615 * called function. This means you can't use any function or debugging
4616 * method which may touch any device, otherwise the kernel _will_ crash.
4617 */
4618+
4619+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4620+
4621 static void __init devicemaps_init(const struct machine_desc *mdesc)
4622 {
4623 struct map_desc map;
4624 unsigned long addr;
4625- void *vectors;
4626
4627- /*
4628- * Allocate the vector page early.
4629- */
4630- vectors = early_alloc(PAGE_SIZE * 2);
4631-
4632- early_trap_init(vectors);
4633+ early_trap_init(&vectors);
4634
4635 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4636 pmd_clear(pmd_off_k(addr));
4637@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4638 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4639 map.virtual = MODULES_VADDR;
4640 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4641- map.type = MT_ROM;
4642+ map.type = MT_ROM_RX;
4643 create_mapping(&map);
4644 #endif
4645
4646@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4647 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4648 map.virtual = FLUSH_BASE;
4649 map.length = SZ_1M;
4650- map.type = MT_CACHECLEAN;
4651+ map.type = MT_CACHECLEAN_RO;
4652 create_mapping(&map);
4653 #endif
4654 #ifdef FLUSH_BASE_MINICACHE
4655 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4656 map.virtual = FLUSH_BASE_MINICACHE;
4657 map.length = SZ_1M;
4658- map.type = MT_MINICLEAN;
4659+ map.type = MT_MINICLEAN_RO;
4660 create_mapping(&map);
4661 #endif
4662
4663@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4664 * location (0xffff0000). If we aren't using high-vectors, also
4665 * create a mapping at the low-vectors virtual address.
4666 */
4667- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4668+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4669 map.virtual = 0xffff0000;
4670 map.length = PAGE_SIZE;
4671 #ifdef CONFIG_KUSER_HELPERS
4672@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4673 static void __init map_lowmem(void)
4674 {
4675 struct memblock_region *reg;
4676+#ifndef CONFIG_PAX_KERNEXEC
4677 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4678 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4679+#endif
4680
4681 /* Map all the lowmem memory banks. */
4682 for_each_memblock(memory, reg) {
4683@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4684 if (start >= end)
4685 break;
4686
4687+#ifdef CONFIG_PAX_KERNEXEC
4688+ map.pfn = __phys_to_pfn(start);
4689+ map.virtual = __phys_to_virt(start);
4690+ map.length = end - start;
4691+
4692+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4693+ struct map_desc kernel;
4694+ struct map_desc initmap;
4695+
4696+ /* when freeing initmem we will make this RW */
4697+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4698+ initmap.virtual = (unsigned long)__init_begin;
4699+ initmap.length = _sdata - __init_begin;
4700+ initmap.type = __MT_MEMORY_RWX;
4701+ create_mapping(&initmap);
4702+
4703+ /* when freeing initmem we will make this RX */
4704+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4705+ kernel.virtual = (unsigned long)_stext;
4706+ kernel.length = __init_begin - _stext;
4707+ kernel.type = __MT_MEMORY_RWX;
4708+ create_mapping(&kernel);
4709+
4710+ if (map.virtual < (unsigned long)_stext) {
4711+ map.length = (unsigned long)_stext - map.virtual;
4712+ map.type = __MT_MEMORY_RWX;
4713+ create_mapping(&map);
4714+ }
4715+
4716+ map.pfn = __phys_to_pfn(__pa(_sdata));
4717+ map.virtual = (unsigned long)_sdata;
4718+ map.length = end - __pa(_sdata);
4719+ }
4720+
4721+ map.type = MT_MEMORY_RW;
4722+ create_mapping(&map);
4723+#else
4724 if (end < kernel_x_start) {
4725 map.pfn = __phys_to_pfn(start);
4726 map.virtual = __phys_to_virt(start);
4727 map.length = end - start;
4728- map.type = MT_MEMORY_RWX;
4729+ map.type = __MT_MEMORY_RWX;
4730
4731 create_mapping(&map);
4732 } else if (start >= kernel_x_end) {
4733@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4734 map.pfn = __phys_to_pfn(kernel_x_start);
4735 map.virtual = __phys_to_virt(kernel_x_start);
4736 map.length = kernel_x_end - kernel_x_start;
4737- map.type = MT_MEMORY_RWX;
4738+ map.type = __MT_MEMORY_RWX;
4739
4740 create_mapping(&map);
4741
4742@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4743 create_mapping(&map);
4744 }
4745 }
4746+#endif
4747 }
4748 }
4749
4750diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4751index e0e2358..a4ee460 100644
4752--- a/arch/arm/net/bpf_jit_32.c
4753+++ b/arch/arm/net/bpf_jit_32.c
4754@@ -20,6 +20,7 @@
4755 #include <asm/cacheflush.h>
4756 #include <asm/hwcap.h>
4757 #include <asm/opcodes.h>
4758+#include <asm/pgtable.h>
4759
4760 #include "bpf_jit_32.h"
4761
4762@@ -72,34 +73,58 @@ struct jit_ctx {
4763 #endif
4764 };
4765
4766+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4767+int bpf_jit_enable __read_only;
4768+#else
4769 int bpf_jit_enable __read_mostly;
4770+#endif
4771
4772-static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4773+static inline int call_neg_helper(struct sk_buff *skb, int offset, void *ret,
4774+ unsigned int size)
4775+{
4776+ void *ptr = bpf_internal_load_pointer_neg_helper(skb, offset, size);
4777+
4778+ if (!ptr)
4779+ return -EFAULT;
4780+ memcpy(ret, ptr, size);
4781+ return 0;
4782+}
4783+
4784+static u64 jit_get_skb_b(struct sk_buff *skb, int offset)
4785 {
4786 u8 ret;
4787 int err;
4788
4789- err = skb_copy_bits(skb, offset, &ret, 1);
4790+ if (offset < 0)
4791+ err = call_neg_helper(skb, offset, &ret, 1);
4792+ else
4793+ err = skb_copy_bits(skb, offset, &ret, 1);
4794
4795 return (u64)err << 32 | ret;
4796 }
4797
4798-static u64 jit_get_skb_h(struct sk_buff *skb, unsigned offset)
4799+static u64 jit_get_skb_h(struct sk_buff *skb, int offset)
4800 {
4801 u16 ret;
4802 int err;
4803
4804- err = skb_copy_bits(skb, offset, &ret, 2);
4805+ if (offset < 0)
4806+ err = call_neg_helper(skb, offset, &ret, 2);
4807+ else
4808+ err = skb_copy_bits(skb, offset, &ret, 2);
4809
4810 return (u64)err << 32 | ntohs(ret);
4811 }
4812
4813-static u64 jit_get_skb_w(struct sk_buff *skb, unsigned offset)
4814+static u64 jit_get_skb_w(struct sk_buff *skb, int offset)
4815 {
4816 u32 ret;
4817 int err;
4818
4819- err = skb_copy_bits(skb, offset, &ret, 4);
4820+ if (offset < 0)
4821+ err = call_neg_helper(skb, offset, &ret, 4);
4822+ else
4823+ err = skb_copy_bits(skb, offset, &ret, 4);
4824
4825 return (u64)err << 32 | ntohl(ret);
4826 }
4827@@ -179,8 +204,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4828 {
4829 u32 *ptr;
4830 /* We are guaranteed to have aligned memory. */
4831+ pax_open_kernel();
4832 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4833 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4834+ pax_close_kernel();
4835 }
4836
4837 static void build_prologue(struct jit_ctx *ctx)
4838@@ -536,9 +563,6 @@ static int build_body(struct jit_ctx *ctx)
4839 case BPF_LD | BPF_B | BPF_ABS:
4840 load_order = 0;
4841 load:
4842- /* the interpreter will deal with the negative K */
4843- if ((int)k < 0)
4844- return -ENOTSUPP;
4845 emit_mov_i(r_off, k, ctx);
4846 load_common:
4847 ctx->seen |= SEEN_DATA | SEEN_CALL;
4848@@ -547,12 +571,24 @@ load_common:
4849 emit(ARM_SUB_I(r_scratch, r_skb_hl,
4850 1 << load_order), ctx);
4851 emit(ARM_CMP_R(r_scratch, r_off), ctx);
4852- condt = ARM_COND_HS;
4853+ condt = ARM_COND_GE;
4854 } else {
4855 emit(ARM_CMP_R(r_skb_hl, r_off), ctx);
4856 condt = ARM_COND_HI;
4857 }
4858
4859+ /*
4860+ * test for negative offset, only if we are
4861+ * currently scheduled to take the fast
4862+ * path. this will update the flags so that
4863+ * the slowpath instruction are ignored if the
4864+ * offset is negative.
4865+ *
4866+ * for loard_order == 0 the HI condition will
4867+ * make loads at offset 0 take the slow path too.
4868+ */
4869+ _emit(condt, ARM_CMP_I(r_off, 0), ctx);
4870+
4871 _emit(condt, ARM_ADD_R(r_scratch, r_off, r_skb_data),
4872 ctx);
4873
4874@@ -860,9 +896,11 @@ b_epilogue:
4875 off = offsetof(struct sk_buff, vlan_tci);
4876 emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
4877 if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
4878- OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
4879- else
4880- OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
4881+ OP_IMM3(ARM_AND, r_A, r_A, ~VLAN_TAG_PRESENT, ctx);
4882+ else {
4883+ OP_IMM3(ARM_LSR, r_A, r_A, 12, ctx);
4884+ OP_IMM3(ARM_AND, r_A, r_A, 0x1, ctx);
4885+ }
4886 break;
4887 case BPF_ANC | SKF_AD_QUEUE:
4888 ctx->seen |= SEEN_SKB;
4889diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4890index 5b217f4..c23f40e 100644
4891--- a/arch/arm/plat-iop/setup.c
4892+++ b/arch/arm/plat-iop/setup.c
4893@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4894 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4895 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4896 .length = IOP3XX_PERIPHERAL_SIZE,
4897- .type = MT_UNCACHED,
4898+ .type = MT_UNCACHED_RW,
4899 },
4900 };
4901
4902diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4903index a5bc92d..0bb4730 100644
4904--- a/arch/arm/plat-omap/sram.c
4905+++ b/arch/arm/plat-omap/sram.c
4906@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4907 * Looks like we need to preserve some bootloader code at the
4908 * beginning of SRAM for jumping to flash for reboot to work...
4909 */
4910+ pax_open_kernel();
4911 memset_io(omap_sram_base + omap_sram_skip, 0,
4912 omap_sram_size - omap_sram_skip);
4913+ pax_close_kernel();
4914 }
4915diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4916index 7047051..44e8675 100644
4917--- a/arch/arm64/include/asm/atomic.h
4918+++ b/arch/arm64/include/asm/atomic.h
4919@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4920 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4921 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4922
4923+#define atomic64_read_unchecked(v) atomic64_read(v)
4924+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4925+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4926+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4927+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4928+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4929+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4930+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4931+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4932+
4933 #endif
4934 #endif
4935diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4936index 71f19c4..2b13cfe 100644
4937--- a/arch/arm64/include/asm/barrier.h
4938+++ b/arch/arm64/include/asm/barrier.h
4939@@ -44,7 +44,7 @@
4940 do { \
4941 compiletime_assert_atomic_type(*p); \
4942 barrier(); \
4943- ACCESS_ONCE(*p) = (v); \
4944+ ACCESS_ONCE_RW(*p) = (v); \
4945 } while (0)
4946
4947 #define smp_load_acquire(p) \
4948diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4949index 4fde8c1..441f84f 100644
4950--- a/arch/arm64/include/asm/percpu.h
4951+++ b/arch/arm64/include/asm/percpu.h
4952@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4953 {
4954 switch (size) {
4955 case 1:
4956- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4957+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4958 break;
4959 case 2:
4960- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4961+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4962 break;
4963 case 4:
4964- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4965+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4966 break;
4967 case 8:
4968- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4969+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4970 break;
4971 default:
4972 BUILD_BUG();
4973diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4974index 7642056..bffc904 100644
4975--- a/arch/arm64/include/asm/pgalloc.h
4976+++ b/arch/arm64/include/asm/pgalloc.h
4977@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4978 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4979 }
4980
4981+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4982+{
4983+ pud_populate(mm, pud, pmd);
4984+}
4985+
4986 #endif /* CONFIG_PGTABLE_LEVELS > 2 */
4987
4988 #if CONFIG_PGTABLE_LEVELS > 3
4989diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4990index 07e1ba44..ec8cbbb 100644
4991--- a/arch/arm64/include/asm/uaccess.h
4992+++ b/arch/arm64/include/asm/uaccess.h
4993@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4994 flag; \
4995 })
4996
4997+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4998 #define access_ok(type, addr, size) __range_ok(addr, size)
4999 #define user_addr_max get_fs
5000
5001diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
5002index b0bd4e5..54e82f6 100644
5003--- a/arch/arm64/mm/dma-mapping.c
5004+++ b/arch/arm64/mm/dma-mapping.c
5005@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
5006 phys_to_page(paddr),
5007 size >> PAGE_SHIFT);
5008 if (!freed)
5009- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5010+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5011 }
5012
5013 static void *__dma_alloc(struct device *dev, size_t size,
5014diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
5015index c3a58a1..78fbf54 100644
5016--- a/arch/avr32/include/asm/cache.h
5017+++ b/arch/avr32/include/asm/cache.h
5018@@ -1,8 +1,10 @@
5019 #ifndef __ASM_AVR32_CACHE_H
5020 #define __ASM_AVR32_CACHE_H
5021
5022+#include <linux/const.h>
5023+
5024 #define L1_CACHE_SHIFT 5
5025-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5026+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5027
5028 /*
5029 * Memory returned by kmalloc() may be used for DMA, so we must make
5030diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
5031index 0388ece..87c8df1 100644
5032--- a/arch/avr32/include/asm/elf.h
5033+++ b/arch/avr32/include/asm/elf.h
5034@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
5035 the loader. We need to make sure that it is out of the way of the program
5036 that it will "exec", and that there is sufficient room for the brk. */
5037
5038-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
5039+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
5040
5041+#ifdef CONFIG_PAX_ASLR
5042+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
5043+
5044+#define PAX_DELTA_MMAP_LEN 15
5045+#define PAX_DELTA_STACK_LEN 15
5046+#endif
5047
5048 /* This yields a mask that user programs can use to figure out what
5049 instruction set this CPU supports. This could be done in user space,
5050diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
5051index 479330b..53717a8 100644
5052--- a/arch/avr32/include/asm/kmap_types.h
5053+++ b/arch/avr32/include/asm/kmap_types.h
5054@@ -2,9 +2,9 @@
5055 #define __ASM_AVR32_KMAP_TYPES_H
5056
5057 #ifdef CONFIG_DEBUG_HIGHMEM
5058-# define KM_TYPE_NR 29
5059+# define KM_TYPE_NR 30
5060 #else
5061-# define KM_TYPE_NR 14
5062+# define KM_TYPE_NR 15
5063 #endif
5064
5065 #endif /* __ASM_AVR32_KMAP_TYPES_H */
5066diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
5067index d223a8b..69c5210 100644
5068--- a/arch/avr32/mm/fault.c
5069+++ b/arch/avr32/mm/fault.c
5070@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
5071
5072 int exception_trace = 1;
5073
5074+#ifdef CONFIG_PAX_PAGEEXEC
5075+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5076+{
5077+ unsigned long i;
5078+
5079+ printk(KERN_ERR "PAX: bytes at PC: ");
5080+ for (i = 0; i < 20; i++) {
5081+ unsigned char c;
5082+ if (get_user(c, (unsigned char *)pc+i))
5083+ printk(KERN_CONT "???????? ");
5084+ else
5085+ printk(KERN_CONT "%02x ", c);
5086+ }
5087+ printk("\n");
5088+}
5089+#endif
5090+
5091 /*
5092 * This routine handles page faults. It determines the address and the
5093 * problem, and then passes it off to one of the appropriate routines.
5094@@ -178,6 +195,16 @@ bad_area:
5095 up_read(&mm->mmap_sem);
5096
5097 if (user_mode(regs)) {
5098+
5099+#ifdef CONFIG_PAX_PAGEEXEC
5100+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
5101+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
5102+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
5103+ do_group_exit(SIGKILL);
5104+ }
5105+ }
5106+#endif
5107+
5108 if (exception_trace && printk_ratelimit())
5109 printk("%s%s[%d]: segfault at %08lx pc %08lx "
5110 "sp %08lx ecr %lu\n",
5111diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
5112index 568885a..f8008df 100644
5113--- a/arch/blackfin/include/asm/cache.h
5114+++ b/arch/blackfin/include/asm/cache.h
5115@@ -7,6 +7,7 @@
5116 #ifndef __ARCH_BLACKFIN_CACHE_H
5117 #define __ARCH_BLACKFIN_CACHE_H
5118
5119+#include <linux/const.h>
5120 #include <linux/linkage.h> /* for asmlinkage */
5121
5122 /*
5123@@ -14,7 +15,7 @@
5124 * Blackfin loads 32 bytes for cache
5125 */
5126 #define L1_CACHE_SHIFT 5
5127-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5128+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5129 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5130
5131 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5132diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5133index aea2718..3639a60 100644
5134--- a/arch/cris/include/arch-v10/arch/cache.h
5135+++ b/arch/cris/include/arch-v10/arch/cache.h
5136@@ -1,8 +1,9 @@
5137 #ifndef _ASM_ARCH_CACHE_H
5138 #define _ASM_ARCH_CACHE_H
5139
5140+#include <linux/const.h>
5141 /* Etrax 100LX have 32-byte cache-lines. */
5142-#define L1_CACHE_BYTES 32
5143 #define L1_CACHE_SHIFT 5
5144+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5145
5146 #endif /* _ASM_ARCH_CACHE_H */
5147diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5148index 7caf25d..ee65ac5 100644
5149--- a/arch/cris/include/arch-v32/arch/cache.h
5150+++ b/arch/cris/include/arch-v32/arch/cache.h
5151@@ -1,11 +1,12 @@
5152 #ifndef _ASM_CRIS_ARCH_CACHE_H
5153 #define _ASM_CRIS_ARCH_CACHE_H
5154
5155+#include <linux/const.h>
5156 #include <arch/hwregs/dma.h>
5157
5158 /* A cache-line is 32 bytes. */
5159-#define L1_CACHE_BYTES 32
5160 #define L1_CACHE_SHIFT 5
5161+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5162
5163 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5164
5165diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5166index 102190a..5334cea 100644
5167--- a/arch/frv/include/asm/atomic.h
5168+++ b/arch/frv/include/asm/atomic.h
5169@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5170 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5171 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5172
5173+#define atomic64_read_unchecked(v) atomic64_read(v)
5174+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5175+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5176+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5177+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5178+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5179+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5180+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5181+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5182+
5183 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5184 {
5185 int c, old;
5186diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5187index 2797163..c2a401df9 100644
5188--- a/arch/frv/include/asm/cache.h
5189+++ b/arch/frv/include/asm/cache.h
5190@@ -12,10 +12,11 @@
5191 #ifndef __ASM_CACHE_H
5192 #define __ASM_CACHE_H
5193
5194+#include <linux/const.h>
5195
5196 /* bytes per L1 cache line */
5197 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5198-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5199+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5200
5201 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5202 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5203diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5204index 43901f2..0d8b865 100644
5205--- a/arch/frv/include/asm/kmap_types.h
5206+++ b/arch/frv/include/asm/kmap_types.h
5207@@ -2,6 +2,6 @@
5208 #ifndef _ASM_KMAP_TYPES_H
5209 #define _ASM_KMAP_TYPES_H
5210
5211-#define KM_TYPE_NR 17
5212+#define KM_TYPE_NR 18
5213
5214 #endif
5215diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5216index 836f147..4cf23f5 100644
5217--- a/arch/frv/mm/elf-fdpic.c
5218+++ b/arch/frv/mm/elf-fdpic.c
5219@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5220 {
5221 struct vm_area_struct *vma;
5222 struct vm_unmapped_area_info info;
5223+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5224
5225 if (len > TASK_SIZE)
5226 return -ENOMEM;
5227@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5228 if (addr) {
5229 addr = PAGE_ALIGN(addr);
5230 vma = find_vma(current->mm, addr);
5231- if (TASK_SIZE - len >= addr &&
5232- (!vma || addr + len <= vma->vm_start))
5233+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5234 goto success;
5235 }
5236
5237@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5238 info.high_limit = (current->mm->start_stack - 0x00200000);
5239 info.align_mask = 0;
5240 info.align_offset = 0;
5241+ info.threadstack_offset = offset;
5242 addr = vm_unmapped_area(&info);
5243 if (!(addr & ~PAGE_MASK))
5244 goto success;
5245diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5246index 69952c18..4fa2908 100644
5247--- a/arch/hexagon/include/asm/cache.h
5248+++ b/arch/hexagon/include/asm/cache.h
5249@@ -21,9 +21,11 @@
5250 #ifndef __ASM_CACHE_H
5251 #define __ASM_CACHE_H
5252
5253+#include <linux/const.h>
5254+
5255 /* Bytes per L1 cache line */
5256-#define L1_CACHE_SHIFT (5)
5257-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5258+#define L1_CACHE_SHIFT 5
5259+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5260
5261 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5262
5263diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5264index 76d25b2..d3793a0f 100644
5265--- a/arch/ia64/Kconfig
5266+++ b/arch/ia64/Kconfig
5267@@ -541,6 +541,7 @@ source "drivers/sn/Kconfig"
5268 config KEXEC
5269 bool "kexec system call"
5270 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5271+ depends on !GRKERNSEC_KMEM
5272 help
5273 kexec is a system call that implements the ability to shutdown your
5274 current kernel, and to start another kernel. It is like a reboot
5275diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5276index 970d0bd..e750b9b 100644
5277--- a/arch/ia64/Makefile
5278+++ b/arch/ia64/Makefile
5279@@ -98,5 +98,6 @@ endef
5280 archprepare: make_nr_irqs_h FORCE
5281 PHONY += make_nr_irqs_h FORCE
5282
5283+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5284 make_nr_irqs_h: FORCE
5285 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5286diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5287index 0bf0350..2ad1957 100644
5288--- a/arch/ia64/include/asm/atomic.h
5289+++ b/arch/ia64/include/asm/atomic.h
5290@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5291 #define atomic64_inc(v) atomic64_add(1, (v))
5292 #define atomic64_dec(v) atomic64_sub(1, (v))
5293
5294+#define atomic64_read_unchecked(v) atomic64_read(v)
5295+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5296+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5297+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5298+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5299+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5300+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5301+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5302+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5303+
5304 #endif /* _ASM_IA64_ATOMIC_H */
5305diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5306index f6769eb..1cdb590 100644
5307--- a/arch/ia64/include/asm/barrier.h
5308+++ b/arch/ia64/include/asm/barrier.h
5309@@ -66,7 +66,7 @@
5310 do { \
5311 compiletime_assert_atomic_type(*p); \
5312 barrier(); \
5313- ACCESS_ONCE(*p) = (v); \
5314+ ACCESS_ONCE_RW(*p) = (v); \
5315 } while (0)
5316
5317 #define smp_load_acquire(p) \
5318diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5319index 988254a..e1ee885 100644
5320--- a/arch/ia64/include/asm/cache.h
5321+++ b/arch/ia64/include/asm/cache.h
5322@@ -1,6 +1,7 @@
5323 #ifndef _ASM_IA64_CACHE_H
5324 #define _ASM_IA64_CACHE_H
5325
5326+#include <linux/const.h>
5327
5328 /*
5329 * Copyright (C) 1998-2000 Hewlett-Packard Co
5330@@ -9,7 +10,7 @@
5331
5332 /* Bytes per L1 (data) cache line. */
5333 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5334-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5335+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5336
5337 #ifdef CONFIG_SMP
5338 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5339diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5340index 5a83c5c..4d7f553 100644
5341--- a/arch/ia64/include/asm/elf.h
5342+++ b/arch/ia64/include/asm/elf.h
5343@@ -42,6 +42,13 @@
5344 */
5345 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5346
5347+#ifdef CONFIG_PAX_ASLR
5348+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5349+
5350+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5351+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5352+#endif
5353+
5354 #define PT_IA_64_UNWIND 0x70000001
5355
5356 /* IA-64 relocations: */
5357diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5358index f5e70e9..624fad5 100644
5359--- a/arch/ia64/include/asm/pgalloc.h
5360+++ b/arch/ia64/include/asm/pgalloc.h
5361@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5362 pgd_val(*pgd_entry) = __pa(pud);
5363 }
5364
5365+static inline void
5366+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5367+{
5368+ pgd_populate(mm, pgd_entry, pud);
5369+}
5370+
5371 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5372 {
5373 return quicklist_alloc(0, GFP_KERNEL, NULL);
5374@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5375 pud_val(*pud_entry) = __pa(pmd);
5376 }
5377
5378+static inline void
5379+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5380+{
5381+ pud_populate(mm, pud_entry, pmd);
5382+}
5383+
5384 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5385 {
5386 return quicklist_alloc(0, GFP_KERNEL, NULL);
5387diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5388index 9f3ed9e..c99b418 100644
5389--- a/arch/ia64/include/asm/pgtable.h
5390+++ b/arch/ia64/include/asm/pgtable.h
5391@@ -12,7 +12,7 @@
5392 * David Mosberger-Tang <davidm@hpl.hp.com>
5393 */
5394
5395-
5396+#include <linux/const.h>
5397 #include <asm/mman.h>
5398 #include <asm/page.h>
5399 #include <asm/processor.h>
5400@@ -139,6 +139,17 @@
5401 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5402 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5403 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5404+
5405+#ifdef CONFIG_PAX_PAGEEXEC
5406+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5407+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5408+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5409+#else
5410+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5411+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5412+# define PAGE_COPY_NOEXEC PAGE_COPY
5413+#endif
5414+
5415 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5416 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5417 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5418diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5419index 45698cd..e8e2dbc 100644
5420--- a/arch/ia64/include/asm/spinlock.h
5421+++ b/arch/ia64/include/asm/spinlock.h
5422@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5423 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5424
5425 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5426- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5427+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5428 }
5429
5430 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5431diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5432index 4f3fb6cc..254055e 100644
5433--- a/arch/ia64/include/asm/uaccess.h
5434+++ b/arch/ia64/include/asm/uaccess.h
5435@@ -70,6 +70,7 @@
5436 && ((segment).seg == KERNEL_DS.seg \
5437 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5438 })
5439+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5440 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5441
5442 /*
5443@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5444 static inline unsigned long
5445 __copy_to_user (void __user *to, const void *from, unsigned long count)
5446 {
5447+ if (count > INT_MAX)
5448+ return count;
5449+
5450+ if (!__builtin_constant_p(count))
5451+ check_object_size(from, count, true);
5452+
5453 return __copy_user(to, (__force void __user *) from, count);
5454 }
5455
5456 static inline unsigned long
5457 __copy_from_user (void *to, const void __user *from, unsigned long count)
5458 {
5459+ if (count > INT_MAX)
5460+ return count;
5461+
5462+ if (!__builtin_constant_p(count))
5463+ check_object_size(to, count, false);
5464+
5465 return __copy_user((__force void __user *) to, from, count);
5466 }
5467
5468@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5469 ({ \
5470 void __user *__cu_to = (to); \
5471 const void *__cu_from = (from); \
5472- long __cu_len = (n); \
5473+ unsigned long __cu_len = (n); \
5474 \
5475- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5476+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5477+ if (!__builtin_constant_p(n)) \
5478+ check_object_size(__cu_from, __cu_len, true); \
5479 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5480+ } \
5481 __cu_len; \
5482 })
5483
5484@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5485 ({ \
5486 void *__cu_to = (to); \
5487 const void __user *__cu_from = (from); \
5488- long __cu_len = (n); \
5489+ unsigned long __cu_len = (n); \
5490 \
5491 __chk_user_ptr(__cu_from); \
5492- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5493+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5494+ if (!__builtin_constant_p(n)) \
5495+ check_object_size(__cu_to, __cu_len, false); \
5496 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5497+ } \
5498 __cu_len; \
5499 })
5500
5501diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5502index 29754aa..06d2838 100644
5503--- a/arch/ia64/kernel/module.c
5504+++ b/arch/ia64/kernel/module.c
5505@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5506 }
5507
5508 static inline int
5509+in_init_rx (const struct module *mod, uint64_t addr)
5510+{
5511+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5512+}
5513+
5514+static inline int
5515+in_init_rw (const struct module *mod, uint64_t addr)
5516+{
5517+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5518+}
5519+
5520+static inline int
5521 in_init (const struct module *mod, uint64_t addr)
5522 {
5523- return addr - (uint64_t) mod->module_init < mod->init_size;
5524+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5525+}
5526+
5527+static inline int
5528+in_core_rx (const struct module *mod, uint64_t addr)
5529+{
5530+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5531+}
5532+
5533+static inline int
5534+in_core_rw (const struct module *mod, uint64_t addr)
5535+{
5536+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5537 }
5538
5539 static inline int
5540 in_core (const struct module *mod, uint64_t addr)
5541 {
5542- return addr - (uint64_t) mod->module_core < mod->core_size;
5543+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5544 }
5545
5546 static inline int
5547@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5548 break;
5549
5550 case RV_BDREL:
5551- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5552+ if (in_init_rx(mod, val))
5553+ val -= (uint64_t) mod->module_init_rx;
5554+ else if (in_init_rw(mod, val))
5555+ val -= (uint64_t) mod->module_init_rw;
5556+ else if (in_core_rx(mod, val))
5557+ val -= (uint64_t) mod->module_core_rx;
5558+ else if (in_core_rw(mod, val))
5559+ val -= (uint64_t) mod->module_core_rw;
5560 break;
5561
5562 case RV_LTV:
5563@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5564 * addresses have been selected...
5565 */
5566 uint64_t gp;
5567- if (mod->core_size > MAX_LTOFF)
5568+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5569 /*
5570 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5571 * at the end of the module.
5572 */
5573- gp = mod->core_size - MAX_LTOFF / 2;
5574+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5575 else
5576- gp = mod->core_size / 2;
5577- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5578+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5579+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5580 mod->arch.gp = gp;
5581 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5582 }
5583diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5584index c39c3cd..3c77738 100644
5585--- a/arch/ia64/kernel/palinfo.c
5586+++ b/arch/ia64/kernel/palinfo.c
5587@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5588 return NOTIFY_OK;
5589 }
5590
5591-static struct notifier_block __refdata palinfo_cpu_notifier =
5592+static struct notifier_block palinfo_cpu_notifier =
5593 {
5594 .notifier_call = palinfo_cpu_callback,
5595 .priority = 0,
5596diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5597index 41e33f8..65180b2a 100644
5598--- a/arch/ia64/kernel/sys_ia64.c
5599+++ b/arch/ia64/kernel/sys_ia64.c
5600@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5601 unsigned long align_mask = 0;
5602 struct mm_struct *mm = current->mm;
5603 struct vm_unmapped_area_info info;
5604+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5605
5606 if (len > RGN_MAP_LIMIT)
5607 return -ENOMEM;
5608@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5609 if (REGION_NUMBER(addr) == RGN_HPAGE)
5610 addr = 0;
5611 #endif
5612+
5613+#ifdef CONFIG_PAX_RANDMMAP
5614+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5615+ addr = mm->free_area_cache;
5616+ else
5617+#endif
5618+
5619 if (!addr)
5620 addr = TASK_UNMAPPED_BASE;
5621
5622@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5623 info.high_limit = TASK_SIZE;
5624 info.align_mask = align_mask;
5625 info.align_offset = 0;
5626+ info.threadstack_offset = offset;
5627 return vm_unmapped_area(&info);
5628 }
5629
5630diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5631index 84f8a52..7c76178 100644
5632--- a/arch/ia64/kernel/vmlinux.lds.S
5633+++ b/arch/ia64/kernel/vmlinux.lds.S
5634@@ -192,7 +192,7 @@ SECTIONS {
5635 /* Per-cpu data: */
5636 . = ALIGN(PERCPU_PAGE_SIZE);
5637 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5638- __phys_per_cpu_start = __per_cpu_load;
5639+ __phys_per_cpu_start = per_cpu_load;
5640 /*
5641 * ensure percpu data fits
5642 * into percpu page size
5643diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5644index ba5ba7a..36e9d3a 100644
5645--- a/arch/ia64/mm/fault.c
5646+++ b/arch/ia64/mm/fault.c
5647@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5648 return pte_present(pte);
5649 }
5650
5651+#ifdef CONFIG_PAX_PAGEEXEC
5652+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5653+{
5654+ unsigned long i;
5655+
5656+ printk(KERN_ERR "PAX: bytes at PC: ");
5657+ for (i = 0; i < 8; i++) {
5658+ unsigned int c;
5659+ if (get_user(c, (unsigned int *)pc+i))
5660+ printk(KERN_CONT "???????? ");
5661+ else
5662+ printk(KERN_CONT "%08x ", c);
5663+ }
5664+ printk("\n");
5665+}
5666+#endif
5667+
5668 # define VM_READ_BIT 0
5669 # define VM_WRITE_BIT 1
5670 # define VM_EXEC_BIT 2
5671@@ -151,8 +168,21 @@ retry:
5672 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5673 goto bad_area;
5674
5675- if ((vma->vm_flags & mask) != mask)
5676+ if ((vma->vm_flags & mask) != mask) {
5677+
5678+#ifdef CONFIG_PAX_PAGEEXEC
5679+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5680+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5681+ goto bad_area;
5682+
5683+ up_read(&mm->mmap_sem);
5684+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5685+ do_group_exit(SIGKILL);
5686+ }
5687+#endif
5688+
5689 goto bad_area;
5690+ }
5691
5692 /*
5693 * If for any reason at all we couldn't handle the fault, make
5694diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5695index 52b7604b..455cb85 100644
5696--- a/arch/ia64/mm/hugetlbpage.c
5697+++ b/arch/ia64/mm/hugetlbpage.c
5698@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5699 unsigned long pgoff, unsigned long flags)
5700 {
5701 struct vm_unmapped_area_info info;
5702+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5703
5704 if (len > RGN_MAP_LIMIT)
5705 return -ENOMEM;
5706@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5707 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5708 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5709 info.align_offset = 0;
5710+ info.threadstack_offset = offset;
5711 return vm_unmapped_area(&info);
5712 }
5713
5714diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5715index a9b65cf..49ae1cf 100644
5716--- a/arch/ia64/mm/init.c
5717+++ b/arch/ia64/mm/init.c
5718@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5719 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5720 vma->vm_end = vma->vm_start + PAGE_SIZE;
5721 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5722+
5723+#ifdef CONFIG_PAX_PAGEEXEC
5724+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5725+ vma->vm_flags &= ~VM_EXEC;
5726+
5727+#ifdef CONFIG_PAX_MPROTECT
5728+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5729+ vma->vm_flags &= ~VM_MAYEXEC;
5730+#endif
5731+
5732+ }
5733+#endif
5734+
5735 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5736 down_write(&current->mm->mmap_sem);
5737 if (insert_vm_struct(current->mm, vma)) {
5738@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5739 gate_vma.vm_start = FIXADDR_USER_START;
5740 gate_vma.vm_end = FIXADDR_USER_END;
5741 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5742- gate_vma.vm_page_prot = __P101;
5743+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5744
5745 return 0;
5746 }
5747diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5748index 40b3ee98..8c2c112 100644
5749--- a/arch/m32r/include/asm/cache.h
5750+++ b/arch/m32r/include/asm/cache.h
5751@@ -1,8 +1,10 @@
5752 #ifndef _ASM_M32R_CACHE_H
5753 #define _ASM_M32R_CACHE_H
5754
5755+#include <linux/const.h>
5756+
5757 /* L1 cache line size */
5758 #define L1_CACHE_SHIFT 4
5759-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5760+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5761
5762 #endif /* _ASM_M32R_CACHE_H */
5763diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5764index 82abd15..d95ae5d 100644
5765--- a/arch/m32r/lib/usercopy.c
5766+++ b/arch/m32r/lib/usercopy.c
5767@@ -14,6 +14,9 @@
5768 unsigned long
5769 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5770 {
5771+ if ((long)n < 0)
5772+ return n;
5773+
5774 prefetch(from);
5775 if (access_ok(VERIFY_WRITE, to, n))
5776 __copy_user(to,from,n);
5777@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5778 unsigned long
5779 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5780 {
5781+ if ((long)n < 0)
5782+ return n;
5783+
5784 prefetchw(to);
5785 if (access_ok(VERIFY_READ, from, n))
5786 __copy_user_zeroing(to,from,n);
5787diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5788index 0395c51..5f26031 100644
5789--- a/arch/m68k/include/asm/cache.h
5790+++ b/arch/m68k/include/asm/cache.h
5791@@ -4,9 +4,11 @@
5792 #ifndef __ARCH_M68K_CACHE_H
5793 #define __ARCH_M68K_CACHE_H
5794
5795+#include <linux/const.h>
5796+
5797 /* bytes per L1 cache line */
5798 #define L1_CACHE_SHIFT 4
5799-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5800+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5801
5802 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5803
5804diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5805index d703d8e..a8e2d70 100644
5806--- a/arch/metag/include/asm/barrier.h
5807+++ b/arch/metag/include/asm/barrier.h
5808@@ -90,7 +90,7 @@ static inline void fence(void)
5809 do { \
5810 compiletime_assert_atomic_type(*p); \
5811 smp_mb(); \
5812- ACCESS_ONCE(*p) = (v); \
5813+ ACCESS_ONCE_RW(*p) = (v); \
5814 } while (0)
5815
5816 #define smp_load_acquire(p) \
5817diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5818index 7ca80ac..794ba72 100644
5819--- a/arch/metag/mm/hugetlbpage.c
5820+++ b/arch/metag/mm/hugetlbpage.c
5821@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5822 info.high_limit = TASK_SIZE;
5823 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5824 info.align_offset = 0;
5825+ info.threadstack_offset = 0;
5826 return vm_unmapped_area(&info);
5827 }
5828
5829diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5830index 4efe96a..60e8699 100644
5831--- a/arch/microblaze/include/asm/cache.h
5832+++ b/arch/microblaze/include/asm/cache.h
5833@@ -13,11 +13,12 @@
5834 #ifndef _ASM_MICROBLAZE_CACHE_H
5835 #define _ASM_MICROBLAZE_CACHE_H
5836
5837+#include <linux/const.h>
5838 #include <asm/registers.h>
5839
5840 #define L1_CACHE_SHIFT 5
5841 /* word-granular cache in microblaze */
5842-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5843+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5844
5845 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5846
5847diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5848index f501665..b107753 100644
5849--- a/arch/mips/Kconfig
5850+++ b/arch/mips/Kconfig
5851@@ -2585,6 +2585,7 @@ source "kernel/Kconfig.preempt"
5852
5853 config KEXEC
5854 bool "Kexec system call"
5855+ depends on !GRKERNSEC_KMEM
5856 help
5857 kexec is a system call that implements the ability to shutdown your
5858 current kernel, and to start another kernel. It is like a reboot
5859diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5860index d8960d4..77dbd31 100644
5861--- a/arch/mips/cavium-octeon/dma-octeon.c
5862+++ b/arch/mips/cavium-octeon/dma-octeon.c
5863@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5864 if (dma_release_from_coherent(dev, order, vaddr))
5865 return;
5866
5867- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5868+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5869 }
5870
5871 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5872diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5873index 26d4363..3c9a82e 100644
5874--- a/arch/mips/include/asm/atomic.h
5875+++ b/arch/mips/include/asm/atomic.h
5876@@ -22,15 +22,39 @@
5877 #include <asm/cmpxchg.h>
5878 #include <asm/war.h>
5879
5880+#ifdef CONFIG_GENERIC_ATOMIC64
5881+#include <asm-generic/atomic64.h>
5882+#endif
5883+
5884 #define ATOMIC_INIT(i) { (i) }
5885
5886+#ifdef CONFIG_64BIT
5887+#define _ASM_EXTABLE(from, to) \
5888+" .section __ex_table,\"a\"\n" \
5889+" .dword " #from ", " #to"\n" \
5890+" .previous\n"
5891+#else
5892+#define _ASM_EXTABLE(from, to) \
5893+" .section __ex_table,\"a\"\n" \
5894+" .word " #from ", " #to"\n" \
5895+" .previous\n"
5896+#endif
5897+
5898 /*
5899 * atomic_read - read atomic variable
5900 * @v: pointer of type atomic_t
5901 *
5902 * Atomically reads the value of @v.
5903 */
5904-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5905+static inline int atomic_read(const atomic_t *v)
5906+{
5907+ return ACCESS_ONCE(v->counter);
5908+}
5909+
5910+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5911+{
5912+ return ACCESS_ONCE(v->counter);
5913+}
5914
5915 /*
5916 * atomic_set - set atomic variable
5917@@ -39,47 +63,77 @@
5918 *
5919 * Atomically sets the value of @v to @i.
5920 */
5921-#define atomic_set(v, i) ((v)->counter = (i))
5922+static inline void atomic_set(atomic_t *v, int i)
5923+{
5924+ v->counter = i;
5925+}
5926
5927-#define ATOMIC_OP(op, c_op, asm_op) \
5928-static __inline__ void atomic_##op(int i, atomic_t * v) \
5929+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5930+{
5931+ v->counter = i;
5932+}
5933+
5934+#ifdef CONFIG_PAX_REFCOUNT
5935+#define __OVERFLOW_POST \
5936+ " b 4f \n" \
5937+ " .set noreorder \n" \
5938+ "3: b 5f \n" \
5939+ " move %0, %1 \n" \
5940+ " .set reorder \n"
5941+#define __OVERFLOW_EXTABLE \
5942+ "3:\n" \
5943+ _ASM_EXTABLE(2b, 3b)
5944+#else
5945+#define __OVERFLOW_POST
5946+#define __OVERFLOW_EXTABLE
5947+#endif
5948+
5949+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5950+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5951 { \
5952 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5953 int temp; \
5954 \
5955 __asm__ __volatile__( \
5956- " .set arch=r4000 \n" \
5957- "1: ll %0, %1 # atomic_" #op " \n" \
5958- " " #asm_op " %0, %2 \n" \
5959+ " .set mips3 \n" \
5960+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5961+ "2: " #asm_op " %0, %2 \n" \
5962 " sc %0, %1 \n" \
5963 " beqzl %0, 1b \n" \
5964+ extable \
5965 " .set mips0 \n" \
5966 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5967 : "Ir" (i)); \
5968 } else if (kernel_uses_llsc) { \
5969 int temp; \
5970 \
5971- do { \
5972- __asm__ __volatile__( \
5973- " .set "MIPS_ISA_LEVEL" \n" \
5974- " ll %0, %1 # atomic_" #op "\n" \
5975- " " #asm_op " %0, %2 \n" \
5976- " sc %0, %1 \n" \
5977- " .set mips0 \n" \
5978- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5979- : "Ir" (i)); \
5980- } while (unlikely(!temp)); \
5981+ __asm__ __volatile__( \
5982+ " .set "MIPS_ISA_LEVEL" \n" \
5983+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5984+ "2: " #asm_op " %0, %2 \n" \
5985+ " sc %0, %1 \n" \
5986+ " beqz %0, 1b \n" \
5987+ extable \
5988+ " .set mips0 \n" \
5989+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5990+ : "Ir" (i)); \
5991 } else { \
5992 unsigned long flags; \
5993 \
5994 raw_local_irq_save(flags); \
5995- v->counter c_op i; \
5996+ __asm__ __volatile__( \
5997+ "2: " #asm_op " %0, %1 \n" \
5998+ extable \
5999+ : "+r" (v->counter) : "Ir" (i)); \
6000 raw_local_irq_restore(flags); \
6001 } \
6002 }
6003
6004-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
6005-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6006+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
6007+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6008+
6009+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6010+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
6011 { \
6012 int result; \
6013 \
6014@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6015 int temp; \
6016 \
6017 __asm__ __volatile__( \
6018- " .set arch=r4000 \n" \
6019- "1: ll %1, %2 # atomic_" #op "_return \n" \
6020- " " #asm_op " %0, %1, %3 \n" \
6021+ " .set mips3 \n" \
6022+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
6023+ "2: " #asm_op " %0, %1, %3 \n" \
6024 " sc %0, %2 \n" \
6025 " beqzl %0, 1b \n" \
6026- " " #asm_op " %0, %1, %3 \n" \
6027+ post_op \
6028+ extable \
6029+ "4: " #asm_op " %0, %1, %3 \n" \
6030+ "5: \n" \
6031 " .set mips0 \n" \
6032 : "=&r" (result), "=&r" (temp), \
6033 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6034@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6035 } else if (kernel_uses_llsc) { \
6036 int temp; \
6037 \
6038- do { \
6039- __asm__ __volatile__( \
6040- " .set "MIPS_ISA_LEVEL" \n" \
6041- " ll %1, %2 # atomic_" #op "_return \n" \
6042- " " #asm_op " %0, %1, %3 \n" \
6043- " sc %0, %2 \n" \
6044- " .set mips0 \n" \
6045- : "=&r" (result), "=&r" (temp), \
6046- "+" GCC_OFF_SMALL_ASM() (v->counter) \
6047- : "Ir" (i)); \
6048- } while (unlikely(!result)); \
6049+ __asm__ __volatile__( \
6050+ " .set "MIPS_ISA_LEVEL" \n" \
6051+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
6052+ "2: " #asm_op " %0, %1, %3 \n" \
6053+ " sc %0, %2 \n" \
6054+ post_op \
6055+ extable \
6056+ "4: " #asm_op " %0, %1, %3 \n" \
6057+ "5: \n" \
6058+ " .set mips0 \n" \
6059+ : "=&r" (result), "=&r" (temp), \
6060+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
6061+ : "Ir" (i)); \
6062 \
6063 result = temp; result c_op i; \
6064 } else { \
6065 unsigned long flags; \
6066 \
6067 raw_local_irq_save(flags); \
6068- result = v->counter; \
6069- result c_op i; \
6070- v->counter = result; \
6071+ __asm__ __volatile__( \
6072+ " lw %0, %1 \n" \
6073+ "2: " #asm_op " %0, %1, %2 \n" \
6074+ " sw %0, %1 \n" \
6075+ "3: \n" \
6076+ extable \
6077+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6078+ : "Ir" (i)); \
6079 raw_local_irq_restore(flags); \
6080 } \
6081 \
6082@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6083 return result; \
6084 }
6085
6086-#define ATOMIC_OPS(op, c_op, asm_op) \
6087- ATOMIC_OP(op, c_op, asm_op) \
6088- ATOMIC_OP_RETURN(op, c_op, asm_op)
6089+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6090+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6091
6092-ATOMIC_OPS(add, +=, addu)
6093-ATOMIC_OPS(sub, -=, subu)
6094+#define ATOMIC_OPS(op, asm_op) \
6095+ ATOMIC_OP(op, asm_op) \
6096+ ATOMIC_OP_RETURN(op, asm_op)
6097+
6098+ATOMIC_OPS(add, add)
6099+ATOMIC_OPS(sub, sub)
6100
6101 #undef ATOMIC_OPS
6102 #undef ATOMIC_OP_RETURN
6103+#undef __ATOMIC_OP_RETURN
6104 #undef ATOMIC_OP
6105+#undef __ATOMIC_OP
6106
6107 /*
6108 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
6109@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
6110 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6111 * The function returns the old value of @v minus @i.
6112 */
6113-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6114+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6115 {
6116 int result;
6117
6118@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6119 int temp;
6120
6121 __asm__ __volatile__(
6122- " .set arch=r4000 \n"
6123+ " .set "MIPS_ISA_LEVEL" \n"
6124 "1: ll %1, %2 # atomic_sub_if_positive\n"
6125 " subu %0, %1, %3 \n"
6126 " bltz %0, 1f \n"
6127@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6128 return result;
6129 }
6130
6131-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6132-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6133+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6134+{
6135+ return cmpxchg(&v->counter, old, new);
6136+}
6137+
6138+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6139+ int new)
6140+{
6141+ return cmpxchg(&(v->counter), old, new);
6142+}
6143+
6144+static inline int atomic_xchg(atomic_t *v, int new)
6145+{
6146+ return xchg(&v->counter, new);
6147+}
6148+
6149+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6150+{
6151+ return xchg(&(v->counter), new);
6152+}
6153
6154 /**
6155 * __atomic_add_unless - add unless the number is a given value
6156@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6157
6158 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6159 #define atomic_inc_return(v) atomic_add_return(1, (v))
6160+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6161+{
6162+ return atomic_add_return_unchecked(1, v);
6163+}
6164
6165 /*
6166 * atomic_sub_and_test - subtract value from variable and test result
6167@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6168 * other cases.
6169 */
6170 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6171+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6172+{
6173+ return atomic_add_return_unchecked(1, v) == 0;
6174+}
6175
6176 /*
6177 * atomic_dec_and_test - decrement by 1 and test
6178@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6179 * Atomically increments @v by 1.
6180 */
6181 #define atomic_inc(v) atomic_add(1, (v))
6182+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6183+{
6184+ atomic_add_unchecked(1, v);
6185+}
6186
6187 /*
6188 * atomic_dec - decrement and test
6189@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6190 * Atomically decrements @v by 1.
6191 */
6192 #define atomic_dec(v) atomic_sub(1, (v))
6193+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6194+{
6195+ atomic_sub_unchecked(1, v);
6196+}
6197
6198 /*
6199 * atomic_add_negative - add and test if negative
6200@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6201 * @v: pointer of type atomic64_t
6202 *
6203 */
6204-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6205+static inline long atomic64_read(const atomic64_t *v)
6206+{
6207+ return ACCESS_ONCE(v->counter);
6208+}
6209+
6210+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6211+{
6212+ return ACCESS_ONCE(v->counter);
6213+}
6214
6215 /*
6216 * atomic64_set - set atomic variable
6217 * @v: pointer of type atomic64_t
6218 * @i: required value
6219 */
6220-#define atomic64_set(v, i) ((v)->counter = (i))
6221+static inline void atomic64_set(atomic64_t *v, long i)
6222+{
6223+ v->counter = i;
6224+}
6225
6226-#define ATOMIC64_OP(op, c_op, asm_op) \
6227-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6228+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6229+{
6230+ v->counter = i;
6231+}
6232+
6233+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6234+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6235 { \
6236 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6237 long temp; \
6238 \
6239 __asm__ __volatile__( \
6240- " .set arch=r4000 \n" \
6241- "1: lld %0, %1 # atomic64_" #op " \n" \
6242- " " #asm_op " %0, %2 \n" \
6243+ " .set "MIPS_ISA_LEVEL" \n" \
6244+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6245+ "2: " #asm_op " %0, %2 \n" \
6246 " scd %0, %1 \n" \
6247 " beqzl %0, 1b \n" \
6248+ extable \
6249 " .set mips0 \n" \
6250 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6251 : "Ir" (i)); \
6252 } else if (kernel_uses_llsc) { \
6253 long temp; \
6254 \
6255- do { \
6256- __asm__ __volatile__( \
6257- " .set "MIPS_ISA_LEVEL" \n" \
6258- " lld %0, %1 # atomic64_" #op "\n" \
6259- " " #asm_op " %0, %2 \n" \
6260- " scd %0, %1 \n" \
6261- " .set mips0 \n" \
6262- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6263- : "Ir" (i)); \
6264- } while (unlikely(!temp)); \
6265+ __asm__ __volatile__( \
6266+ " .set "MIPS_ISA_LEVEL" \n" \
6267+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6268+ "2: " #asm_op " %0, %2 \n" \
6269+ " scd %0, %1 \n" \
6270+ " beqz %0, 1b \n" \
6271+ extable \
6272+ " .set mips0 \n" \
6273+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6274+ : "Ir" (i)); \
6275 } else { \
6276 unsigned long flags; \
6277 \
6278 raw_local_irq_save(flags); \
6279- v->counter c_op i; \
6280+ __asm__ __volatile__( \
6281+ "2: " #asm_op " %0, %1 \n" \
6282+ extable \
6283+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6284 raw_local_irq_restore(flags); \
6285 } \
6286 }
6287
6288-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6289-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6290+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6291+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6292+
6293+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6294+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6295 { \
6296 long result; \
6297 \
6298@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6299 long temp; \
6300 \
6301 __asm__ __volatile__( \
6302- " .set arch=r4000 \n" \
6303+ " .set mips3 \n" \
6304 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6305- " " #asm_op " %0, %1, %3 \n" \
6306+ "2: " #asm_op " %0, %1, %3 \n" \
6307 " scd %0, %2 \n" \
6308 " beqzl %0, 1b \n" \
6309- " " #asm_op " %0, %1, %3 \n" \
6310+ post_op \
6311+ extable \
6312+ "4: " #asm_op " %0, %1, %3 \n" \
6313+ "5: \n" \
6314 " .set mips0 \n" \
6315 : "=&r" (result), "=&r" (temp), \
6316 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6317@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6318 } else if (kernel_uses_llsc) { \
6319 long temp; \
6320 \
6321- do { \
6322- __asm__ __volatile__( \
6323- " .set "MIPS_ISA_LEVEL" \n" \
6324- " lld %1, %2 # atomic64_" #op "_return\n" \
6325- " " #asm_op " %0, %1, %3 \n" \
6326- " scd %0, %2 \n" \
6327- " .set mips0 \n" \
6328- : "=&r" (result), "=&r" (temp), \
6329- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6330- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6331- : "memory"); \
6332- } while (unlikely(!result)); \
6333+ __asm__ __volatile__( \
6334+ " .set "MIPS_ISA_LEVEL" \n" \
6335+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6336+ "2: " #asm_op " %0, %1, %3 \n" \
6337+ " scd %0, %2 \n" \
6338+ " beqz %0, 1b \n" \
6339+ post_op \
6340+ extable \
6341+ "4: " #asm_op " %0, %1, %3 \n" \
6342+ "5: \n" \
6343+ " .set mips0 \n" \
6344+ : "=&r" (result), "=&r" (temp), \
6345+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6346+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6347+ : "memory"); \
6348 \
6349 result = temp; result c_op i; \
6350 } else { \
6351 unsigned long flags; \
6352 \
6353 raw_local_irq_save(flags); \
6354- result = v->counter; \
6355- result c_op i; \
6356- v->counter = result; \
6357+ __asm__ __volatile__( \
6358+ " ld %0, %1 \n" \
6359+ "2: " #asm_op " %0, %1, %2 \n" \
6360+ " sd %0, %1 \n" \
6361+ "3: \n" \
6362+ extable \
6363+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6364+ : "Ir" (i)); \
6365 raw_local_irq_restore(flags); \
6366 } \
6367 \
6368@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6369 return result; \
6370 }
6371
6372-#define ATOMIC64_OPS(op, c_op, asm_op) \
6373- ATOMIC64_OP(op, c_op, asm_op) \
6374- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6375+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6376+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6377
6378-ATOMIC64_OPS(add, +=, daddu)
6379-ATOMIC64_OPS(sub, -=, dsubu)
6380+#define ATOMIC64_OPS(op, asm_op) \
6381+ ATOMIC64_OP(op, asm_op) \
6382+ ATOMIC64_OP_RETURN(op, asm_op)
6383+
6384+ATOMIC64_OPS(add, dadd)
6385+ATOMIC64_OPS(sub, dsub)
6386
6387 #undef ATOMIC64_OPS
6388 #undef ATOMIC64_OP_RETURN
6389+#undef __ATOMIC64_OP_RETURN
6390 #undef ATOMIC64_OP
6391+#undef __ATOMIC64_OP
6392+#undef __OVERFLOW_EXTABLE
6393+#undef __OVERFLOW_POST
6394
6395 /*
6396 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6397@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6398 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6399 * The function returns the old value of @v minus @i.
6400 */
6401-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6402+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6403 {
6404 long result;
6405
6406@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6407 long temp;
6408
6409 __asm__ __volatile__(
6410- " .set arch=r4000 \n"
6411+ " .set "MIPS_ISA_LEVEL" \n"
6412 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6413 " dsubu %0, %1, %3 \n"
6414 " bltz %0, 1f \n"
6415@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6416 return result;
6417 }
6418
6419-#define atomic64_cmpxchg(v, o, n) \
6420- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6421-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6422+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6423+{
6424+ return cmpxchg(&v->counter, old, new);
6425+}
6426+
6427+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6428+ long new)
6429+{
6430+ return cmpxchg(&(v->counter), old, new);
6431+}
6432+
6433+static inline long atomic64_xchg(atomic64_t *v, long new)
6434+{
6435+ return xchg(&v->counter, new);
6436+}
6437+
6438+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6439+{
6440+ return xchg(&(v->counter), new);
6441+}
6442
6443 /**
6444 * atomic64_add_unless - add unless the number is a given value
6445@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6446
6447 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6448 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6449+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6450
6451 /*
6452 * atomic64_sub_and_test - subtract value from variable and test result
6453@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6454 * other cases.
6455 */
6456 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6457+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6458
6459 /*
6460 * atomic64_dec_and_test - decrement by 1 and test
6461@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6462 * Atomically increments @v by 1.
6463 */
6464 #define atomic64_inc(v) atomic64_add(1, (v))
6465+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6466
6467 /*
6468 * atomic64_dec - decrement and test
6469@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6470 * Atomically decrements @v by 1.
6471 */
6472 #define atomic64_dec(v) atomic64_sub(1, (v))
6473+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6474
6475 /*
6476 * atomic64_add_negative - add and test if negative
6477diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6478index 2b8bbbc..4556df6 100644
6479--- a/arch/mips/include/asm/barrier.h
6480+++ b/arch/mips/include/asm/barrier.h
6481@@ -133,7 +133,7 @@
6482 do { \
6483 compiletime_assert_atomic_type(*p); \
6484 smp_mb(); \
6485- ACCESS_ONCE(*p) = (v); \
6486+ ACCESS_ONCE_RW(*p) = (v); \
6487 } while (0)
6488
6489 #define smp_load_acquire(p) \
6490diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6491index b4db69f..8f3b093 100644
6492--- a/arch/mips/include/asm/cache.h
6493+++ b/arch/mips/include/asm/cache.h
6494@@ -9,10 +9,11 @@
6495 #ifndef _ASM_CACHE_H
6496 #define _ASM_CACHE_H
6497
6498+#include <linux/const.h>
6499 #include <kmalloc.h>
6500
6501 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6502-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6503+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6504
6505 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6506 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6507diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6508index f19e890..a4f8177 100644
6509--- a/arch/mips/include/asm/elf.h
6510+++ b/arch/mips/include/asm/elf.h
6511@@ -417,6 +417,13 @@ extern const char *__elf_platform;
6512 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6513 #endif
6514
6515+#ifdef CONFIG_PAX_ASLR
6516+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6517+
6518+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6519+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6520+#endif
6521+
6522 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6523 struct linux_binprm;
6524 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6525diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6526index c1f6afa..38cc6e9 100644
6527--- a/arch/mips/include/asm/exec.h
6528+++ b/arch/mips/include/asm/exec.h
6529@@ -12,6 +12,6 @@
6530 #ifndef _ASM_EXEC_H
6531 #define _ASM_EXEC_H
6532
6533-extern unsigned long arch_align_stack(unsigned long sp);
6534+#define arch_align_stack(x) ((x) & ~0xfUL)
6535
6536 #endif /* _ASM_EXEC_H */
6537diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6538index 9e8ef59..1139d6b 100644
6539--- a/arch/mips/include/asm/hw_irq.h
6540+++ b/arch/mips/include/asm/hw_irq.h
6541@@ -10,7 +10,7 @@
6542
6543 #include <linux/atomic.h>
6544
6545-extern atomic_t irq_err_count;
6546+extern atomic_unchecked_t irq_err_count;
6547
6548 /*
6549 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6550diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6551index 8feaed6..1bd8a64 100644
6552--- a/arch/mips/include/asm/local.h
6553+++ b/arch/mips/include/asm/local.h
6554@@ -13,15 +13,25 @@ typedef struct
6555 atomic_long_t a;
6556 } local_t;
6557
6558+typedef struct {
6559+ atomic_long_unchecked_t a;
6560+} local_unchecked_t;
6561+
6562 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6563
6564 #define local_read(l) atomic_long_read(&(l)->a)
6565+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6566 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6567+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6568
6569 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6570+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6571 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6572+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6573 #define local_inc(l) atomic_long_inc(&(l)->a)
6574+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6575 #define local_dec(l) atomic_long_dec(&(l)->a)
6576+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6577
6578 /*
6579 * Same as above, but return the result value
6580@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6581 return result;
6582 }
6583
6584+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6585+{
6586+ unsigned long result;
6587+
6588+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6589+ unsigned long temp;
6590+
6591+ __asm__ __volatile__(
6592+ " .set mips3 \n"
6593+ "1:" __LL "%1, %2 # local_add_return \n"
6594+ " addu %0, %1, %3 \n"
6595+ __SC "%0, %2 \n"
6596+ " beqzl %0, 1b \n"
6597+ " addu %0, %1, %3 \n"
6598+ " .set mips0 \n"
6599+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6600+ : "Ir" (i), "m" (l->a.counter)
6601+ : "memory");
6602+ } else if (kernel_uses_llsc) {
6603+ unsigned long temp;
6604+
6605+ __asm__ __volatile__(
6606+ " .set mips3 \n"
6607+ "1:" __LL "%1, %2 # local_add_return \n"
6608+ " addu %0, %1, %3 \n"
6609+ __SC "%0, %2 \n"
6610+ " beqz %0, 1b \n"
6611+ " addu %0, %1, %3 \n"
6612+ " .set mips0 \n"
6613+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6614+ : "Ir" (i), "m" (l->a.counter)
6615+ : "memory");
6616+ } else {
6617+ unsigned long flags;
6618+
6619+ local_irq_save(flags);
6620+ result = l->a.counter;
6621+ result += i;
6622+ l->a.counter = result;
6623+ local_irq_restore(flags);
6624+ }
6625+
6626+ return result;
6627+}
6628+
6629 static __inline__ long local_sub_return(long i, local_t * l)
6630 {
6631 unsigned long result;
6632@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6633
6634 #define local_cmpxchg(l, o, n) \
6635 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6636+#define local_cmpxchg_unchecked(l, o, n) \
6637+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6638 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6639
6640 /**
6641diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6642index 89dd7fe..a123c97 100644
6643--- a/arch/mips/include/asm/page.h
6644+++ b/arch/mips/include/asm/page.h
6645@@ -118,7 +118,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6646 #ifdef CONFIG_CPU_MIPS32
6647 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6648 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6649- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6650+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6651 #else
6652 typedef struct { unsigned long long pte; } pte_t;
6653 #define pte_val(x) ((x).pte)
6654diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6655index b336037..5b874cc 100644
6656--- a/arch/mips/include/asm/pgalloc.h
6657+++ b/arch/mips/include/asm/pgalloc.h
6658@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6659 {
6660 set_pud(pud, __pud((unsigned long)pmd));
6661 }
6662+
6663+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6664+{
6665+ pud_populate(mm, pud, pmd);
6666+}
6667 #endif
6668
6669 /*
6670diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6671index 819af9d..439839d 100644
6672--- a/arch/mips/include/asm/pgtable.h
6673+++ b/arch/mips/include/asm/pgtable.h
6674@@ -20,6 +20,9 @@
6675 #include <asm/io.h>
6676 #include <asm/pgtable-bits.h>
6677
6678+#define ktla_ktva(addr) (addr)
6679+#define ktva_ktla(addr) (addr)
6680+
6681 struct mm_struct;
6682 struct vm_area_struct;
6683
6684diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6685index 9c0014e..5101ef5 100644
6686--- a/arch/mips/include/asm/thread_info.h
6687+++ b/arch/mips/include/asm/thread_info.h
6688@@ -100,6 +100,9 @@ static inline struct thread_info *current_thread_info(void)
6689 #define TIF_SECCOMP 4 /* secure computing */
6690 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6691 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6692+/* li takes a 32bit immediate */
6693+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6694+
6695 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6696 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6697 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6698@@ -135,14 +138,16 @@ static inline struct thread_info *current_thread_info(void)
6699 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6700 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6701 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6702+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6703
6704 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6705 _TIF_SYSCALL_AUDIT | \
6706- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6707+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6708+ _TIF_GRSEC_SETXID)
6709
6710 /* work to do in syscall_trace_leave() */
6711 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6712- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6713+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6714
6715 /* work to do on interrupt/exception return */
6716 #define _TIF_WORK_MASK \
6717@@ -150,7 +155,7 @@ static inline struct thread_info *current_thread_info(void)
6718 /* work to do on any return to u-space */
6719 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6720 _TIF_WORK_SYSCALL_EXIT | \
6721- _TIF_SYSCALL_TRACEPOINT)
6722+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6723
6724 /*
6725 * We stash processor id into a COP0 register to retrieve it fast
6726diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6727index bf8b324..cec5705 100644
6728--- a/arch/mips/include/asm/uaccess.h
6729+++ b/arch/mips/include/asm/uaccess.h
6730@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6731 __ok == 0; \
6732 })
6733
6734+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6735 #define access_ok(type, addr, size) \
6736 likely(__access_ok((addr), (size), __access_mask))
6737
6738diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6739index 1188e00..41cf144 100644
6740--- a/arch/mips/kernel/binfmt_elfn32.c
6741+++ b/arch/mips/kernel/binfmt_elfn32.c
6742@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6743 #undef ELF_ET_DYN_BASE
6744 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6745
6746+#ifdef CONFIG_PAX_ASLR
6747+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6748+
6749+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6750+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6751+#endif
6752+
6753 #include <asm/processor.h>
6754 #include <linux/module.h>
6755 #include <linux/elfcore.h>
6756diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6757index 9287678..f870e47 100644
6758--- a/arch/mips/kernel/binfmt_elfo32.c
6759+++ b/arch/mips/kernel/binfmt_elfo32.c
6760@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6761 #undef ELF_ET_DYN_BASE
6762 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6763
6764+#ifdef CONFIG_PAX_ASLR
6765+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6766+
6767+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6768+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6769+#endif
6770+
6771 #include <asm/processor.h>
6772
6773 #include <linux/module.h>
6774diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6775index a74ec3a..4f06f18 100644
6776--- a/arch/mips/kernel/i8259.c
6777+++ b/arch/mips/kernel/i8259.c
6778@@ -202,7 +202,7 @@ spurious_8259A_irq:
6779 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6780 spurious_irq_mask |= irqmask;
6781 }
6782- atomic_inc(&irq_err_count);
6783+ atomic_inc_unchecked(&irq_err_count);
6784 /*
6785 * Theoretically we do not have to handle this IRQ,
6786 * but in Linux this does not cause problems and is
6787diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6788index 44a1f79..2bd6aa3 100644
6789--- a/arch/mips/kernel/irq-gt641xx.c
6790+++ b/arch/mips/kernel/irq-gt641xx.c
6791@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6792 }
6793 }
6794
6795- atomic_inc(&irq_err_count);
6796+ atomic_inc_unchecked(&irq_err_count);
6797 }
6798
6799 void __init gt641xx_irq_init(void)
6800diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6801index 3c8a18a..b4929b6 100644
6802--- a/arch/mips/kernel/irq.c
6803+++ b/arch/mips/kernel/irq.c
6804@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6805 printk("unexpected IRQ # %d\n", irq);
6806 }
6807
6808-atomic_t irq_err_count;
6809+atomic_unchecked_t irq_err_count;
6810
6811 int arch_show_interrupts(struct seq_file *p, int prec)
6812 {
6813- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6814+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6815 return 0;
6816 }
6817
6818 asmlinkage void spurious_interrupt(void)
6819 {
6820- atomic_inc(&irq_err_count);
6821+ atomic_inc_unchecked(&irq_err_count);
6822 }
6823
6824 void __init init_IRQ(void)
6825@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6826 }
6827
6828 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6829+
6830+extern void gr_handle_kernel_exploit(void);
6831 static inline void check_stack_overflow(void)
6832 {
6833 unsigned long sp;
6834@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6835 printk("do_IRQ: stack overflow: %ld\n",
6836 sp - sizeof(struct thread_info));
6837 dump_stack();
6838+ gr_handle_kernel_exploit();
6839 }
6840 }
6841 #else
6842diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6843index 0614717..002fa43 100644
6844--- a/arch/mips/kernel/pm-cps.c
6845+++ b/arch/mips/kernel/pm-cps.c
6846@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6847 nc_core_ready_count = nc_addr;
6848
6849 /* Ensure ready_count is zero-initialised before the assembly runs */
6850- ACCESS_ONCE(*nc_core_ready_count) = 0;
6851+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6852 coupled_barrier(&per_cpu(pm_barrier, core), online);
6853
6854 /* Run the generated entry code */
6855diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6856index f2975d4..f61d355 100644
6857--- a/arch/mips/kernel/process.c
6858+++ b/arch/mips/kernel/process.c
6859@@ -541,18 +541,6 @@ out:
6860 return pc;
6861 }
6862
6863-/*
6864- * Don't forget that the stack pointer must be aligned on a 8 bytes
6865- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6866- */
6867-unsigned long arch_align_stack(unsigned long sp)
6868-{
6869- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6870- sp -= get_random_int() & ~PAGE_MASK;
6871-
6872- return sp & ALMASK;
6873-}
6874-
6875 static void arch_dump_stack(void *info)
6876 {
6877 struct pt_regs *regs;
6878diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6879index e933a30..0d02625 100644
6880--- a/arch/mips/kernel/ptrace.c
6881+++ b/arch/mips/kernel/ptrace.c
6882@@ -785,6 +785,10 @@ long arch_ptrace(struct task_struct *child, long request,
6883 return ret;
6884 }
6885
6886+#ifdef CONFIG_GRKERNSEC_SETXID
6887+extern void gr_delayed_cred_worker(void);
6888+#endif
6889+
6890 /*
6891 * Notification of system call entry/exit
6892 * - triggered by current->work.syscall_trace
6893@@ -803,6 +807,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6894 tracehook_report_syscall_entry(regs))
6895 ret = -1;
6896
6897+#ifdef CONFIG_GRKERNSEC_SETXID
6898+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6899+ gr_delayed_cred_worker();
6900+#endif
6901+
6902 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6903 trace_sys_enter(regs, regs->regs[2]);
6904
6905diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6906index 2242bdd..b284048 100644
6907--- a/arch/mips/kernel/sync-r4k.c
6908+++ b/arch/mips/kernel/sync-r4k.c
6909@@ -18,8 +18,8 @@
6910 #include <asm/mipsregs.h>
6911
6912 static atomic_t count_start_flag = ATOMIC_INIT(0);
6913-static atomic_t count_count_start = ATOMIC_INIT(0);
6914-static atomic_t count_count_stop = ATOMIC_INIT(0);
6915+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6916+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6917 static atomic_t count_reference = ATOMIC_INIT(0);
6918
6919 #define COUNTON 100
6920@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6921
6922 for (i = 0; i < NR_LOOPS; i++) {
6923 /* slaves loop on '!= 2' */
6924- while (atomic_read(&count_count_start) != 1)
6925+ while (atomic_read_unchecked(&count_count_start) != 1)
6926 mb();
6927- atomic_set(&count_count_stop, 0);
6928+ atomic_set_unchecked(&count_count_stop, 0);
6929 smp_wmb();
6930
6931 /* this lets the slaves write their count register */
6932- atomic_inc(&count_count_start);
6933+ atomic_inc_unchecked(&count_count_start);
6934
6935 /*
6936 * Everyone initialises count in the last loop:
6937@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6938 /*
6939 * Wait for all slaves to leave the synchronization point:
6940 */
6941- while (atomic_read(&count_count_stop) != 1)
6942+ while (atomic_read_unchecked(&count_count_stop) != 1)
6943 mb();
6944- atomic_set(&count_count_start, 0);
6945+ atomic_set_unchecked(&count_count_start, 0);
6946 smp_wmb();
6947- atomic_inc(&count_count_stop);
6948+ atomic_inc_unchecked(&count_count_stop);
6949 }
6950 /* Arrange for an interrupt in a short while */
6951 write_c0_compare(read_c0_count() + COUNTON);
6952@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6953 initcount = atomic_read(&count_reference);
6954
6955 for (i = 0; i < NR_LOOPS; i++) {
6956- atomic_inc(&count_count_start);
6957- while (atomic_read(&count_count_start) != 2)
6958+ atomic_inc_unchecked(&count_count_start);
6959+ while (atomic_read_unchecked(&count_count_start) != 2)
6960 mb();
6961
6962 /*
6963@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6964 if (i == NR_LOOPS-1)
6965 write_c0_count(initcount);
6966
6967- atomic_inc(&count_count_stop);
6968- while (atomic_read(&count_count_stop) != 2)
6969+ atomic_inc_unchecked(&count_count_stop);
6970+ while (atomic_read_unchecked(&count_count_stop) != 2)
6971 mb();
6972 }
6973 /* Arrange for an interrupt in a short while */
6974diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6975index d2d1c19..3e21d8d 100644
6976--- a/arch/mips/kernel/traps.c
6977+++ b/arch/mips/kernel/traps.c
6978@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6979 siginfo_t info;
6980
6981 prev_state = exception_enter();
6982- die_if_kernel("Integer overflow", regs);
6983+ if (unlikely(!user_mode(regs))) {
6984+
6985+#ifdef CONFIG_PAX_REFCOUNT
6986+ if (fixup_exception(regs)) {
6987+ pax_report_refcount_overflow(regs);
6988+ exception_exit(prev_state);
6989+ return;
6990+ }
6991+#endif
6992+
6993+ die("Integer overflow", regs);
6994+ }
6995
6996 info.si_code = FPE_INTOVF;
6997 info.si_signo = SIGFPE;
6998diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6999index 52f205a..335927c 100644
7000--- a/arch/mips/kvm/mips.c
7001+++ b/arch/mips/kvm/mips.c
7002@@ -1013,7 +1013,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
7003 return r;
7004 }
7005
7006-int kvm_arch_init(void *opaque)
7007+int kvm_arch_init(const void *opaque)
7008 {
7009 if (kvm_mips_callbacks) {
7010 kvm_err("kvm: module already exists\n");
7011diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
7012index 7ff8637..6004edb 100644
7013--- a/arch/mips/mm/fault.c
7014+++ b/arch/mips/mm/fault.c
7015@@ -31,6 +31,23 @@
7016
7017 int show_unhandled_signals = 1;
7018
7019+#ifdef CONFIG_PAX_PAGEEXEC
7020+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7021+{
7022+ unsigned long i;
7023+
7024+ printk(KERN_ERR "PAX: bytes at PC: ");
7025+ for (i = 0; i < 5; i++) {
7026+ unsigned int c;
7027+ if (get_user(c, (unsigned int *)pc+i))
7028+ printk(KERN_CONT "???????? ");
7029+ else
7030+ printk(KERN_CONT "%08x ", c);
7031+ }
7032+ printk("\n");
7033+}
7034+#endif
7035+
7036 /*
7037 * This routine handles page faults. It determines the address,
7038 * and the problem, and then passes it off to one of the appropriate
7039@@ -206,6 +223,14 @@ bad_area:
7040 bad_area_nosemaphore:
7041 /* User mode accesses just cause a SIGSEGV */
7042 if (user_mode(regs)) {
7043+
7044+#ifdef CONFIG_PAX_PAGEEXEC
7045+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
7046+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
7047+ do_group_exit(SIGKILL);
7048+ }
7049+#endif
7050+
7051 tsk->thread.cp0_badvaddr = address;
7052 tsk->thread.error_code = write;
7053 if (show_unhandled_signals &&
7054diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
7055index 5c81fdd..db158d3 100644
7056--- a/arch/mips/mm/mmap.c
7057+++ b/arch/mips/mm/mmap.c
7058@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7059 struct vm_area_struct *vma;
7060 unsigned long addr = addr0;
7061 int do_color_align;
7062+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7063 struct vm_unmapped_area_info info;
7064
7065 if (unlikely(len > TASK_SIZE))
7066@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7067 do_color_align = 1;
7068
7069 /* requesting a specific address */
7070+
7071+#ifdef CONFIG_PAX_RANDMMAP
7072+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7073+#endif
7074+
7075 if (addr) {
7076 if (do_color_align)
7077 addr = COLOUR_ALIGN(addr, pgoff);
7078@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7079 addr = PAGE_ALIGN(addr);
7080
7081 vma = find_vma(mm, addr);
7082- if (TASK_SIZE - len >= addr &&
7083- (!vma || addr + len <= vma->vm_start))
7084+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7085 return addr;
7086 }
7087
7088 info.length = len;
7089 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7090 info.align_offset = pgoff << PAGE_SHIFT;
7091+ info.threadstack_offset = offset;
7092
7093 if (dir == DOWN) {
7094 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7095@@ -160,45 +166,34 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7096 {
7097 unsigned long random_factor = 0UL;
7098
7099+#ifdef CONFIG_PAX_RANDMMAP
7100+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7101+#endif
7102+
7103 if (current->flags & PF_RANDOMIZE)
7104 random_factor = arch_mmap_rnd();
7105
7106 if (mmap_is_legacy()) {
7107 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7108+
7109+#ifdef CONFIG_PAX_RANDMMAP
7110+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7111+ mm->mmap_base += mm->delta_mmap;
7112+#endif
7113+
7114 mm->get_unmapped_area = arch_get_unmapped_area;
7115 } else {
7116 mm->mmap_base = mmap_base(random_factor);
7117+
7118+#ifdef CONFIG_PAX_RANDMMAP
7119+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7120+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7121+#endif
7122+
7123 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7124 }
7125 }
7126
7127-static inline unsigned long brk_rnd(void)
7128-{
7129- unsigned long rnd = get_random_int();
7130-
7131- rnd = rnd << PAGE_SHIFT;
7132- /* 8MB for 32bit, 256MB for 64bit */
7133- if (TASK_IS_32BIT_ADDR)
7134- rnd = rnd & 0x7ffffful;
7135- else
7136- rnd = rnd & 0xffffffful;
7137-
7138- return rnd;
7139-}
7140-
7141-unsigned long arch_randomize_brk(struct mm_struct *mm)
7142-{
7143- unsigned long base = mm->brk;
7144- unsigned long ret;
7145-
7146- ret = PAGE_ALIGN(base + brk_rnd());
7147-
7148- if (ret < mm->brk)
7149- return mm->brk;
7150-
7151- return ret;
7152-}
7153-
7154 int __virt_addr_valid(const volatile void *kaddr)
7155 {
7156 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7157diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7158index a2358b4..7cead4f 100644
7159--- a/arch/mips/sgi-ip27/ip27-nmi.c
7160+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7161@@ -187,9 +187,9 @@ void
7162 cont_nmi_dump(void)
7163 {
7164 #ifndef REAL_NMI_SIGNAL
7165- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7166+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7167
7168- atomic_inc(&nmied_cpus);
7169+ atomic_inc_unchecked(&nmied_cpus);
7170 #endif
7171 /*
7172 * Only allow 1 cpu to proceed
7173@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7174 udelay(10000);
7175 }
7176 #else
7177- while (atomic_read(&nmied_cpus) != num_online_cpus());
7178+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7179 #endif
7180
7181 /*
7182diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7183index a046b30..6799527 100644
7184--- a/arch/mips/sni/rm200.c
7185+++ b/arch/mips/sni/rm200.c
7186@@ -270,7 +270,7 @@ spurious_8259A_irq:
7187 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7188 spurious_irq_mask |= irqmask;
7189 }
7190- atomic_inc(&irq_err_count);
7191+ atomic_inc_unchecked(&irq_err_count);
7192 /*
7193 * Theoretically we do not have to handle this IRQ,
7194 * but in Linux this does not cause problems and is
7195diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7196index 41e873b..34d33a7 100644
7197--- a/arch/mips/vr41xx/common/icu.c
7198+++ b/arch/mips/vr41xx/common/icu.c
7199@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7200
7201 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7202
7203- atomic_inc(&irq_err_count);
7204+ atomic_inc_unchecked(&irq_err_count);
7205
7206 return -1;
7207 }
7208diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7209index ae0e4ee..e8f0692 100644
7210--- a/arch/mips/vr41xx/common/irq.c
7211+++ b/arch/mips/vr41xx/common/irq.c
7212@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7213 irq_cascade_t *cascade;
7214
7215 if (irq >= NR_IRQS) {
7216- atomic_inc(&irq_err_count);
7217+ atomic_inc_unchecked(&irq_err_count);
7218 return;
7219 }
7220
7221@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7222 ret = cascade->get_irq(irq);
7223 irq = ret;
7224 if (ret < 0)
7225- atomic_inc(&irq_err_count);
7226+ atomic_inc_unchecked(&irq_err_count);
7227 else
7228 irq_dispatch(irq);
7229 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7230diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7231index 967d144..db12197 100644
7232--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7233+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7234@@ -11,12 +11,14 @@
7235 #ifndef _ASM_PROC_CACHE_H
7236 #define _ASM_PROC_CACHE_H
7237
7238+#include <linux/const.h>
7239+
7240 /* L1 cache */
7241
7242 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7243 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7244-#define L1_CACHE_BYTES 16 /* bytes per entry */
7245 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7246+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7247 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7248
7249 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7250diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7251index bcb5df2..84fabd2 100644
7252--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7253+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7254@@ -16,13 +16,15 @@
7255 #ifndef _ASM_PROC_CACHE_H
7256 #define _ASM_PROC_CACHE_H
7257
7258+#include <linux/const.h>
7259+
7260 /*
7261 * L1 cache
7262 */
7263 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7264 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7265-#define L1_CACHE_BYTES 32 /* bytes per entry */
7266 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7267+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7268 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7269
7270 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7271diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7272index 4ce7a01..449202a 100644
7273--- a/arch/openrisc/include/asm/cache.h
7274+++ b/arch/openrisc/include/asm/cache.h
7275@@ -19,11 +19,13 @@
7276 #ifndef __ASM_OPENRISC_CACHE_H
7277 #define __ASM_OPENRISC_CACHE_H
7278
7279+#include <linux/const.h>
7280+
7281 /* FIXME: How can we replace these with values from the CPU...
7282 * they shouldn't be hard-coded!
7283 */
7284
7285-#define L1_CACHE_BYTES 16
7286 #define L1_CACHE_SHIFT 4
7287+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7288
7289 #endif /* __ASM_OPENRISC_CACHE_H */
7290diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7291index 226f8ca9..9d9b87d 100644
7292--- a/arch/parisc/include/asm/atomic.h
7293+++ b/arch/parisc/include/asm/atomic.h
7294@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7295 return dec;
7296 }
7297
7298+#define atomic64_read_unchecked(v) atomic64_read(v)
7299+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7300+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7301+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7302+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7303+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7304+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7305+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7306+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7307+
7308 #endif /* !CONFIG_64BIT */
7309
7310
7311diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7312index 47f11c7..3420df2 100644
7313--- a/arch/parisc/include/asm/cache.h
7314+++ b/arch/parisc/include/asm/cache.h
7315@@ -5,6 +5,7 @@
7316 #ifndef __ARCH_PARISC_CACHE_H
7317 #define __ARCH_PARISC_CACHE_H
7318
7319+#include <linux/const.h>
7320
7321 /*
7322 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7323@@ -15,13 +16,13 @@
7324 * just ruin performance.
7325 */
7326 #ifdef CONFIG_PA20
7327-#define L1_CACHE_BYTES 64
7328 #define L1_CACHE_SHIFT 6
7329 #else
7330-#define L1_CACHE_BYTES 32
7331 #define L1_CACHE_SHIFT 5
7332 #endif
7333
7334+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7335+
7336 #ifndef __ASSEMBLY__
7337
7338 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7339diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7340index 78c9fd3..42fa66a 100644
7341--- a/arch/parisc/include/asm/elf.h
7342+++ b/arch/parisc/include/asm/elf.h
7343@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7344
7345 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7346
7347+#ifdef CONFIG_PAX_ASLR
7348+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7349+
7350+#define PAX_DELTA_MMAP_LEN 16
7351+#define PAX_DELTA_STACK_LEN 16
7352+#endif
7353+
7354 /* This yields a mask that user programs can use to figure out what
7355 instruction set this CPU supports. This could be done in user space,
7356 but it's not easy, and we've already done it here. */
7357diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7358index 3a08eae..08fef28 100644
7359--- a/arch/parisc/include/asm/pgalloc.h
7360+++ b/arch/parisc/include/asm/pgalloc.h
7361@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7362 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7363 }
7364
7365+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7366+{
7367+ pgd_populate(mm, pgd, pmd);
7368+}
7369+
7370 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7371 {
7372 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7373@@ -72,7 +77,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7374
7375 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7376 {
7377- if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)
7378+ if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) {
7379 /*
7380 * This is the permanent pmd attached to the pgd;
7381 * cannot free it.
7382@@ -81,6 +86,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7383 */
7384 mm_inc_nr_pmds(mm);
7385 return;
7386+ }
7387 free_pages((unsigned long)pmd, PMD_ORDER);
7388 }
7389
7390@@ -96,6 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7391 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7392 #define pmd_free(mm, x) do { } while (0)
7393 #define pgd_populate(mm, pmd, pte) BUG()
7394+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7395
7396 #endif
7397
7398diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7399index 0a18375..d613939 100644
7400--- a/arch/parisc/include/asm/pgtable.h
7401+++ b/arch/parisc/include/asm/pgtable.h
7402@@ -213,6 +213,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7403 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7404 #define PAGE_COPY PAGE_EXECREAD
7405 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7406+
7407+#ifdef CONFIG_PAX_PAGEEXEC
7408+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7409+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7410+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7411+#else
7412+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7413+# define PAGE_COPY_NOEXEC PAGE_COPY
7414+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7415+#endif
7416+
7417 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7418 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7419 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7420diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7421index 0abdd4c..1af92f0 100644
7422--- a/arch/parisc/include/asm/uaccess.h
7423+++ b/arch/parisc/include/asm/uaccess.h
7424@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7425 const void __user *from,
7426 unsigned long n)
7427 {
7428- int sz = __compiletime_object_size(to);
7429+ size_t sz = __compiletime_object_size(to);
7430 int ret = -EFAULT;
7431
7432- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7433+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7434 ret = __copy_from_user(to, from, n);
7435 else
7436 copy_from_user_overflow();
7437diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7438index 3c63a82..b1d6ee9 100644
7439--- a/arch/parisc/kernel/module.c
7440+++ b/arch/parisc/kernel/module.c
7441@@ -98,16 +98,38 @@
7442
7443 /* three functions to determine where in the module core
7444 * or init pieces the location is */
7445+static inline int in_init_rx(struct module *me, void *loc)
7446+{
7447+ return (loc >= me->module_init_rx &&
7448+ loc < (me->module_init_rx + me->init_size_rx));
7449+}
7450+
7451+static inline int in_init_rw(struct module *me, void *loc)
7452+{
7453+ return (loc >= me->module_init_rw &&
7454+ loc < (me->module_init_rw + me->init_size_rw));
7455+}
7456+
7457 static inline int in_init(struct module *me, void *loc)
7458 {
7459- return (loc >= me->module_init &&
7460- loc <= (me->module_init + me->init_size));
7461+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7462+}
7463+
7464+static inline int in_core_rx(struct module *me, void *loc)
7465+{
7466+ return (loc >= me->module_core_rx &&
7467+ loc < (me->module_core_rx + me->core_size_rx));
7468+}
7469+
7470+static inline int in_core_rw(struct module *me, void *loc)
7471+{
7472+ return (loc >= me->module_core_rw &&
7473+ loc < (me->module_core_rw + me->core_size_rw));
7474 }
7475
7476 static inline int in_core(struct module *me, void *loc)
7477 {
7478- return (loc >= me->module_core &&
7479- loc <= (me->module_core + me->core_size));
7480+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7481 }
7482
7483 static inline int in_local(struct module *me, void *loc)
7484@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7485 }
7486
7487 /* align things a bit */
7488- me->core_size = ALIGN(me->core_size, 16);
7489- me->arch.got_offset = me->core_size;
7490- me->core_size += gots * sizeof(struct got_entry);
7491+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7492+ me->arch.got_offset = me->core_size_rw;
7493+ me->core_size_rw += gots * sizeof(struct got_entry);
7494
7495- me->core_size = ALIGN(me->core_size, 16);
7496- me->arch.fdesc_offset = me->core_size;
7497- me->core_size += fdescs * sizeof(Elf_Fdesc);
7498+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7499+ me->arch.fdesc_offset = me->core_size_rw;
7500+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7501
7502 me->arch.got_max = gots;
7503 me->arch.fdesc_max = fdescs;
7504@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7505
7506 BUG_ON(value == 0);
7507
7508- got = me->module_core + me->arch.got_offset;
7509+ got = me->module_core_rw + me->arch.got_offset;
7510 for (i = 0; got[i].addr; i++)
7511 if (got[i].addr == value)
7512 goto out;
7513@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7514 #ifdef CONFIG_64BIT
7515 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7516 {
7517- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7518+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7519
7520 if (!value) {
7521 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7522@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7523
7524 /* Create new one */
7525 fdesc->addr = value;
7526- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7527+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7528 return (Elf_Addr)fdesc;
7529 }
7530 #endif /* CONFIG_64BIT */
7531@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7532
7533 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7534 end = table + sechdrs[me->arch.unwind_section].sh_size;
7535- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7536+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7537
7538 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7539 me->arch.unwind_section, table, end, gp);
7540diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7541index 5aba01a..47cdd5a 100644
7542--- a/arch/parisc/kernel/sys_parisc.c
7543+++ b/arch/parisc/kernel/sys_parisc.c
7544@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7545 unsigned long task_size = TASK_SIZE;
7546 int do_color_align, last_mmap;
7547 struct vm_unmapped_area_info info;
7548+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7549
7550 if (len > task_size)
7551 return -ENOMEM;
7552@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7553 goto found_addr;
7554 }
7555
7556+#ifdef CONFIG_PAX_RANDMMAP
7557+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7558+#endif
7559+
7560 if (addr) {
7561 if (do_color_align && last_mmap)
7562 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7563@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7564 info.high_limit = mmap_upper_limit();
7565 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7566 info.align_offset = shared_align_offset(last_mmap, pgoff);
7567+ info.threadstack_offset = offset;
7568 addr = vm_unmapped_area(&info);
7569
7570 found_addr:
7571@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7572 unsigned long addr = addr0;
7573 int do_color_align, last_mmap;
7574 struct vm_unmapped_area_info info;
7575+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7576
7577 #ifdef CONFIG_64BIT
7578 /* This should only ever run for 32-bit processes. */
7579@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7580 }
7581
7582 /* requesting a specific address */
7583+#ifdef CONFIG_PAX_RANDMMAP
7584+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7585+#endif
7586+
7587 if (addr) {
7588 if (do_color_align && last_mmap)
7589 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7590@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7591 info.high_limit = mm->mmap_base;
7592 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7593 info.align_offset = shared_align_offset(last_mmap, pgoff);
7594+ info.threadstack_offset = offset;
7595 addr = vm_unmapped_area(&info);
7596 if (!(addr & ~PAGE_MASK))
7597 goto found_addr;
7598@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7599 mm->mmap_legacy_base = mmap_legacy_base();
7600 mm->mmap_base = mmap_upper_limit();
7601
7602+#ifdef CONFIG_PAX_RANDMMAP
7603+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7604+ mm->mmap_legacy_base += mm->delta_mmap;
7605+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7606+ }
7607+#endif
7608+
7609 if (mmap_is_legacy()) {
7610 mm->mmap_base = mm->mmap_legacy_base;
7611 mm->get_unmapped_area = arch_get_unmapped_area;
7612diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7613index 47ee620..1107387 100644
7614--- a/arch/parisc/kernel/traps.c
7615+++ b/arch/parisc/kernel/traps.c
7616@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7617
7618 down_read(&current->mm->mmap_sem);
7619 vma = find_vma(current->mm,regs->iaoq[0]);
7620- if (vma && (regs->iaoq[0] >= vma->vm_start)
7621- && (vma->vm_flags & VM_EXEC)) {
7622-
7623+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7624 fault_address = regs->iaoq[0];
7625 fault_space = regs->iasq[0];
7626
7627diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7628index e5120e6..8ddb5cc 100644
7629--- a/arch/parisc/mm/fault.c
7630+++ b/arch/parisc/mm/fault.c
7631@@ -15,6 +15,7 @@
7632 #include <linux/sched.h>
7633 #include <linux/interrupt.h>
7634 #include <linux/module.h>
7635+#include <linux/unistd.h>
7636
7637 #include <asm/uaccess.h>
7638 #include <asm/traps.h>
7639@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7640 static unsigned long
7641 parisc_acctyp(unsigned long code, unsigned int inst)
7642 {
7643- if (code == 6 || code == 16)
7644+ if (code == 6 || code == 7 || code == 16)
7645 return VM_EXEC;
7646
7647 switch (inst & 0xf0000000) {
7648@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7649 }
7650 #endif
7651
7652+#ifdef CONFIG_PAX_PAGEEXEC
7653+/*
7654+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7655+ *
7656+ * returns 1 when task should be killed
7657+ * 2 when rt_sigreturn trampoline was detected
7658+ * 3 when unpatched PLT trampoline was detected
7659+ */
7660+static int pax_handle_fetch_fault(struct pt_regs *regs)
7661+{
7662+
7663+#ifdef CONFIG_PAX_EMUPLT
7664+ int err;
7665+
7666+ do { /* PaX: unpatched PLT emulation */
7667+ unsigned int bl, depwi;
7668+
7669+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7670+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7671+
7672+ if (err)
7673+ break;
7674+
7675+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7676+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7677+
7678+ err = get_user(ldw, (unsigned int *)addr);
7679+ err |= get_user(bv, (unsigned int *)(addr+4));
7680+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7681+
7682+ if (err)
7683+ break;
7684+
7685+ if (ldw == 0x0E801096U &&
7686+ bv == 0xEAC0C000U &&
7687+ ldw2 == 0x0E881095U)
7688+ {
7689+ unsigned int resolver, map;
7690+
7691+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7692+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7693+ if (err)
7694+ break;
7695+
7696+ regs->gr[20] = instruction_pointer(regs)+8;
7697+ regs->gr[21] = map;
7698+ regs->gr[22] = resolver;
7699+ regs->iaoq[0] = resolver | 3UL;
7700+ regs->iaoq[1] = regs->iaoq[0] + 4;
7701+ return 3;
7702+ }
7703+ }
7704+ } while (0);
7705+#endif
7706+
7707+#ifdef CONFIG_PAX_EMUTRAMP
7708+
7709+#ifndef CONFIG_PAX_EMUSIGRT
7710+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7711+ return 1;
7712+#endif
7713+
7714+ do { /* PaX: rt_sigreturn emulation */
7715+ unsigned int ldi1, ldi2, bel, nop;
7716+
7717+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7718+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7719+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7720+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7721+
7722+ if (err)
7723+ break;
7724+
7725+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7726+ ldi2 == 0x3414015AU &&
7727+ bel == 0xE4008200U &&
7728+ nop == 0x08000240U)
7729+ {
7730+ regs->gr[25] = (ldi1 & 2) >> 1;
7731+ regs->gr[20] = __NR_rt_sigreturn;
7732+ regs->gr[31] = regs->iaoq[1] + 16;
7733+ regs->sr[0] = regs->iasq[1];
7734+ regs->iaoq[0] = 0x100UL;
7735+ regs->iaoq[1] = regs->iaoq[0] + 4;
7736+ regs->iasq[0] = regs->sr[2];
7737+ regs->iasq[1] = regs->sr[2];
7738+ return 2;
7739+ }
7740+ } while (0);
7741+#endif
7742+
7743+ return 1;
7744+}
7745+
7746+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7747+{
7748+ unsigned long i;
7749+
7750+ printk(KERN_ERR "PAX: bytes at PC: ");
7751+ for (i = 0; i < 5; i++) {
7752+ unsigned int c;
7753+ if (get_user(c, (unsigned int *)pc+i))
7754+ printk(KERN_CONT "???????? ");
7755+ else
7756+ printk(KERN_CONT "%08x ", c);
7757+ }
7758+ printk("\n");
7759+}
7760+#endif
7761+
7762 int fixup_exception(struct pt_regs *regs)
7763 {
7764 const struct exception_table_entry *fix;
7765@@ -234,8 +345,33 @@ retry:
7766
7767 good_area:
7768
7769- if ((vma->vm_flags & acc_type) != acc_type)
7770+ if ((vma->vm_flags & acc_type) != acc_type) {
7771+
7772+#ifdef CONFIG_PAX_PAGEEXEC
7773+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7774+ (address & ~3UL) == instruction_pointer(regs))
7775+ {
7776+ up_read(&mm->mmap_sem);
7777+ switch (pax_handle_fetch_fault(regs)) {
7778+
7779+#ifdef CONFIG_PAX_EMUPLT
7780+ case 3:
7781+ return;
7782+#endif
7783+
7784+#ifdef CONFIG_PAX_EMUTRAMP
7785+ case 2:
7786+ return;
7787+#endif
7788+
7789+ }
7790+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7791+ do_group_exit(SIGKILL);
7792+ }
7793+#endif
7794+
7795 goto bad_area;
7796+ }
7797
7798 /*
7799 * If for any reason at all we couldn't handle the fault, make
7800diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7801index 190cc48..48439ce 100644
7802--- a/arch/powerpc/Kconfig
7803+++ b/arch/powerpc/Kconfig
7804@@ -413,6 +413,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7805 config KEXEC
7806 bool "kexec system call"
7807 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7808+ depends on !GRKERNSEC_KMEM
7809 help
7810 kexec is a system call that implements the ability to shutdown your
7811 current kernel, and to start another kernel. It is like a reboot
7812diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7813index 512d278..d31fadd 100644
7814--- a/arch/powerpc/include/asm/atomic.h
7815+++ b/arch/powerpc/include/asm/atomic.h
7816@@ -12,6 +12,11 @@
7817
7818 #define ATOMIC_INIT(i) { (i) }
7819
7820+#define _ASM_EXTABLE(from, to) \
7821+" .section __ex_table,\"a\"\n" \
7822+ PPC_LONG" " #from ", " #to"\n" \
7823+" .previous\n"
7824+
7825 static __inline__ int atomic_read(const atomic_t *v)
7826 {
7827 int t;
7828@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7829 return t;
7830 }
7831
7832+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7833+{
7834+ int t;
7835+
7836+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7837+
7838+ return t;
7839+}
7840+
7841 static __inline__ void atomic_set(atomic_t *v, int i)
7842 {
7843 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7844 }
7845
7846-#define ATOMIC_OP(op, asm_op) \
7847-static __inline__ void atomic_##op(int a, atomic_t *v) \
7848+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7849+{
7850+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7851+}
7852+
7853+#ifdef CONFIG_PAX_REFCOUNT
7854+#define __REFCOUNT_OP(op) op##o.
7855+#define __OVERFLOW_PRE \
7856+ " mcrxr cr0\n"
7857+#define __OVERFLOW_POST \
7858+ " bf 4*cr0+so, 3f\n" \
7859+ "2: .long 0x00c00b00\n" \
7860+ "3:\n"
7861+#define __OVERFLOW_EXTABLE \
7862+ "\n4:\n"
7863+ _ASM_EXTABLE(2b, 4b)
7864+#else
7865+#define __REFCOUNT_OP(op) op
7866+#define __OVERFLOW_PRE
7867+#define __OVERFLOW_POST
7868+#define __OVERFLOW_EXTABLE
7869+#endif
7870+
7871+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7872+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7873 { \
7874 int t; \
7875 \
7876 __asm__ __volatile__( \
7877-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7878+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7879+ pre_op \
7880 #asm_op " %0,%2,%0\n" \
7881+ post_op \
7882 PPC405_ERR77(0,%3) \
7883 " stwcx. %0,0,%3 \n" \
7884 " bne- 1b\n" \
7885+ extable \
7886 : "=&r" (t), "+m" (v->counter) \
7887 : "r" (a), "r" (&v->counter) \
7888 : "cc"); \
7889 } \
7890
7891-#define ATOMIC_OP_RETURN(op, asm_op) \
7892-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7893+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7894+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7895+
7896+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7897+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7898 { \
7899 int t; \
7900 \
7901 __asm__ __volatile__( \
7902 PPC_ATOMIC_ENTRY_BARRIER \
7903-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7904+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7905+ pre_op \
7906 #asm_op " %0,%1,%0\n" \
7907+ post_op \
7908 PPC405_ERR77(0,%2) \
7909 " stwcx. %0,0,%2 \n" \
7910 " bne- 1b\n" \
7911+ extable \
7912 PPC_ATOMIC_EXIT_BARRIER \
7913 : "=&r" (t) \
7914 : "r" (a), "r" (&v->counter) \
7915@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7916 return t; \
7917 }
7918
7919+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7920+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7921+
7922 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7923
7924 ATOMIC_OPS(add, add)
7925@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7926
7927 #undef ATOMIC_OPS
7928 #undef ATOMIC_OP_RETURN
7929+#undef __ATOMIC_OP_RETURN
7930 #undef ATOMIC_OP
7931+#undef __ATOMIC_OP
7932
7933 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7934
7935-static __inline__ void atomic_inc(atomic_t *v)
7936-{
7937- int t;
7938+/*
7939+ * atomic_inc - increment atomic variable
7940+ * @v: pointer of type atomic_t
7941+ *
7942+ * Automatically increments @v by 1
7943+ */
7944+#define atomic_inc(v) atomic_add(1, (v))
7945+#define atomic_inc_return(v) atomic_add_return(1, (v))
7946
7947- __asm__ __volatile__(
7948-"1: lwarx %0,0,%2 # atomic_inc\n\
7949- addic %0,%0,1\n"
7950- PPC405_ERR77(0,%2)
7951-" stwcx. %0,0,%2 \n\
7952- bne- 1b"
7953- : "=&r" (t), "+m" (v->counter)
7954- : "r" (&v->counter)
7955- : "cc", "xer");
7956+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7957+{
7958+ atomic_add_unchecked(1, v);
7959 }
7960
7961-static __inline__ int atomic_inc_return(atomic_t *v)
7962+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7963 {
7964- int t;
7965-
7966- __asm__ __volatile__(
7967- PPC_ATOMIC_ENTRY_BARRIER
7968-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7969- addic %0,%0,1\n"
7970- PPC405_ERR77(0,%1)
7971-" stwcx. %0,0,%1 \n\
7972- bne- 1b"
7973- PPC_ATOMIC_EXIT_BARRIER
7974- : "=&r" (t)
7975- : "r" (&v->counter)
7976- : "cc", "xer", "memory");
7977-
7978- return t;
7979+ return atomic_add_return_unchecked(1, v);
7980 }
7981
7982 /*
7983@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7984 */
7985 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7986
7987-static __inline__ void atomic_dec(atomic_t *v)
7988+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7989 {
7990- int t;
7991-
7992- __asm__ __volatile__(
7993-"1: lwarx %0,0,%2 # atomic_dec\n\
7994- addic %0,%0,-1\n"
7995- PPC405_ERR77(0,%2)\
7996-" stwcx. %0,0,%2\n\
7997- bne- 1b"
7998- : "=&r" (t), "+m" (v->counter)
7999- : "r" (&v->counter)
8000- : "cc", "xer");
8001+ return atomic_add_return_unchecked(1, v) == 0;
8002 }
8003
8004-static __inline__ int atomic_dec_return(atomic_t *v)
8005+/*
8006+ * atomic_dec - decrement atomic variable
8007+ * @v: pointer of type atomic_t
8008+ *
8009+ * Atomically decrements @v by 1
8010+ */
8011+#define atomic_dec(v) atomic_sub(1, (v))
8012+#define atomic_dec_return(v) atomic_sub_return(1, (v))
8013+
8014+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
8015 {
8016- int t;
8017-
8018- __asm__ __volatile__(
8019- PPC_ATOMIC_ENTRY_BARRIER
8020-"1: lwarx %0,0,%1 # atomic_dec_return\n\
8021- addic %0,%0,-1\n"
8022- PPC405_ERR77(0,%1)
8023-" stwcx. %0,0,%1\n\
8024- bne- 1b"
8025- PPC_ATOMIC_EXIT_BARRIER
8026- : "=&r" (t)
8027- : "r" (&v->counter)
8028- : "cc", "xer", "memory");
8029-
8030- return t;
8031+ atomic_sub_unchecked(1, v);
8032 }
8033
8034 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8035 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
8036
8037+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8038+{
8039+ return cmpxchg(&(v->counter), old, new);
8040+}
8041+
8042+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8043+{
8044+ return xchg(&(v->counter), new);
8045+}
8046+
8047 /**
8048 * __atomic_add_unless - add unless the number is a given value
8049 * @v: pointer of type atomic_t
8050@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
8051 PPC_ATOMIC_ENTRY_BARRIER
8052 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
8053 cmpw 0,%0,%3 \n\
8054- beq- 2f \n\
8055- add %0,%2,%0 \n"
8056+ beq- 2f \n"
8057+
8058+#ifdef CONFIG_PAX_REFCOUNT
8059+" mcrxr cr0\n"
8060+" addo. %0,%2,%0\n"
8061+" bf 4*cr0+so, 4f\n"
8062+"3:.long " "0x00c00b00""\n"
8063+"4:\n"
8064+#else
8065+ "add %0,%2,%0 \n"
8066+#endif
8067+
8068 PPC405_ERR77(0,%2)
8069 " stwcx. %0,0,%1 \n\
8070 bne- 1b \n"
8071+"5:"
8072+
8073+#ifdef CONFIG_PAX_REFCOUNT
8074+ _ASM_EXTABLE(3b, 5b)
8075+#endif
8076+
8077 PPC_ATOMIC_EXIT_BARRIER
8078 " subf %0,%2,%0 \n\
8079 2:"
8080@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
8081 }
8082 #define atomic_dec_if_positive atomic_dec_if_positive
8083
8084+#define smp_mb__before_atomic_dec() smp_mb()
8085+#define smp_mb__after_atomic_dec() smp_mb()
8086+#define smp_mb__before_atomic_inc() smp_mb()
8087+#define smp_mb__after_atomic_inc() smp_mb()
8088+
8089 #ifdef __powerpc64__
8090
8091 #define ATOMIC64_INIT(i) { (i) }
8092@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8093 return t;
8094 }
8095
8096+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8097+{
8098+ long t;
8099+
8100+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8101+
8102+ return t;
8103+}
8104+
8105 static __inline__ void atomic64_set(atomic64_t *v, long i)
8106 {
8107 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8108 }
8109
8110-#define ATOMIC64_OP(op, asm_op) \
8111-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8112+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8113+{
8114+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8115+}
8116+
8117+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8118+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8119 { \
8120 long t; \
8121 \
8122 __asm__ __volatile__( \
8123 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8124+ pre_op \
8125 #asm_op " %0,%2,%0\n" \
8126+ post_op \
8127 " stdcx. %0,0,%3 \n" \
8128 " bne- 1b\n" \
8129+ extable \
8130 : "=&r" (t), "+m" (v->counter) \
8131 : "r" (a), "r" (&v->counter) \
8132 : "cc"); \
8133 }
8134
8135-#define ATOMIC64_OP_RETURN(op, asm_op) \
8136-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8137+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8138+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8139+
8140+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8141+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8142 { \
8143 long t; \
8144 \
8145 __asm__ __volatile__( \
8146 PPC_ATOMIC_ENTRY_BARRIER \
8147 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8148+ pre_op \
8149 #asm_op " %0,%1,%0\n" \
8150+ post_op \
8151 " stdcx. %0,0,%2 \n" \
8152 " bne- 1b\n" \
8153+ extable \
8154 PPC_ATOMIC_EXIT_BARRIER \
8155 : "=&r" (t) \
8156 : "r" (a), "r" (&v->counter) \
8157@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8158 return t; \
8159 }
8160
8161+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8162+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8163+
8164 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8165
8166 ATOMIC64_OPS(add, add)
8167@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8168
8169 #undef ATOMIC64_OPS
8170 #undef ATOMIC64_OP_RETURN
8171+#undef __ATOMIC64_OP_RETURN
8172 #undef ATOMIC64_OP
8173+#undef __ATOMIC64_OP
8174+#undef __OVERFLOW_EXTABLE
8175+#undef __OVERFLOW_POST
8176+#undef __OVERFLOW_PRE
8177+#undef __REFCOUNT_OP
8178
8179 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8180
8181-static __inline__ void atomic64_inc(atomic64_t *v)
8182-{
8183- long t;
8184+/*
8185+ * atomic64_inc - increment atomic variable
8186+ * @v: pointer of type atomic64_t
8187+ *
8188+ * Automatically increments @v by 1
8189+ */
8190+#define atomic64_inc(v) atomic64_add(1, (v))
8191+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8192
8193- __asm__ __volatile__(
8194-"1: ldarx %0,0,%2 # atomic64_inc\n\
8195- addic %0,%0,1\n\
8196- stdcx. %0,0,%2 \n\
8197- bne- 1b"
8198- : "=&r" (t), "+m" (v->counter)
8199- : "r" (&v->counter)
8200- : "cc", "xer");
8201+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8202+{
8203+ atomic64_add_unchecked(1, v);
8204 }
8205
8206-static __inline__ long atomic64_inc_return(atomic64_t *v)
8207+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8208 {
8209- long t;
8210-
8211- __asm__ __volatile__(
8212- PPC_ATOMIC_ENTRY_BARRIER
8213-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8214- addic %0,%0,1\n\
8215- stdcx. %0,0,%1 \n\
8216- bne- 1b"
8217- PPC_ATOMIC_EXIT_BARRIER
8218- : "=&r" (t)
8219- : "r" (&v->counter)
8220- : "cc", "xer", "memory");
8221-
8222- return t;
8223+ return atomic64_add_return_unchecked(1, v);
8224 }
8225
8226 /*
8227@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8228 */
8229 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8230
8231-static __inline__ void atomic64_dec(atomic64_t *v)
8232+/*
8233+ * atomic64_dec - decrement atomic variable
8234+ * @v: pointer of type atomic64_t
8235+ *
8236+ * Atomically decrements @v by 1
8237+ */
8238+#define atomic64_dec(v) atomic64_sub(1, (v))
8239+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8240+
8241+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8242 {
8243- long t;
8244-
8245- __asm__ __volatile__(
8246-"1: ldarx %0,0,%2 # atomic64_dec\n\
8247- addic %0,%0,-1\n\
8248- stdcx. %0,0,%2\n\
8249- bne- 1b"
8250- : "=&r" (t), "+m" (v->counter)
8251- : "r" (&v->counter)
8252- : "cc", "xer");
8253-}
8254-
8255-static __inline__ long atomic64_dec_return(atomic64_t *v)
8256-{
8257- long t;
8258-
8259- __asm__ __volatile__(
8260- PPC_ATOMIC_ENTRY_BARRIER
8261-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8262- addic %0,%0,-1\n\
8263- stdcx. %0,0,%1\n\
8264- bne- 1b"
8265- PPC_ATOMIC_EXIT_BARRIER
8266- : "=&r" (t)
8267- : "r" (&v->counter)
8268- : "cc", "xer", "memory");
8269-
8270- return t;
8271+ atomic64_sub_unchecked(1, v);
8272 }
8273
8274 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8275@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8276 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8277 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8278
8279+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8280+{
8281+ return cmpxchg(&(v->counter), old, new);
8282+}
8283+
8284+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8285+{
8286+ return xchg(&(v->counter), new);
8287+}
8288+
8289 /**
8290 * atomic64_add_unless - add unless the number is a given value
8291 * @v: pointer of type atomic64_t
8292@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8293
8294 __asm__ __volatile__ (
8295 PPC_ATOMIC_ENTRY_BARRIER
8296-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8297+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8298 cmpd 0,%0,%3 \n\
8299- beq- 2f \n\
8300- add %0,%2,%0 \n"
8301+ beq- 2f \n"
8302+
8303+#ifdef CONFIG_PAX_REFCOUNT
8304+" mcrxr cr0\n"
8305+" addo. %0,%2,%0\n"
8306+" bf 4*cr0+so, 4f\n"
8307+"3:.long " "0x00c00b00""\n"
8308+"4:\n"
8309+#else
8310+ "add %0,%2,%0 \n"
8311+#endif
8312+
8313 " stdcx. %0,0,%1 \n\
8314 bne- 1b \n"
8315 PPC_ATOMIC_EXIT_BARRIER
8316+"5:"
8317+
8318+#ifdef CONFIG_PAX_REFCOUNT
8319+ _ASM_EXTABLE(3b, 5b)
8320+#endif
8321+
8322 " subf %0,%2,%0 \n\
8323 2:"
8324 : "=&r" (t)
8325diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8326index a3bf5be..e03ba81 100644
8327--- a/arch/powerpc/include/asm/barrier.h
8328+++ b/arch/powerpc/include/asm/barrier.h
8329@@ -76,7 +76,7 @@
8330 do { \
8331 compiletime_assert_atomic_type(*p); \
8332 smp_lwsync(); \
8333- ACCESS_ONCE(*p) = (v); \
8334+ ACCESS_ONCE_RW(*p) = (v); \
8335 } while (0)
8336
8337 #define smp_load_acquire(p) \
8338diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8339index 0dc42c5..b80a3a1 100644
8340--- a/arch/powerpc/include/asm/cache.h
8341+++ b/arch/powerpc/include/asm/cache.h
8342@@ -4,6 +4,7 @@
8343 #ifdef __KERNEL__
8344
8345 #include <asm/reg.h>
8346+#include <linux/const.h>
8347
8348 /* bytes per L1 cache line */
8349 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8350@@ -23,7 +24,7 @@
8351 #define L1_CACHE_SHIFT 7
8352 #endif
8353
8354-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8355+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8356
8357 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8358
8359diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8360index ee46ffe..b36c98c 100644
8361--- a/arch/powerpc/include/asm/elf.h
8362+++ b/arch/powerpc/include/asm/elf.h
8363@@ -30,6 +30,18 @@
8364
8365 #define ELF_ET_DYN_BASE 0x20000000
8366
8367+#ifdef CONFIG_PAX_ASLR
8368+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8369+
8370+#ifdef __powerpc64__
8371+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8372+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8373+#else
8374+#define PAX_DELTA_MMAP_LEN 15
8375+#define PAX_DELTA_STACK_LEN 15
8376+#endif
8377+#endif
8378+
8379 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8380
8381 /*
8382diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8383index 8196e9c..d83a9f3 100644
8384--- a/arch/powerpc/include/asm/exec.h
8385+++ b/arch/powerpc/include/asm/exec.h
8386@@ -4,6 +4,6 @@
8387 #ifndef _ASM_POWERPC_EXEC_H
8388 #define _ASM_POWERPC_EXEC_H
8389
8390-extern unsigned long arch_align_stack(unsigned long sp);
8391+#define arch_align_stack(x) ((x) & ~0xfUL)
8392
8393 #endif /* _ASM_POWERPC_EXEC_H */
8394diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8395index 5acabbd..7ea14fa 100644
8396--- a/arch/powerpc/include/asm/kmap_types.h
8397+++ b/arch/powerpc/include/asm/kmap_types.h
8398@@ -10,7 +10,7 @@
8399 * 2 of the License, or (at your option) any later version.
8400 */
8401
8402-#define KM_TYPE_NR 16
8403+#define KM_TYPE_NR 17
8404
8405 #endif /* __KERNEL__ */
8406 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8407diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8408index b8da913..c02b593 100644
8409--- a/arch/powerpc/include/asm/local.h
8410+++ b/arch/powerpc/include/asm/local.h
8411@@ -9,21 +9,65 @@ typedef struct
8412 atomic_long_t a;
8413 } local_t;
8414
8415+typedef struct
8416+{
8417+ atomic_long_unchecked_t a;
8418+} local_unchecked_t;
8419+
8420 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8421
8422 #define local_read(l) atomic_long_read(&(l)->a)
8423+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8424 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8425+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8426
8427 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8428+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8429 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8430+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8431 #define local_inc(l) atomic_long_inc(&(l)->a)
8432+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8433 #define local_dec(l) atomic_long_dec(&(l)->a)
8434+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8435
8436 static __inline__ long local_add_return(long a, local_t *l)
8437 {
8438 long t;
8439
8440 __asm__ __volatile__(
8441+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8442+
8443+#ifdef CONFIG_PAX_REFCOUNT
8444+" mcrxr cr0\n"
8445+" addo. %0,%1,%0\n"
8446+" bf 4*cr0+so, 3f\n"
8447+"2:.long " "0x00c00b00""\n"
8448+#else
8449+" add %0,%1,%0\n"
8450+#endif
8451+
8452+"3:\n"
8453+ PPC405_ERR77(0,%2)
8454+ PPC_STLCX "%0,0,%2 \n\
8455+ bne- 1b"
8456+
8457+#ifdef CONFIG_PAX_REFCOUNT
8458+"\n4:\n"
8459+ _ASM_EXTABLE(2b, 4b)
8460+#endif
8461+
8462+ : "=&r" (t)
8463+ : "r" (a), "r" (&(l->a.counter))
8464+ : "cc", "memory");
8465+
8466+ return t;
8467+}
8468+
8469+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8470+{
8471+ long t;
8472+
8473+ __asm__ __volatile__(
8474 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8475 add %0,%1,%0\n"
8476 PPC405_ERR77(0,%2)
8477@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8478
8479 #define local_cmpxchg(l, o, n) \
8480 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8481+#define local_cmpxchg_unchecked(l, o, n) \
8482+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8483 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8484
8485 /**
8486diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8487index 8565c25..2865190 100644
8488--- a/arch/powerpc/include/asm/mman.h
8489+++ b/arch/powerpc/include/asm/mman.h
8490@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8491 }
8492 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8493
8494-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8495+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8496 {
8497 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8498 }
8499diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8500index 69c0598..2c56964 100644
8501--- a/arch/powerpc/include/asm/page.h
8502+++ b/arch/powerpc/include/asm/page.h
8503@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8504 * and needs to be executable. This means the whole heap ends
8505 * up being executable.
8506 */
8507-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8508- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8509+#define VM_DATA_DEFAULT_FLAGS32 \
8510+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8511+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8512
8513 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8514 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8515@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8516 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8517 #endif
8518
8519+#define ktla_ktva(addr) (addr)
8520+#define ktva_ktla(addr) (addr)
8521+
8522 #ifndef CONFIG_PPC_BOOK3S_64
8523 /*
8524 * Use the top bit of the higher-level page table entries to indicate whether
8525diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8526index d908a46..3753f71 100644
8527--- a/arch/powerpc/include/asm/page_64.h
8528+++ b/arch/powerpc/include/asm/page_64.h
8529@@ -172,15 +172,18 @@ do { \
8530 * stack by default, so in the absence of a PT_GNU_STACK program header
8531 * we turn execute permission off.
8532 */
8533-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8534- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8535+#define VM_STACK_DEFAULT_FLAGS32 \
8536+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8537+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8538
8539 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8540 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8541
8542+#ifndef CONFIG_PAX_PAGEEXEC
8543 #define VM_STACK_DEFAULT_FLAGS \
8544 (is_32bit_task() ? \
8545 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8546+#endif
8547
8548 #include <asm-generic/getorder.h>
8549
8550diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8551index 4b0be20..c15a27d 100644
8552--- a/arch/powerpc/include/asm/pgalloc-64.h
8553+++ b/arch/powerpc/include/asm/pgalloc-64.h
8554@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8555 #ifndef CONFIG_PPC_64K_PAGES
8556
8557 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8558+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8559
8560 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8561 {
8562@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8563 pud_set(pud, (unsigned long)pmd);
8564 }
8565
8566+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8567+{
8568+ pud_populate(mm, pud, pmd);
8569+}
8570+
8571 #define pmd_populate(mm, pmd, pte_page) \
8572 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8573 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8574@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8575 #endif
8576
8577 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8578+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8579
8580 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8581 pte_t *pte)
8582diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8583index 11a3863..108f194 100644
8584--- a/arch/powerpc/include/asm/pgtable.h
8585+++ b/arch/powerpc/include/asm/pgtable.h
8586@@ -2,6 +2,7 @@
8587 #define _ASM_POWERPC_PGTABLE_H
8588 #ifdef __KERNEL__
8589
8590+#include <linux/const.h>
8591 #ifndef __ASSEMBLY__
8592 #include <linux/mmdebug.h>
8593 #include <linux/mmzone.h>
8594diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8595index 62cfb0c..50c6402 100644
8596--- a/arch/powerpc/include/asm/pte-hash32.h
8597+++ b/arch/powerpc/include/asm/pte-hash32.h
8598@@ -20,6 +20,7 @@
8599 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8600 #define _PAGE_USER 0x004 /* usermode access allowed */
8601 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8602+#define _PAGE_EXEC _PAGE_GUARDED
8603 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8604 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8605 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8606diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8607index af56b5c..f86f3f6 100644
8608--- a/arch/powerpc/include/asm/reg.h
8609+++ b/arch/powerpc/include/asm/reg.h
8610@@ -253,6 +253,7 @@
8611 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8612 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8613 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8614+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8615 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8616 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8617 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8618diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8619index 825663c..f9e9134 100644
8620--- a/arch/powerpc/include/asm/smp.h
8621+++ b/arch/powerpc/include/asm/smp.h
8622@@ -51,7 +51,7 @@ struct smp_ops_t {
8623 int (*cpu_disable)(void);
8624 void (*cpu_die)(unsigned int nr);
8625 int (*cpu_bootable)(unsigned int nr);
8626-};
8627+} __no_const;
8628
8629 extern void smp_send_debugger_break(void);
8630 extern void start_secondary_resume(void);
8631diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8632index 4dbe072..b803275 100644
8633--- a/arch/powerpc/include/asm/spinlock.h
8634+++ b/arch/powerpc/include/asm/spinlock.h
8635@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8636 __asm__ __volatile__(
8637 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8638 __DO_SIGN_EXTEND
8639-" addic. %0,%0,1\n\
8640- ble- 2f\n"
8641+
8642+#ifdef CONFIG_PAX_REFCOUNT
8643+" mcrxr cr0\n"
8644+" addico. %0,%0,1\n"
8645+" bf 4*cr0+so, 3f\n"
8646+"2:.long " "0x00c00b00""\n"
8647+#else
8648+" addic. %0,%0,1\n"
8649+#endif
8650+
8651+"3:\n"
8652+ "ble- 4f\n"
8653 PPC405_ERR77(0,%1)
8654 " stwcx. %0,0,%1\n\
8655 bne- 1b\n"
8656 PPC_ACQUIRE_BARRIER
8657-"2:" : "=&r" (tmp)
8658+"4:"
8659+
8660+#ifdef CONFIG_PAX_REFCOUNT
8661+ _ASM_EXTABLE(2b,4b)
8662+#endif
8663+
8664+ : "=&r" (tmp)
8665 : "r" (&rw->lock)
8666 : "cr0", "xer", "memory");
8667
8668@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8669 __asm__ __volatile__(
8670 "# read_unlock\n\t"
8671 PPC_RELEASE_BARRIER
8672-"1: lwarx %0,0,%1\n\
8673- addic %0,%0,-1\n"
8674+"1: lwarx %0,0,%1\n"
8675+
8676+#ifdef CONFIG_PAX_REFCOUNT
8677+" mcrxr cr0\n"
8678+" addico. %0,%0,-1\n"
8679+" bf 4*cr0+so, 3f\n"
8680+"2:.long " "0x00c00b00""\n"
8681+#else
8682+" addic. %0,%0,-1\n"
8683+#endif
8684+
8685+"3:\n"
8686 PPC405_ERR77(0,%1)
8687 " stwcx. %0,0,%1\n\
8688 bne- 1b"
8689+
8690+#ifdef CONFIG_PAX_REFCOUNT
8691+"\n4:\n"
8692+ _ASM_EXTABLE(2b, 4b)
8693+#endif
8694+
8695 : "=&r"(tmp)
8696 : "r"(&rw->lock)
8697 : "cr0", "xer", "memory");
8698diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8699index 7efee4a..48d47cc 100644
8700--- a/arch/powerpc/include/asm/thread_info.h
8701+++ b/arch/powerpc/include/asm/thread_info.h
8702@@ -101,6 +101,8 @@ static inline struct thread_info *current_thread_info(void)
8703 #if defined(CONFIG_PPC64)
8704 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8705 #endif
8706+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8707+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8708
8709 /* as above, but as bit values */
8710 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8711@@ -119,9 +121,10 @@ static inline struct thread_info *current_thread_info(void)
8712 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8713 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8714 #define _TIF_NOHZ (1<<TIF_NOHZ)
8715+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8716 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8717 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8718- _TIF_NOHZ)
8719+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8720
8721 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8722 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8723diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8724index a0c071d..49cdc7f 100644
8725--- a/arch/powerpc/include/asm/uaccess.h
8726+++ b/arch/powerpc/include/asm/uaccess.h
8727@@ -58,6 +58,7 @@
8728
8729 #endif
8730
8731+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8732 #define access_ok(type, addr, size) \
8733 (__chk_user_ptr(addr), \
8734 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8735@@ -318,52 +319,6 @@ do { \
8736 extern unsigned long __copy_tofrom_user(void __user *to,
8737 const void __user *from, unsigned long size);
8738
8739-#ifndef __powerpc64__
8740-
8741-static inline unsigned long copy_from_user(void *to,
8742- const void __user *from, unsigned long n)
8743-{
8744- unsigned long over;
8745-
8746- if (access_ok(VERIFY_READ, from, n))
8747- return __copy_tofrom_user((__force void __user *)to, from, n);
8748- if ((unsigned long)from < TASK_SIZE) {
8749- over = (unsigned long)from + n - TASK_SIZE;
8750- return __copy_tofrom_user((__force void __user *)to, from,
8751- n - over) + over;
8752- }
8753- return n;
8754-}
8755-
8756-static inline unsigned long copy_to_user(void __user *to,
8757- const void *from, unsigned long n)
8758-{
8759- unsigned long over;
8760-
8761- if (access_ok(VERIFY_WRITE, to, n))
8762- return __copy_tofrom_user(to, (__force void __user *)from, n);
8763- if ((unsigned long)to < TASK_SIZE) {
8764- over = (unsigned long)to + n - TASK_SIZE;
8765- return __copy_tofrom_user(to, (__force void __user *)from,
8766- n - over) + over;
8767- }
8768- return n;
8769-}
8770-
8771-#else /* __powerpc64__ */
8772-
8773-#define __copy_in_user(to, from, size) \
8774- __copy_tofrom_user((to), (from), (size))
8775-
8776-extern unsigned long copy_from_user(void *to, const void __user *from,
8777- unsigned long n);
8778-extern unsigned long copy_to_user(void __user *to, const void *from,
8779- unsigned long n);
8780-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8781- unsigned long n);
8782-
8783-#endif /* __powerpc64__ */
8784-
8785 static inline unsigned long __copy_from_user_inatomic(void *to,
8786 const void __user *from, unsigned long n)
8787 {
8788@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8789 if (ret == 0)
8790 return 0;
8791 }
8792+
8793+ if (!__builtin_constant_p(n))
8794+ check_object_size(to, n, false);
8795+
8796 return __copy_tofrom_user((__force void __user *)to, from, n);
8797 }
8798
8799@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8800 if (ret == 0)
8801 return 0;
8802 }
8803+
8804+ if (!__builtin_constant_p(n))
8805+ check_object_size(from, n, true);
8806+
8807 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8808 }
8809
8810@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8811 return __copy_to_user_inatomic(to, from, size);
8812 }
8813
8814+#ifndef __powerpc64__
8815+
8816+static inline unsigned long __must_check copy_from_user(void *to,
8817+ const void __user *from, unsigned long n)
8818+{
8819+ unsigned long over;
8820+
8821+ if ((long)n < 0)
8822+ return n;
8823+
8824+ if (access_ok(VERIFY_READ, from, n)) {
8825+ if (!__builtin_constant_p(n))
8826+ check_object_size(to, n, false);
8827+ return __copy_tofrom_user((__force void __user *)to, from, n);
8828+ }
8829+ if ((unsigned long)from < TASK_SIZE) {
8830+ over = (unsigned long)from + n - TASK_SIZE;
8831+ if (!__builtin_constant_p(n - over))
8832+ check_object_size(to, n - over, false);
8833+ return __copy_tofrom_user((__force void __user *)to, from,
8834+ n - over) + over;
8835+ }
8836+ return n;
8837+}
8838+
8839+static inline unsigned long __must_check copy_to_user(void __user *to,
8840+ const void *from, unsigned long n)
8841+{
8842+ unsigned long over;
8843+
8844+ if ((long)n < 0)
8845+ return n;
8846+
8847+ if (access_ok(VERIFY_WRITE, to, n)) {
8848+ if (!__builtin_constant_p(n))
8849+ check_object_size(from, n, true);
8850+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8851+ }
8852+ if ((unsigned long)to < TASK_SIZE) {
8853+ over = (unsigned long)to + n - TASK_SIZE;
8854+ if (!__builtin_constant_p(n))
8855+ check_object_size(from, n - over, true);
8856+ return __copy_tofrom_user(to, (__force void __user *)from,
8857+ n - over) + over;
8858+ }
8859+ return n;
8860+}
8861+
8862+#else /* __powerpc64__ */
8863+
8864+#define __copy_in_user(to, from, size) \
8865+ __copy_tofrom_user((to), (from), (size))
8866+
8867+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8868+{
8869+ if ((long)n < 0 || n > INT_MAX)
8870+ return n;
8871+
8872+ if (!__builtin_constant_p(n))
8873+ check_object_size(to, n, false);
8874+
8875+ if (likely(access_ok(VERIFY_READ, from, n)))
8876+ n = __copy_from_user(to, from, n);
8877+ else
8878+ memset(to, 0, n);
8879+ return n;
8880+}
8881+
8882+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8883+{
8884+ if ((long)n < 0 || n > INT_MAX)
8885+ return n;
8886+
8887+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8888+ if (!__builtin_constant_p(n))
8889+ check_object_size(from, n, true);
8890+ n = __copy_to_user(to, from, n);
8891+ }
8892+ return n;
8893+}
8894+
8895+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8896+ unsigned long n);
8897+
8898+#endif /* __powerpc64__ */
8899+
8900 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8901
8902 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8903diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8904index c1ebbda..fd8a98d 100644
8905--- a/arch/powerpc/kernel/Makefile
8906+++ b/arch/powerpc/kernel/Makefile
8907@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8908 CFLAGS_btext.o += -fPIC
8909 endif
8910
8911+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8912+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8913+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8914+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8915+
8916 ifdef CONFIG_FUNCTION_TRACER
8917 # Do not trace early boot code
8918 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8919@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8920 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8921 endif
8922
8923+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8924+
8925 obj-y := cputable.o ptrace.o syscalls.o \
8926 irq.o align.o signal_32.o pmc.o vdso.o \
8927 process.o systbl.o idle.o \
8928diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8929index 3e68d1c..72a5ee6 100644
8930--- a/arch/powerpc/kernel/exceptions-64e.S
8931+++ b/arch/powerpc/kernel/exceptions-64e.S
8932@@ -1010,6 +1010,7 @@ storage_fault_common:
8933 std r14,_DAR(r1)
8934 std r15,_DSISR(r1)
8935 addi r3,r1,STACK_FRAME_OVERHEAD
8936+ bl save_nvgprs
8937 mr r4,r14
8938 mr r5,r15
8939 ld r14,PACA_EXGEN+EX_R14(r13)
8940@@ -1018,8 +1019,7 @@ storage_fault_common:
8941 cmpdi r3,0
8942 bne- 1f
8943 b ret_from_except_lite
8944-1: bl save_nvgprs
8945- mr r5,r3
8946+1: mr r5,r3
8947 addi r3,r1,STACK_FRAME_OVERHEAD
8948 ld r4,_DAR(r1)
8949 bl bad_page_fault
8950diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8951index 9519e6b..13f6c38 100644
8952--- a/arch/powerpc/kernel/exceptions-64s.S
8953+++ b/arch/powerpc/kernel/exceptions-64s.S
8954@@ -1599,10 +1599,10 @@ handle_page_fault:
8955 11: ld r4,_DAR(r1)
8956 ld r5,_DSISR(r1)
8957 addi r3,r1,STACK_FRAME_OVERHEAD
8958+ bl save_nvgprs
8959 bl do_page_fault
8960 cmpdi r3,0
8961 beq+ 12f
8962- bl save_nvgprs
8963 mr r5,r3
8964 addi r3,r1,STACK_FRAME_OVERHEAD
8965 lwz r4,_DAR(r1)
8966diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8967index 4509603..cdb491f 100644
8968--- a/arch/powerpc/kernel/irq.c
8969+++ b/arch/powerpc/kernel/irq.c
8970@@ -460,6 +460,8 @@ void migrate_irqs(void)
8971 }
8972 #endif
8973
8974+extern void gr_handle_kernel_exploit(void);
8975+
8976 static inline void check_stack_overflow(void)
8977 {
8978 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8979@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8980 pr_err("do_IRQ: stack overflow: %ld\n",
8981 sp - sizeof(struct thread_info));
8982 dump_stack();
8983+ gr_handle_kernel_exploit();
8984 }
8985 #endif
8986 }
8987diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8988index c94d2e0..992a9ce 100644
8989--- a/arch/powerpc/kernel/module_32.c
8990+++ b/arch/powerpc/kernel/module_32.c
8991@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8992 me->arch.core_plt_section = i;
8993 }
8994 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8995- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8996+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8997 return -ENOEXEC;
8998 }
8999
9000@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
9001
9002 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
9003 /* Init, or core PLT? */
9004- if (location >= mod->module_core
9005- && location < mod->module_core + mod->core_size)
9006+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
9007+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
9008 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
9009- else
9010+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
9011+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
9012 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
9013+ else {
9014+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
9015+ return ~0UL;
9016+ }
9017
9018 /* Find this entry, or if that fails, the next avail. entry */
9019 while (entry->jump[0]) {
9020@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
9021 }
9022 #ifdef CONFIG_DYNAMIC_FTRACE
9023 module->arch.tramp =
9024- do_plt_call(module->module_core,
9025+ do_plt_call(module->module_core_rx,
9026 (unsigned long)ftrace_caller,
9027 sechdrs, module);
9028 #endif
9029diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
9030index febb50d..bb10020 100644
9031--- a/arch/powerpc/kernel/process.c
9032+++ b/arch/powerpc/kernel/process.c
9033@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
9034 * Lookup NIP late so we have the best change of getting the
9035 * above info out without failing
9036 */
9037- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
9038- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
9039+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
9040+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
9041 #endif
9042 show_stack(current, (unsigned long *) regs->gpr[1]);
9043 if (!user_mode(regs))
9044@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
9045 newsp = stack[0];
9046 ip = stack[STACK_FRAME_LR_SAVE];
9047 if (!firstframe || ip != lr) {
9048- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
9049+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
9050 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
9051 if ((ip == rth) && curr_frame >= 0) {
9052- printk(" (%pS)",
9053+ printk(" (%pA)",
9054 (void *)current->ret_stack[curr_frame].ret);
9055 curr_frame--;
9056 }
9057@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
9058 struct pt_regs *regs = (struct pt_regs *)
9059 (sp + STACK_FRAME_OVERHEAD);
9060 lr = regs->link;
9061- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
9062+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
9063 regs->trap, (void *)regs->nip, (void *)lr);
9064 firstframe = 1;
9065 }
9066@@ -1613,49 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
9067 mtspr(SPRN_CTRLT, ctrl);
9068 }
9069 #endif /* CONFIG_PPC64 */
9070-
9071-unsigned long arch_align_stack(unsigned long sp)
9072-{
9073- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9074- sp -= get_random_int() & ~PAGE_MASK;
9075- return sp & ~0xf;
9076-}
9077-
9078-static inline unsigned long brk_rnd(void)
9079-{
9080- unsigned long rnd = 0;
9081-
9082- /* 8MB for 32bit, 1GB for 64bit */
9083- if (is_32bit_task())
9084- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
9085- else
9086- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
9087-
9088- return rnd << PAGE_SHIFT;
9089-}
9090-
9091-unsigned long arch_randomize_brk(struct mm_struct *mm)
9092-{
9093- unsigned long base = mm->brk;
9094- unsigned long ret;
9095-
9096-#ifdef CONFIG_PPC_STD_MMU_64
9097- /*
9098- * If we are using 1TB segments and we are allowed to randomise
9099- * the heap, we can put it above 1TB so it is backed by a 1TB
9100- * segment. Otherwise the heap will be in the bottom 1TB
9101- * which always uses 256MB segments and this may result in a
9102- * performance penalty.
9103- */
9104- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9105- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9106-#endif
9107-
9108- ret = PAGE_ALIGN(base + brk_rnd());
9109-
9110- if (ret < mm->brk)
9111- return mm->brk;
9112-
9113- return ret;
9114-}
9115-
9116diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9117index f21897b..28c0428 100644
9118--- a/arch/powerpc/kernel/ptrace.c
9119+++ b/arch/powerpc/kernel/ptrace.c
9120@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9121 return ret;
9122 }
9123
9124+#ifdef CONFIG_GRKERNSEC_SETXID
9125+extern void gr_delayed_cred_worker(void);
9126+#endif
9127+
9128 /*
9129 * We must return the syscall number to actually look up in the table.
9130 * This can be -1L to skip running any syscall at all.
9131@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9132
9133 secure_computing_strict(regs->gpr[0]);
9134
9135+#ifdef CONFIG_GRKERNSEC_SETXID
9136+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9137+ gr_delayed_cred_worker();
9138+#endif
9139+
9140 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9141 tracehook_report_syscall_entry(regs))
9142 /*
9143@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9144 {
9145 int step;
9146
9147+#ifdef CONFIG_GRKERNSEC_SETXID
9148+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9149+ gr_delayed_cred_worker();
9150+#endif
9151+
9152 audit_syscall_exit(regs);
9153
9154 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9155diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9156index d3a831a..3a33123 100644
9157--- a/arch/powerpc/kernel/signal_32.c
9158+++ b/arch/powerpc/kernel/signal_32.c
9159@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9160 /* Save user registers on the stack */
9161 frame = &rt_sf->uc.uc_mcontext;
9162 addr = frame;
9163- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9164+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9165 sigret = 0;
9166 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9167 } else {
9168diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9169index c7c24d2..1bf7039 100644
9170--- a/arch/powerpc/kernel/signal_64.c
9171+++ b/arch/powerpc/kernel/signal_64.c
9172@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9173 current->thread.fp_state.fpscr = 0;
9174
9175 /* Set up to return from userspace. */
9176- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9177+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9178 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9179 } else {
9180 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9181diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9182index 19e4744..28a8d7b 100644
9183--- a/arch/powerpc/kernel/traps.c
9184+++ b/arch/powerpc/kernel/traps.c
9185@@ -36,6 +36,7 @@
9186 #include <linux/debugfs.h>
9187 #include <linux/ratelimit.h>
9188 #include <linux/context_tracking.h>
9189+#include <linux/uaccess.h>
9190
9191 #include <asm/emulated_ops.h>
9192 #include <asm/pgtable.h>
9193@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9194 return flags;
9195 }
9196
9197+extern void gr_handle_kernel_exploit(void);
9198+
9199 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9200 int signr)
9201 {
9202@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9203 panic("Fatal exception in interrupt");
9204 if (panic_on_oops)
9205 panic("Fatal exception");
9206+
9207+ gr_handle_kernel_exploit();
9208+
9209 do_exit(signr);
9210 }
9211
9212@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9213 enum ctx_state prev_state = exception_enter();
9214 unsigned int reason = get_reason(regs);
9215
9216+#ifdef CONFIG_PAX_REFCOUNT
9217+ unsigned int bkpt;
9218+ const struct exception_table_entry *entry;
9219+
9220+ if (reason & REASON_ILLEGAL) {
9221+ /* Check if PaX bad instruction */
9222+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9223+ current->thread.trap_nr = 0;
9224+ pax_report_refcount_overflow(regs);
9225+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9226+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9227+ regs->nip = entry->fixup;
9228+ return;
9229+ }
9230+ /* fixup_exception() could not handle */
9231+ goto bail;
9232+ }
9233+ }
9234+#endif
9235+
9236 /* We can now get here via a FP Unavailable exception if the core
9237 * has no FPU, in that case the reason flags will be 0 */
9238
9239diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9240index 305eb0d..accc5b40 100644
9241--- a/arch/powerpc/kernel/vdso.c
9242+++ b/arch/powerpc/kernel/vdso.c
9243@@ -34,6 +34,7 @@
9244 #include <asm/vdso.h>
9245 #include <asm/vdso_datapage.h>
9246 #include <asm/setup.h>
9247+#include <asm/mman.h>
9248
9249 #undef DEBUG
9250
9251@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9252 vdso_base = VDSO32_MBASE;
9253 #endif
9254
9255- current->mm->context.vdso_base = 0;
9256+ current->mm->context.vdso_base = ~0UL;
9257
9258 /* vDSO has a problem and was disabled, just don't "enable" it for the
9259 * process
9260@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9261 vdso_base = get_unmapped_area(NULL, vdso_base,
9262 (vdso_pages << PAGE_SHIFT) +
9263 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9264- 0, 0);
9265+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9266 if (IS_ERR_VALUE(vdso_base)) {
9267 rc = vdso_base;
9268 goto fail_mmapsem;
9269diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9270index ac3ddf1..9a54c76 100644
9271--- a/arch/powerpc/kvm/powerpc.c
9272+++ b/arch/powerpc/kvm/powerpc.c
9273@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9274 }
9275 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9276
9277-int kvm_arch_init(void *opaque)
9278+int kvm_arch_init(const void *opaque)
9279 {
9280 return 0;
9281 }
9282diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9283index 5eea6f3..5d10396 100644
9284--- a/arch/powerpc/lib/usercopy_64.c
9285+++ b/arch/powerpc/lib/usercopy_64.c
9286@@ -9,22 +9,6 @@
9287 #include <linux/module.h>
9288 #include <asm/uaccess.h>
9289
9290-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9291-{
9292- if (likely(access_ok(VERIFY_READ, from, n)))
9293- n = __copy_from_user(to, from, n);
9294- else
9295- memset(to, 0, n);
9296- return n;
9297-}
9298-
9299-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9300-{
9301- if (likely(access_ok(VERIFY_WRITE, to, n)))
9302- n = __copy_to_user(to, from, n);
9303- return n;
9304-}
9305-
9306 unsigned long copy_in_user(void __user *to, const void __user *from,
9307 unsigned long n)
9308 {
9309@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9310 return n;
9311 }
9312
9313-EXPORT_SYMBOL(copy_from_user);
9314-EXPORT_SYMBOL(copy_to_user);
9315 EXPORT_SYMBOL(copy_in_user);
9316
9317diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9318index b396868..3eb6b9f 100644
9319--- a/arch/powerpc/mm/fault.c
9320+++ b/arch/powerpc/mm/fault.c
9321@@ -33,6 +33,10 @@
9322 #include <linux/ratelimit.h>
9323 #include <linux/context_tracking.h>
9324 #include <linux/hugetlb.h>
9325+#include <linux/slab.h>
9326+#include <linux/pagemap.h>
9327+#include <linux/compiler.h>
9328+#include <linux/unistd.h>
9329
9330 #include <asm/firmware.h>
9331 #include <asm/page.h>
9332@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9333 }
9334 #endif
9335
9336+#ifdef CONFIG_PAX_PAGEEXEC
9337+/*
9338+ * PaX: decide what to do with offenders (regs->nip = fault address)
9339+ *
9340+ * returns 1 when task should be killed
9341+ */
9342+static int pax_handle_fetch_fault(struct pt_regs *regs)
9343+{
9344+ return 1;
9345+}
9346+
9347+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9348+{
9349+ unsigned long i;
9350+
9351+ printk(KERN_ERR "PAX: bytes at PC: ");
9352+ for (i = 0; i < 5; i++) {
9353+ unsigned int c;
9354+ if (get_user(c, (unsigned int __user *)pc+i))
9355+ printk(KERN_CONT "???????? ");
9356+ else
9357+ printk(KERN_CONT "%08x ", c);
9358+ }
9359+ printk("\n");
9360+}
9361+#endif
9362+
9363 /*
9364 * Check whether the instruction at regs->nip is a store using
9365 * an update addressing form which will update r1.
9366@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9367 * indicate errors in DSISR but can validly be set in SRR1.
9368 */
9369 if (trap == 0x400)
9370- error_code &= 0x48200000;
9371+ error_code &= 0x58200000;
9372 else
9373 is_write = error_code & DSISR_ISSTORE;
9374 #else
9375@@ -383,12 +414,16 @@ good_area:
9376 * "undefined". Of those that can be set, this is the only
9377 * one which seems bad.
9378 */
9379- if (error_code & 0x10000000)
9380+ if (error_code & DSISR_GUARDED)
9381 /* Guarded storage error. */
9382 goto bad_area;
9383 #endif /* CONFIG_8xx */
9384
9385 if (is_exec) {
9386+#ifdef CONFIG_PPC_STD_MMU
9387+ if (error_code & DSISR_GUARDED)
9388+ goto bad_area;
9389+#endif
9390 /*
9391 * Allow execution from readable areas if the MMU does not
9392 * provide separate controls over reading and executing.
9393@@ -483,6 +518,23 @@ bad_area:
9394 bad_area_nosemaphore:
9395 /* User mode accesses cause a SIGSEGV */
9396 if (user_mode(regs)) {
9397+
9398+#ifdef CONFIG_PAX_PAGEEXEC
9399+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9400+#ifdef CONFIG_PPC_STD_MMU
9401+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9402+#else
9403+ if (is_exec && regs->nip == address) {
9404+#endif
9405+ switch (pax_handle_fetch_fault(regs)) {
9406+ }
9407+
9408+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9409+ do_group_exit(SIGKILL);
9410+ }
9411+ }
9412+#endif
9413+
9414 _exception(SIGSEGV, regs, code, address);
9415 goto bail;
9416 }
9417diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9418index 0f0502e..bc3e7a3 100644
9419--- a/arch/powerpc/mm/mmap.c
9420+++ b/arch/powerpc/mm/mmap.c
9421@@ -86,6 +86,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9422 {
9423 unsigned long random_factor = 0UL;
9424
9425+#ifdef CONFIG_PAX_RANDMMAP
9426+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9427+#endif
9428+
9429 if (current->flags & PF_RANDOMIZE)
9430 random_factor = arch_mmap_rnd();
9431
9432@@ -95,9 +99,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9433 */
9434 if (mmap_is_legacy()) {
9435 mm->mmap_base = TASK_UNMAPPED_BASE;
9436+
9437+#ifdef CONFIG_PAX_RANDMMAP
9438+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9439+ mm->mmap_base += mm->delta_mmap;
9440+#endif
9441+
9442 mm->get_unmapped_area = arch_get_unmapped_area;
9443 } else {
9444 mm->mmap_base = mmap_base(random_factor);
9445+
9446+#ifdef CONFIG_PAX_RANDMMAP
9447+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9448+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9449+#endif
9450+
9451 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9452 }
9453 }
9454diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9455index 0f432a7..abfe841 100644
9456--- a/arch/powerpc/mm/slice.c
9457+++ b/arch/powerpc/mm/slice.c
9458@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9459 if ((mm->task_size - len) < addr)
9460 return 0;
9461 vma = find_vma(mm, addr);
9462- return (!vma || (addr + len) <= vma->vm_start);
9463+ return check_heap_stack_gap(vma, addr, len, 0);
9464 }
9465
9466 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9467@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9468 info.align_offset = 0;
9469
9470 addr = TASK_UNMAPPED_BASE;
9471+
9472+#ifdef CONFIG_PAX_RANDMMAP
9473+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9474+ addr += mm->delta_mmap;
9475+#endif
9476+
9477 while (addr < TASK_SIZE) {
9478 info.low_limit = addr;
9479 if (!slice_scan_available(addr, available, 1, &addr))
9480@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9481 if (fixed && addr > (mm->task_size - len))
9482 return -ENOMEM;
9483
9484+#ifdef CONFIG_PAX_RANDMMAP
9485+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9486+ addr = 0;
9487+#endif
9488+
9489 /* If hint, make sure it matches our alignment restrictions */
9490 if (!fixed && addr) {
9491 addr = _ALIGN_UP(addr, 1ul << pshift);
9492diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9493index d966bbe..372124a 100644
9494--- a/arch/powerpc/platforms/cell/spufs/file.c
9495+++ b/arch/powerpc/platforms/cell/spufs/file.c
9496@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9497 return VM_FAULT_NOPAGE;
9498 }
9499
9500-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9501+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9502 unsigned long address,
9503- void *buf, int len, int write)
9504+ void *buf, size_t len, int write)
9505 {
9506 struct spu_context *ctx = vma->vm_file->private_data;
9507 unsigned long offset = address - vma->vm_start;
9508diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9509index adbe380..adb7516 100644
9510--- a/arch/s390/include/asm/atomic.h
9511+++ b/arch/s390/include/asm/atomic.h
9512@@ -317,4 +317,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9513 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9514 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9515
9516+#define atomic64_read_unchecked(v) atomic64_read(v)
9517+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9518+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9519+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9520+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9521+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9522+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9523+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9524+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9525+
9526 #endif /* __ARCH_S390_ATOMIC__ */
9527diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9528index 8d72471..5322500 100644
9529--- a/arch/s390/include/asm/barrier.h
9530+++ b/arch/s390/include/asm/barrier.h
9531@@ -42,7 +42,7 @@
9532 do { \
9533 compiletime_assert_atomic_type(*p); \
9534 barrier(); \
9535- ACCESS_ONCE(*p) = (v); \
9536+ ACCESS_ONCE_RW(*p) = (v); \
9537 } while (0)
9538
9539 #define smp_load_acquire(p) \
9540diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9541index 4d7ccac..d03d0ad 100644
9542--- a/arch/s390/include/asm/cache.h
9543+++ b/arch/s390/include/asm/cache.h
9544@@ -9,8 +9,10 @@
9545 #ifndef __ARCH_S390_CACHE_H
9546 #define __ARCH_S390_CACHE_H
9547
9548-#define L1_CACHE_BYTES 256
9549+#include <linux/const.h>
9550+
9551 #define L1_CACHE_SHIFT 8
9552+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9553 #define NET_SKB_PAD 32
9554
9555 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9556diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9557index 3ad48f2..64cc6f3 100644
9558--- a/arch/s390/include/asm/elf.h
9559+++ b/arch/s390/include/asm/elf.h
9560@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
9561 (STACK_TOP / 3 * 2) : \
9562 (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
9563
9564+#ifdef CONFIG_PAX_ASLR
9565+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9566+
9567+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9568+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9569+#endif
9570+
9571 /* This yields a mask that user programs can use to figure out what
9572 instruction set this CPU supports. */
9573
9574diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9575index c4a93d6..4d2a9b4 100644
9576--- a/arch/s390/include/asm/exec.h
9577+++ b/arch/s390/include/asm/exec.h
9578@@ -7,6 +7,6 @@
9579 #ifndef __ASM_EXEC_H
9580 #define __ASM_EXEC_H
9581
9582-extern unsigned long arch_align_stack(unsigned long sp);
9583+#define arch_align_stack(x) ((x) & ~0xfUL)
9584
9585 #endif /* __ASM_EXEC_H */
9586diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9587index d64a7a6..0830329 100644
9588--- a/arch/s390/include/asm/uaccess.h
9589+++ b/arch/s390/include/asm/uaccess.h
9590@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9591 __range_ok((unsigned long)(addr), (size)); \
9592 })
9593
9594+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9595 #define access_ok(type, addr, size) __access_ok(addr, size)
9596
9597 /*
9598@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9599 copy_to_user(void __user *to, const void *from, unsigned long n)
9600 {
9601 might_fault();
9602+
9603+ if ((long)n < 0)
9604+ return n;
9605+
9606 return __copy_to_user(to, from, n);
9607 }
9608
9609@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9610 static inline unsigned long __must_check
9611 copy_from_user(void *to, const void __user *from, unsigned long n)
9612 {
9613- unsigned int sz = __compiletime_object_size(to);
9614+ size_t sz = __compiletime_object_size(to);
9615
9616 might_fault();
9617- if (unlikely(sz != -1 && sz < n)) {
9618+
9619+ if ((long)n < 0)
9620+ return n;
9621+
9622+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9623 copy_from_user_overflow();
9624 return n;
9625 }
9626diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9627index 0c1a679..e1df357 100644
9628--- a/arch/s390/kernel/module.c
9629+++ b/arch/s390/kernel/module.c
9630@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9631
9632 /* Increase core size by size of got & plt and set start
9633 offsets for got and plt. */
9634- me->core_size = ALIGN(me->core_size, 4);
9635- me->arch.got_offset = me->core_size;
9636- me->core_size += me->arch.got_size;
9637- me->arch.plt_offset = me->core_size;
9638- me->core_size += me->arch.plt_size;
9639+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9640+ me->arch.got_offset = me->core_size_rw;
9641+ me->core_size_rw += me->arch.got_size;
9642+ me->arch.plt_offset = me->core_size_rx;
9643+ me->core_size_rx += me->arch.plt_size;
9644 return 0;
9645 }
9646
9647@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9648 if (info->got_initialized == 0) {
9649 Elf_Addr *gotent;
9650
9651- gotent = me->module_core + me->arch.got_offset +
9652+ gotent = me->module_core_rw + me->arch.got_offset +
9653 info->got_offset;
9654 *gotent = val;
9655 info->got_initialized = 1;
9656@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9657 rc = apply_rela_bits(loc, val, 0, 64, 0);
9658 else if (r_type == R_390_GOTENT ||
9659 r_type == R_390_GOTPLTENT) {
9660- val += (Elf_Addr) me->module_core - loc;
9661+ val += (Elf_Addr) me->module_core_rw - loc;
9662 rc = apply_rela_bits(loc, val, 1, 32, 1);
9663 }
9664 break;
9665@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9666 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9667 if (info->plt_initialized == 0) {
9668 unsigned int *ip;
9669- ip = me->module_core + me->arch.plt_offset +
9670+ ip = me->module_core_rx + me->arch.plt_offset +
9671 info->plt_offset;
9672 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
9673 ip[1] = 0x100a0004;
9674@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9675 val - loc + 0xffffUL < 0x1ffffeUL) ||
9676 (r_type == R_390_PLT32DBL &&
9677 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9678- val = (Elf_Addr) me->module_core +
9679+ val = (Elf_Addr) me->module_core_rx +
9680 me->arch.plt_offset +
9681 info->plt_offset;
9682 val += rela->r_addend - loc;
9683@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9684 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9685 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9686 val = val + rela->r_addend -
9687- ((Elf_Addr) me->module_core + me->arch.got_offset);
9688+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9689 if (r_type == R_390_GOTOFF16)
9690 rc = apply_rela_bits(loc, val, 0, 16, 0);
9691 else if (r_type == R_390_GOTOFF32)
9692@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9693 break;
9694 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9695 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9696- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9697+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9698 rela->r_addend - loc;
9699 if (r_type == R_390_GOTPC)
9700 rc = apply_rela_bits(loc, val, 1, 32, 0);
9701diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9702index dc5edc2..7d34ae3 100644
9703--- a/arch/s390/kernel/process.c
9704+++ b/arch/s390/kernel/process.c
9705@@ -200,27 +200,3 @@ unsigned long get_wchan(struct task_struct *p)
9706 }
9707 return 0;
9708 }
9709-
9710-unsigned long arch_align_stack(unsigned long sp)
9711-{
9712- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9713- sp -= get_random_int() & ~PAGE_MASK;
9714- return sp & ~0xf;
9715-}
9716-
9717-static inline unsigned long brk_rnd(void)
9718-{
9719- /* 8MB for 32bit, 1GB for 64bit */
9720- if (is_32bit_task())
9721- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9722- else
9723- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9724-}
9725-
9726-unsigned long arch_randomize_brk(struct mm_struct *mm)
9727-{
9728- unsigned long ret;
9729-
9730- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9731- return (ret > mm->brk) ? ret : mm->brk;
9732-}
9733diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9734index 6e552af..3e608a1 100644
9735--- a/arch/s390/mm/mmap.c
9736+++ b/arch/s390/mm/mmap.c
9737@@ -239,6 +239,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9738 {
9739 unsigned long random_factor = 0UL;
9740
9741+#ifdef CONFIG_PAX_RANDMMAP
9742+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9743+#endif
9744+
9745 if (current->flags & PF_RANDOMIZE)
9746 random_factor = arch_mmap_rnd();
9747
9748@@ -248,9 +252,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9749 */
9750 if (mmap_is_legacy()) {
9751 mm->mmap_base = mmap_base_legacy(random_factor);
9752+
9753+#ifdef CONFIG_PAX_RANDMMAP
9754+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9755+ mm->mmap_base += mm->delta_mmap;
9756+#endif
9757+
9758 mm->get_unmapped_area = s390_get_unmapped_area;
9759 } else {
9760 mm->mmap_base = mmap_base(random_factor);
9761+
9762+#ifdef CONFIG_PAX_RANDMMAP
9763+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9764+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9765+#endif
9766+
9767 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9768 }
9769 }
9770diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9771index ae3d59f..f65f075 100644
9772--- a/arch/score/include/asm/cache.h
9773+++ b/arch/score/include/asm/cache.h
9774@@ -1,7 +1,9 @@
9775 #ifndef _ASM_SCORE_CACHE_H
9776 #define _ASM_SCORE_CACHE_H
9777
9778+#include <linux/const.h>
9779+
9780 #define L1_CACHE_SHIFT 4
9781-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9782+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9783
9784 #endif /* _ASM_SCORE_CACHE_H */
9785diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9786index f9f3cd5..58ff438 100644
9787--- a/arch/score/include/asm/exec.h
9788+++ b/arch/score/include/asm/exec.h
9789@@ -1,6 +1,6 @@
9790 #ifndef _ASM_SCORE_EXEC_H
9791 #define _ASM_SCORE_EXEC_H
9792
9793-extern unsigned long arch_align_stack(unsigned long sp);
9794+#define arch_align_stack(x) (x)
9795
9796 #endif /* _ASM_SCORE_EXEC_H */
9797diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9798index a1519ad3..e8ac1ff 100644
9799--- a/arch/score/kernel/process.c
9800+++ b/arch/score/kernel/process.c
9801@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9802
9803 return task_pt_regs(task)->cp0_epc;
9804 }
9805-
9806-unsigned long arch_align_stack(unsigned long sp)
9807-{
9808- return sp;
9809-}
9810diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9811index ef9e555..331bd29 100644
9812--- a/arch/sh/include/asm/cache.h
9813+++ b/arch/sh/include/asm/cache.h
9814@@ -9,10 +9,11 @@
9815 #define __ASM_SH_CACHE_H
9816 #ifdef __KERNEL__
9817
9818+#include <linux/const.h>
9819 #include <linux/init.h>
9820 #include <cpu/cache.h>
9821
9822-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9823+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9824
9825 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9826
9827diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9828index 6777177..cb5e44f 100644
9829--- a/arch/sh/mm/mmap.c
9830+++ b/arch/sh/mm/mmap.c
9831@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9832 struct mm_struct *mm = current->mm;
9833 struct vm_area_struct *vma;
9834 int do_colour_align;
9835+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9836 struct vm_unmapped_area_info info;
9837
9838 if (flags & MAP_FIXED) {
9839@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9840 if (filp || (flags & MAP_SHARED))
9841 do_colour_align = 1;
9842
9843+#ifdef CONFIG_PAX_RANDMMAP
9844+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9845+#endif
9846+
9847 if (addr) {
9848 if (do_colour_align)
9849 addr = COLOUR_ALIGN(addr, pgoff);
9850@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9851 addr = PAGE_ALIGN(addr);
9852
9853 vma = find_vma(mm, addr);
9854- if (TASK_SIZE - len >= addr &&
9855- (!vma || addr + len <= vma->vm_start))
9856+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9857 return addr;
9858 }
9859
9860 info.flags = 0;
9861 info.length = len;
9862- info.low_limit = TASK_UNMAPPED_BASE;
9863+ info.low_limit = mm->mmap_base;
9864 info.high_limit = TASK_SIZE;
9865 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9866 info.align_offset = pgoff << PAGE_SHIFT;
9867@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9868 struct mm_struct *mm = current->mm;
9869 unsigned long addr = addr0;
9870 int do_colour_align;
9871+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9872 struct vm_unmapped_area_info info;
9873
9874 if (flags & MAP_FIXED) {
9875@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9876 if (filp || (flags & MAP_SHARED))
9877 do_colour_align = 1;
9878
9879+#ifdef CONFIG_PAX_RANDMMAP
9880+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9881+#endif
9882+
9883 /* requesting a specific address */
9884 if (addr) {
9885 if (do_colour_align)
9886@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9887 addr = PAGE_ALIGN(addr);
9888
9889 vma = find_vma(mm, addr);
9890- if (TASK_SIZE - len >= addr &&
9891- (!vma || addr + len <= vma->vm_start))
9892+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9893 return addr;
9894 }
9895
9896@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9897 VM_BUG_ON(addr != -ENOMEM);
9898 info.flags = 0;
9899 info.low_limit = TASK_UNMAPPED_BASE;
9900+
9901+#ifdef CONFIG_PAX_RANDMMAP
9902+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9903+ info.low_limit += mm->delta_mmap;
9904+#endif
9905+
9906 info.high_limit = TASK_SIZE;
9907 addr = vm_unmapped_area(&info);
9908 }
9909diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9910index 4082749..fd97781 100644
9911--- a/arch/sparc/include/asm/atomic_64.h
9912+++ b/arch/sparc/include/asm/atomic_64.h
9913@@ -15,18 +15,38 @@
9914 #define ATOMIC64_INIT(i) { (i) }
9915
9916 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9917+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9918+{
9919+ return ACCESS_ONCE(v->counter);
9920+}
9921 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9922+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9923+{
9924+ return ACCESS_ONCE(v->counter);
9925+}
9926
9927 #define atomic_set(v, i) (((v)->counter) = i)
9928+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9929+{
9930+ v->counter = i;
9931+}
9932 #define atomic64_set(v, i) (((v)->counter) = i)
9933+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9934+{
9935+ v->counter = i;
9936+}
9937
9938-#define ATOMIC_OP(op) \
9939-void atomic_##op(int, atomic_t *); \
9940-void atomic64_##op(long, atomic64_t *);
9941+#define __ATOMIC_OP(op, suffix) \
9942+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9943+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9944
9945-#define ATOMIC_OP_RETURN(op) \
9946-int atomic_##op##_return(int, atomic_t *); \
9947-long atomic64_##op##_return(long, atomic64_t *);
9948+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9949+
9950+#define __ATOMIC_OP_RETURN(op, suffix) \
9951+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9952+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9953+
9954+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9955
9956 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9957
9958@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9959
9960 #undef ATOMIC_OPS
9961 #undef ATOMIC_OP_RETURN
9962+#undef __ATOMIC_OP_RETURN
9963 #undef ATOMIC_OP
9964+#undef __ATOMIC_OP
9965
9966 #define atomic_dec_return(v) atomic_sub_return(1, v)
9967 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9968
9969 #define atomic_inc_return(v) atomic_add_return(1, v)
9970+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9971+{
9972+ return atomic_add_return_unchecked(1, v);
9973+}
9974 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9975+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9976+{
9977+ return atomic64_add_return_unchecked(1, v);
9978+}
9979
9980 /*
9981 * atomic_inc_and_test - increment and test
9982@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9983 * other cases.
9984 */
9985 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9986+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9987+{
9988+ return atomic_inc_return_unchecked(v) == 0;
9989+}
9990 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9991
9992 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9993@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9994 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9995
9996 #define atomic_inc(v) atomic_add(1, v)
9997+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9998+{
9999+ atomic_add_unchecked(1, v);
10000+}
10001 #define atomic64_inc(v) atomic64_add(1, v)
10002+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
10003+{
10004+ atomic64_add_unchecked(1, v);
10005+}
10006
10007 #define atomic_dec(v) atomic_sub(1, v)
10008+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10009+{
10010+ atomic_sub_unchecked(1, v);
10011+}
10012 #define atomic64_dec(v) atomic64_sub(1, v)
10013+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10014+{
10015+ atomic64_sub_unchecked(1, v);
10016+}
10017
10018 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10019 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10020
10021 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10022+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10023+{
10024+ return cmpxchg(&v->counter, old, new);
10025+}
10026 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10027+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10028+{
10029+ return xchg(&v->counter, new);
10030+}
10031
10032 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10033 {
10034- int c, old;
10035+ int c, old, new;
10036 c = atomic_read(v);
10037 for (;;) {
10038- if (unlikely(c == (u)))
10039+ if (unlikely(c == u))
10040 break;
10041- old = atomic_cmpxchg((v), c, c + (a));
10042+
10043+ asm volatile("addcc %2, %0, %0\n"
10044+
10045+#ifdef CONFIG_PAX_REFCOUNT
10046+ "tvs %%icc, 6\n"
10047+#endif
10048+
10049+ : "=r" (new)
10050+ : "0" (c), "ir" (a)
10051+ : "cc");
10052+
10053+ old = atomic_cmpxchg(v, c, new);
10054 if (likely(old == c))
10055 break;
10056 c = old;
10057@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10058 #define atomic64_cmpxchg(v, o, n) \
10059 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10060 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10061+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10062+{
10063+ return xchg(&v->counter, new);
10064+}
10065
10066 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10067 {
10068- long c, old;
10069+ long c, old, new;
10070 c = atomic64_read(v);
10071 for (;;) {
10072- if (unlikely(c == (u)))
10073+ if (unlikely(c == u))
10074 break;
10075- old = atomic64_cmpxchg((v), c, c + (a));
10076+
10077+ asm volatile("addcc %2, %0, %0\n"
10078+
10079+#ifdef CONFIG_PAX_REFCOUNT
10080+ "tvs %%xcc, 6\n"
10081+#endif
10082+
10083+ : "=r" (new)
10084+ : "0" (c), "ir" (a)
10085+ : "cc");
10086+
10087+ old = atomic64_cmpxchg(v, c, new);
10088 if (likely(old == c))
10089 break;
10090 c = old;
10091 }
10092- return c != (u);
10093+ return c != u;
10094 }
10095
10096 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10097diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10098index 7664894..45a974b 100644
10099--- a/arch/sparc/include/asm/barrier_64.h
10100+++ b/arch/sparc/include/asm/barrier_64.h
10101@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10102 do { \
10103 compiletime_assert_atomic_type(*p); \
10104 barrier(); \
10105- ACCESS_ONCE(*p) = (v); \
10106+ ACCESS_ONCE_RW(*p) = (v); \
10107 } while (0)
10108
10109 #define smp_load_acquire(p) \
10110diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10111index 5bb6991..5c2132e 100644
10112--- a/arch/sparc/include/asm/cache.h
10113+++ b/arch/sparc/include/asm/cache.h
10114@@ -7,10 +7,12 @@
10115 #ifndef _SPARC_CACHE_H
10116 #define _SPARC_CACHE_H
10117
10118+#include <linux/const.h>
10119+
10120 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10121
10122 #define L1_CACHE_SHIFT 5
10123-#define L1_CACHE_BYTES 32
10124+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10125
10126 #ifdef CONFIG_SPARC32
10127 #define SMP_CACHE_BYTES_SHIFT 5
10128diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10129index a24e41f..47677ff 100644
10130--- a/arch/sparc/include/asm/elf_32.h
10131+++ b/arch/sparc/include/asm/elf_32.h
10132@@ -114,6 +114,13 @@ typedef struct {
10133
10134 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10135
10136+#ifdef CONFIG_PAX_ASLR
10137+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10138+
10139+#define PAX_DELTA_MMAP_LEN 16
10140+#define PAX_DELTA_STACK_LEN 16
10141+#endif
10142+
10143 /* This yields a mask that user programs can use to figure out what
10144 instruction set this cpu supports. This can NOT be done in userspace
10145 on Sparc. */
10146diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10147index 370ca1e..d4f4a98 100644
10148--- a/arch/sparc/include/asm/elf_64.h
10149+++ b/arch/sparc/include/asm/elf_64.h
10150@@ -189,6 +189,13 @@ typedef struct {
10151 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10152 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10153
10154+#ifdef CONFIG_PAX_ASLR
10155+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10156+
10157+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10158+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10159+#endif
10160+
10161 extern unsigned long sparc64_elf_hwcap;
10162 #define ELF_HWCAP sparc64_elf_hwcap
10163
10164diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10165index a3890da..f6a408e 100644
10166--- a/arch/sparc/include/asm/pgalloc_32.h
10167+++ b/arch/sparc/include/asm/pgalloc_32.h
10168@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10169 }
10170
10171 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10172+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10173
10174 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10175 unsigned long address)
10176diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10177index 5e31871..13469c6 100644
10178--- a/arch/sparc/include/asm/pgalloc_64.h
10179+++ b/arch/sparc/include/asm/pgalloc_64.h
10180@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10181 }
10182
10183 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10184+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10185
10186 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10187 {
10188@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10189 }
10190
10191 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10192+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10193
10194 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10195 {
10196diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10197index 59ba6f6..4518128 100644
10198--- a/arch/sparc/include/asm/pgtable.h
10199+++ b/arch/sparc/include/asm/pgtable.h
10200@@ -5,4 +5,8 @@
10201 #else
10202 #include <asm/pgtable_32.h>
10203 #endif
10204+
10205+#define ktla_ktva(addr) (addr)
10206+#define ktva_ktla(addr) (addr)
10207+
10208 #endif
10209diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10210index f06b36a..bca3189 100644
10211--- a/arch/sparc/include/asm/pgtable_32.h
10212+++ b/arch/sparc/include/asm/pgtable_32.h
10213@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10214 #define PAGE_SHARED SRMMU_PAGE_SHARED
10215 #define PAGE_COPY SRMMU_PAGE_COPY
10216 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10217+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10218+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10219+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10220 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10221
10222 /* Top-level page directory - dummy used by init-mm.
10223@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10224
10225 /* xwr */
10226 #define __P000 PAGE_NONE
10227-#define __P001 PAGE_READONLY
10228-#define __P010 PAGE_COPY
10229-#define __P011 PAGE_COPY
10230+#define __P001 PAGE_READONLY_NOEXEC
10231+#define __P010 PAGE_COPY_NOEXEC
10232+#define __P011 PAGE_COPY_NOEXEC
10233 #define __P100 PAGE_READONLY
10234 #define __P101 PAGE_READONLY
10235 #define __P110 PAGE_COPY
10236 #define __P111 PAGE_COPY
10237
10238 #define __S000 PAGE_NONE
10239-#define __S001 PAGE_READONLY
10240-#define __S010 PAGE_SHARED
10241-#define __S011 PAGE_SHARED
10242+#define __S001 PAGE_READONLY_NOEXEC
10243+#define __S010 PAGE_SHARED_NOEXEC
10244+#define __S011 PAGE_SHARED_NOEXEC
10245 #define __S100 PAGE_READONLY
10246 #define __S101 PAGE_READONLY
10247 #define __S110 PAGE_SHARED
10248diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10249index ae51a11..eadfd03 100644
10250--- a/arch/sparc/include/asm/pgtsrmmu.h
10251+++ b/arch/sparc/include/asm/pgtsrmmu.h
10252@@ -111,6 +111,11 @@
10253 SRMMU_EXEC | SRMMU_REF)
10254 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10255 SRMMU_EXEC | SRMMU_REF)
10256+
10257+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10258+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10259+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10260+
10261 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10262 SRMMU_DIRTY | SRMMU_REF)
10263
10264diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10265index 29d64b1..4272fe8 100644
10266--- a/arch/sparc/include/asm/setup.h
10267+++ b/arch/sparc/include/asm/setup.h
10268@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10269 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10270
10271 /* init_64.c */
10272-extern atomic_t dcpage_flushes;
10273-extern atomic_t dcpage_flushes_xcall;
10274+extern atomic_unchecked_t dcpage_flushes;
10275+extern atomic_unchecked_t dcpage_flushes_xcall;
10276
10277 extern int sysctl_tsb_ratio;
10278 #endif
10279diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10280index 9689176..63c18ea 100644
10281--- a/arch/sparc/include/asm/spinlock_64.h
10282+++ b/arch/sparc/include/asm/spinlock_64.h
10283@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10284
10285 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10286
10287-static void inline arch_read_lock(arch_rwlock_t *lock)
10288+static inline void arch_read_lock(arch_rwlock_t *lock)
10289 {
10290 unsigned long tmp1, tmp2;
10291
10292 __asm__ __volatile__ (
10293 "1: ldsw [%2], %0\n"
10294 " brlz,pn %0, 2f\n"
10295-"4: add %0, 1, %1\n"
10296+"4: addcc %0, 1, %1\n"
10297+
10298+#ifdef CONFIG_PAX_REFCOUNT
10299+" tvs %%icc, 6\n"
10300+#endif
10301+
10302 " cas [%2], %0, %1\n"
10303 " cmp %0, %1\n"
10304 " bne,pn %%icc, 1b\n"
10305@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10306 " .previous"
10307 : "=&r" (tmp1), "=&r" (tmp2)
10308 : "r" (lock)
10309- : "memory");
10310+ : "memory", "cc");
10311 }
10312
10313-static int inline arch_read_trylock(arch_rwlock_t *lock)
10314+static inline int arch_read_trylock(arch_rwlock_t *lock)
10315 {
10316 int tmp1, tmp2;
10317
10318@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10319 "1: ldsw [%2], %0\n"
10320 " brlz,a,pn %0, 2f\n"
10321 " mov 0, %0\n"
10322-" add %0, 1, %1\n"
10323+" addcc %0, 1, %1\n"
10324+
10325+#ifdef CONFIG_PAX_REFCOUNT
10326+" tvs %%icc, 6\n"
10327+#endif
10328+
10329 " cas [%2], %0, %1\n"
10330 " cmp %0, %1\n"
10331 " bne,pn %%icc, 1b\n"
10332@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10333 return tmp1;
10334 }
10335
10336-static void inline arch_read_unlock(arch_rwlock_t *lock)
10337+static inline void arch_read_unlock(arch_rwlock_t *lock)
10338 {
10339 unsigned long tmp1, tmp2;
10340
10341 __asm__ __volatile__(
10342 "1: lduw [%2], %0\n"
10343-" sub %0, 1, %1\n"
10344+" subcc %0, 1, %1\n"
10345+
10346+#ifdef CONFIG_PAX_REFCOUNT
10347+" tvs %%icc, 6\n"
10348+#endif
10349+
10350 " cas [%2], %0, %1\n"
10351 " cmp %0, %1\n"
10352 " bne,pn %%xcc, 1b\n"
10353@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10354 : "memory");
10355 }
10356
10357-static void inline arch_write_lock(arch_rwlock_t *lock)
10358+static inline void arch_write_lock(arch_rwlock_t *lock)
10359 {
10360 unsigned long mask, tmp1, tmp2;
10361
10362@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10363 : "memory");
10364 }
10365
10366-static void inline arch_write_unlock(arch_rwlock_t *lock)
10367+static inline void arch_write_unlock(arch_rwlock_t *lock)
10368 {
10369 __asm__ __volatile__(
10370 " stw %%g0, [%0]"
10371@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10372 : "memory");
10373 }
10374
10375-static int inline arch_write_trylock(arch_rwlock_t *lock)
10376+static inline int arch_write_trylock(arch_rwlock_t *lock)
10377 {
10378 unsigned long mask, tmp1, tmp2, result;
10379
10380diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10381index 229475f..2fca9163 100644
10382--- a/arch/sparc/include/asm/thread_info_32.h
10383+++ b/arch/sparc/include/asm/thread_info_32.h
10384@@ -48,6 +48,7 @@ struct thread_info {
10385 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10386 unsigned long rwbuf_stkptrs[NSWINS];
10387 unsigned long w_saved;
10388+ unsigned long lowest_stack;
10389 };
10390
10391 /*
10392diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10393index bde5982..9cbb56d 100644
10394--- a/arch/sparc/include/asm/thread_info_64.h
10395+++ b/arch/sparc/include/asm/thread_info_64.h
10396@@ -59,6 +59,8 @@ struct thread_info {
10397 struct pt_regs *kern_una_regs;
10398 unsigned int kern_una_insn;
10399
10400+ unsigned long lowest_stack;
10401+
10402 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10403 __attribute__ ((aligned(64)));
10404 };
10405@@ -180,12 +182,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10406 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10407 /* flag bit 4 is available */
10408 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10409-/* flag bit 6 is available */
10410+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10411 #define TIF_32BIT 7 /* 32-bit binary */
10412 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10413 #define TIF_SECCOMP 9 /* secure computing */
10414 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10415 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10416+
10417 /* NOTE: Thread flags >= 12 should be ones we have no interest
10418 * in using in assembly, else we can't use the mask as
10419 * an immediate value in instructions such as andcc.
10420@@ -205,12 +208,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10421 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10422 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10423 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10424+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10425
10426 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10427 _TIF_DO_NOTIFY_RESUME_MASK | \
10428 _TIF_NEED_RESCHED)
10429 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10430
10431+#define _TIF_WORK_SYSCALL \
10432+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10433+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10434+
10435 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10436
10437 /*
10438diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10439index bd56c28..4b63d83 100644
10440--- a/arch/sparc/include/asm/uaccess.h
10441+++ b/arch/sparc/include/asm/uaccess.h
10442@@ -1,5 +1,6 @@
10443 #ifndef ___ASM_SPARC_UACCESS_H
10444 #define ___ASM_SPARC_UACCESS_H
10445+
10446 #if defined(__sparc__) && defined(__arch64__)
10447 #include <asm/uaccess_64.h>
10448 #else
10449diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10450index 64ee103..388aef0 100644
10451--- a/arch/sparc/include/asm/uaccess_32.h
10452+++ b/arch/sparc/include/asm/uaccess_32.h
10453@@ -47,6 +47,7 @@
10454 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10455 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10456 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10457+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10458 #define access_ok(type, addr, size) \
10459 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10460
10461@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10462
10463 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10464 {
10465- if (n && __access_ok((unsigned long) to, n))
10466+ if ((long)n < 0)
10467+ return n;
10468+
10469+ if (n && __access_ok((unsigned long) to, n)) {
10470+ if (!__builtin_constant_p(n))
10471+ check_object_size(from, n, true);
10472 return __copy_user(to, (__force void __user *) from, n);
10473- else
10474+ } else
10475 return n;
10476 }
10477
10478 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10479 {
10480+ if ((long)n < 0)
10481+ return n;
10482+
10483+ if (!__builtin_constant_p(n))
10484+ check_object_size(from, n, true);
10485+
10486 return __copy_user(to, (__force void __user *) from, n);
10487 }
10488
10489 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10490 {
10491- if (n && __access_ok((unsigned long) from, n))
10492+ if ((long)n < 0)
10493+ return n;
10494+
10495+ if (n && __access_ok((unsigned long) from, n)) {
10496+ if (!__builtin_constant_p(n))
10497+ check_object_size(to, n, false);
10498 return __copy_user((__force void __user *) to, from, n);
10499- else
10500+ } else
10501 return n;
10502 }
10503
10504 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10505 {
10506+ if ((long)n < 0)
10507+ return n;
10508+
10509 return __copy_user((__force void __user *) to, from, n);
10510 }
10511
10512diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10513index a35194b..47dabc0d 100644
10514--- a/arch/sparc/include/asm/uaccess_64.h
10515+++ b/arch/sparc/include/asm/uaccess_64.h
10516@@ -10,6 +10,7 @@
10517 #include <linux/compiler.h>
10518 #include <linux/string.h>
10519 #include <linux/thread_info.h>
10520+#include <linux/kernel.h>
10521 #include <asm/asi.h>
10522 #include <asm/spitfire.h>
10523 #include <asm-generic/uaccess-unaligned.h>
10524@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10525 return 1;
10526 }
10527
10528+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10529+{
10530+ return 1;
10531+}
10532+
10533 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10534 {
10535 return 1;
10536@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10537 static inline unsigned long __must_check
10538 copy_from_user(void *to, const void __user *from, unsigned long size)
10539 {
10540- unsigned long ret = ___copy_from_user(to, from, size);
10541+ unsigned long ret;
10542
10543+ if ((long)size < 0 || size > INT_MAX)
10544+ return size;
10545+
10546+ if (!__builtin_constant_p(size))
10547+ check_object_size(to, size, false);
10548+
10549+ ret = ___copy_from_user(to, from, size);
10550 if (unlikely(ret))
10551 ret = copy_from_user_fixup(to, from, size);
10552
10553@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10554 static inline unsigned long __must_check
10555 copy_to_user(void __user *to, const void *from, unsigned long size)
10556 {
10557- unsigned long ret = ___copy_to_user(to, from, size);
10558+ unsigned long ret;
10559
10560+ if ((long)size < 0 || size > INT_MAX)
10561+ return size;
10562+
10563+ if (!__builtin_constant_p(size))
10564+ check_object_size(from, size, true);
10565+
10566+ ret = ___copy_to_user(to, from, size);
10567 if (unlikely(ret))
10568 ret = copy_to_user_fixup(to, from, size);
10569 return ret;
10570diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10571index 7cf9c6e..6206648 100644
10572--- a/arch/sparc/kernel/Makefile
10573+++ b/arch/sparc/kernel/Makefile
10574@@ -4,7 +4,7 @@
10575 #
10576
10577 asflags-y := -ansi
10578-ccflags-y := -Werror
10579+#ccflags-y := -Werror
10580
10581 extra-y := head_$(BITS).o
10582
10583diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10584index 50e7b62..79fae35 100644
10585--- a/arch/sparc/kernel/process_32.c
10586+++ b/arch/sparc/kernel/process_32.c
10587@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10588
10589 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10590 r->psr, r->pc, r->npc, r->y, print_tainted());
10591- printk("PC: <%pS>\n", (void *) r->pc);
10592+ printk("PC: <%pA>\n", (void *) r->pc);
10593 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10594 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10595 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10596 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10597 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10598 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10599- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10600+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10601
10602 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10603 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10604@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10605 rw = (struct reg_window32 *) fp;
10606 pc = rw->ins[7];
10607 printk("[%08lx : ", pc);
10608- printk("%pS ] ", (void *) pc);
10609+ printk("%pA ] ", (void *) pc);
10610 fp = rw->ins[6];
10611 } while (++count < 16);
10612 printk("\n");
10613diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10614index 46a5964..a35c62c 100644
10615--- a/arch/sparc/kernel/process_64.c
10616+++ b/arch/sparc/kernel/process_64.c
10617@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10618 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10619 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10620 if (regs->tstate & TSTATE_PRIV)
10621- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10622+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10623 }
10624
10625 void show_regs(struct pt_regs *regs)
10626@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10627
10628 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10629 regs->tpc, regs->tnpc, regs->y, print_tainted());
10630- printk("TPC: <%pS>\n", (void *) regs->tpc);
10631+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10632 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10633 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10634 regs->u_regs[3]);
10635@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10636 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10637 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10638 regs->u_regs[15]);
10639- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10640+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10641 show_regwindow(regs);
10642 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10643 }
10644@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10645 ((tp && tp->task) ? tp->task->pid : -1));
10646
10647 if (gp->tstate & TSTATE_PRIV) {
10648- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10649+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10650 (void *) gp->tpc,
10651 (void *) gp->o7,
10652 (void *) gp->i7,
10653diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10654index 79cc0d1..ec62734 100644
10655--- a/arch/sparc/kernel/prom_common.c
10656+++ b/arch/sparc/kernel/prom_common.c
10657@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10658
10659 unsigned int prom_early_allocated __initdata;
10660
10661-static struct of_pdt_ops prom_sparc_ops __initdata = {
10662+static struct of_pdt_ops prom_sparc_ops __initconst = {
10663 .nextprop = prom_common_nextprop,
10664 .getproplen = prom_getproplen,
10665 .getproperty = prom_getproperty,
10666diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10667index 9ddc492..27a5619 100644
10668--- a/arch/sparc/kernel/ptrace_64.c
10669+++ b/arch/sparc/kernel/ptrace_64.c
10670@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10671 return ret;
10672 }
10673
10674+#ifdef CONFIG_GRKERNSEC_SETXID
10675+extern void gr_delayed_cred_worker(void);
10676+#endif
10677+
10678 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10679 {
10680 int ret = 0;
10681@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10682 if (test_thread_flag(TIF_NOHZ))
10683 user_exit();
10684
10685+#ifdef CONFIG_GRKERNSEC_SETXID
10686+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10687+ gr_delayed_cred_worker();
10688+#endif
10689+
10690 if (test_thread_flag(TIF_SYSCALL_TRACE))
10691 ret = tracehook_report_syscall_entry(regs);
10692
10693@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10694 if (test_thread_flag(TIF_NOHZ))
10695 user_exit();
10696
10697+#ifdef CONFIG_GRKERNSEC_SETXID
10698+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10699+ gr_delayed_cred_worker();
10700+#endif
10701+
10702 audit_syscall_exit(regs);
10703
10704 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10705diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10706index 19cd08d..ff21e99 100644
10707--- a/arch/sparc/kernel/smp_64.c
10708+++ b/arch/sparc/kernel/smp_64.c
10709@@ -891,7 +891,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10710 return;
10711
10712 #ifdef CONFIG_DEBUG_DCFLUSH
10713- atomic_inc(&dcpage_flushes);
10714+ atomic_inc_unchecked(&dcpage_flushes);
10715 #endif
10716
10717 this_cpu = get_cpu();
10718@@ -915,7 +915,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10719 xcall_deliver(data0, __pa(pg_addr),
10720 (u64) pg_addr, cpumask_of(cpu));
10721 #ifdef CONFIG_DEBUG_DCFLUSH
10722- atomic_inc(&dcpage_flushes_xcall);
10723+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10724 #endif
10725 }
10726 }
10727@@ -934,7 +934,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10728 preempt_disable();
10729
10730 #ifdef CONFIG_DEBUG_DCFLUSH
10731- atomic_inc(&dcpage_flushes);
10732+ atomic_inc_unchecked(&dcpage_flushes);
10733 #endif
10734 data0 = 0;
10735 pg_addr = page_address(page);
10736@@ -951,7 +951,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10737 xcall_deliver(data0, __pa(pg_addr),
10738 (u64) pg_addr, cpu_online_mask);
10739 #ifdef CONFIG_DEBUG_DCFLUSH
10740- atomic_inc(&dcpage_flushes_xcall);
10741+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10742 #endif
10743 }
10744 __local_flush_dcache_page(page);
10745diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10746index 646988d..b88905f 100644
10747--- a/arch/sparc/kernel/sys_sparc_32.c
10748+++ b/arch/sparc/kernel/sys_sparc_32.c
10749@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10750 if (len > TASK_SIZE - PAGE_SIZE)
10751 return -ENOMEM;
10752 if (!addr)
10753- addr = TASK_UNMAPPED_BASE;
10754+ addr = current->mm->mmap_base;
10755
10756 info.flags = 0;
10757 info.length = len;
10758diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10759index 30e7ddb..266a3b0 100644
10760--- a/arch/sparc/kernel/sys_sparc_64.c
10761+++ b/arch/sparc/kernel/sys_sparc_64.c
10762@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10763 struct vm_area_struct * vma;
10764 unsigned long task_size = TASK_SIZE;
10765 int do_color_align;
10766+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10767 struct vm_unmapped_area_info info;
10768
10769 if (flags & MAP_FIXED) {
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@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
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 if (addr) {
10787 if (do_color_align)
10788 addr = COLOR_ALIGN(addr, pgoff);
10789@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
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 info.flags = 0;
10800 info.length = len;
10801- info.low_limit = TASK_UNMAPPED_BASE;
10802+ info.low_limit = mm->mmap_base;
10803 info.high_limit = min(task_size, VA_EXCLUDE_START);
10804 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10805 info.align_offset = pgoff << PAGE_SHIFT;
10806+ info.threadstack_offset = offset;
10807 addr = vm_unmapped_area(&info);
10808
10809 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10810 VM_BUG_ON(addr != -ENOMEM);
10811 info.low_limit = VA_EXCLUDE_END;
10812+
10813+#ifdef CONFIG_PAX_RANDMMAP
10814+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10815+ info.low_limit += mm->delta_mmap;
10816+#endif
10817+
10818 info.high_limit = task_size;
10819 addr = vm_unmapped_area(&info);
10820 }
10821@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10822 unsigned long task_size = STACK_TOP32;
10823 unsigned long addr = addr0;
10824 int do_color_align;
10825+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10826 struct vm_unmapped_area_info info;
10827
10828 /* This should only ever run for 32-bit processes. */
10829@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10830 /* We do not accept a shared mapping if it would violate
10831 * cache aliasing constraints.
10832 */
10833- if ((flags & MAP_SHARED) &&
10834+ if ((filp || (flags & MAP_SHARED)) &&
10835 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10836 return -EINVAL;
10837 return addr;
10838@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10839 if (filp || (flags & MAP_SHARED))
10840 do_color_align = 1;
10841
10842+#ifdef CONFIG_PAX_RANDMMAP
10843+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10844+#endif
10845+
10846 /* requesting a specific address */
10847 if (addr) {
10848 if (do_color_align)
10849@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10850 addr = PAGE_ALIGN(addr);
10851
10852 vma = find_vma(mm, addr);
10853- if (task_size - len >= addr &&
10854- (!vma || addr + len <= vma->vm_start))
10855+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10856 return addr;
10857 }
10858
10859@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10860 info.high_limit = mm->mmap_base;
10861 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10862 info.align_offset = pgoff << PAGE_SHIFT;
10863+ info.threadstack_offset = offset;
10864 addr = vm_unmapped_area(&info);
10865
10866 /*
10867@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10868 VM_BUG_ON(addr != -ENOMEM);
10869 info.flags = 0;
10870 info.low_limit = TASK_UNMAPPED_BASE;
10871+
10872+#ifdef CONFIG_PAX_RANDMMAP
10873+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10874+ info.low_limit += mm->delta_mmap;
10875+#endif
10876+
10877 info.high_limit = STACK_TOP32;
10878 addr = vm_unmapped_area(&info);
10879 }
10880@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10881 EXPORT_SYMBOL(get_fb_unmapped_area);
10882
10883 /* Essentially the same as PowerPC. */
10884-static unsigned long mmap_rnd(void)
10885+static unsigned long mmap_rnd(struct mm_struct *mm)
10886 {
10887 unsigned long rnd = 0UL;
10888
10889+#ifdef CONFIG_PAX_RANDMMAP
10890+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10891+#endif
10892+
10893 if (current->flags & PF_RANDOMIZE) {
10894 unsigned long val = get_random_int();
10895 if (test_thread_flag(TIF_32BIT))
10896@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10897
10898 void arch_pick_mmap_layout(struct mm_struct *mm)
10899 {
10900- unsigned long random_factor = mmap_rnd();
10901+ unsigned long random_factor = mmap_rnd(mm);
10902 unsigned long gap;
10903
10904 /*
10905@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10906 gap == RLIM_INFINITY ||
10907 sysctl_legacy_va_layout) {
10908 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10909+
10910+#ifdef CONFIG_PAX_RANDMMAP
10911+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10912+ mm->mmap_base += mm->delta_mmap;
10913+#endif
10914+
10915 mm->get_unmapped_area = arch_get_unmapped_area;
10916 } else {
10917 /* We know it's 32-bit */
10918@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10919 gap = (task_size / 6 * 5);
10920
10921 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10922+
10923+#ifdef CONFIG_PAX_RANDMMAP
10924+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10925+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10926+#endif
10927+
10928 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10929 }
10930 }
10931diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10932index bb00089..e0ea580 100644
10933--- a/arch/sparc/kernel/syscalls.S
10934+++ b/arch/sparc/kernel/syscalls.S
10935@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10936 #endif
10937 .align 32
10938 1: ldx [%g6 + TI_FLAGS], %l5
10939- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10940+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10941 be,pt %icc, rtrap
10942 nop
10943 call syscall_trace_leave
10944@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10945
10946 srl %i3, 0, %o3 ! IEU0
10947 srl %i2, 0, %o2 ! IEU0 Group
10948- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10949+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10950 bne,pn %icc, linux_syscall_trace32 ! CTI
10951 mov %i0, %l5 ! IEU1
10952 5: call %l7 ! CTI Group brk forced
10953@@ -218,7 +218,7 @@ linux_sparc_syscall:
10954
10955 mov %i3, %o3 ! IEU1
10956 mov %i4, %o4 ! IEU0 Group
10957- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10958+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10959 bne,pn %icc, linux_syscall_trace ! CTI Group
10960 mov %i0, %l5 ! IEU0
10961 2: call %l7 ! CTI Group brk forced
10962@@ -233,7 +233,7 @@ ret_sys_call:
10963
10964 cmp %o0, -ERESTART_RESTARTBLOCK
10965 bgeu,pn %xcc, 1f
10966- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10967+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10968 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10969
10970 2:
10971diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10972index 4f21df7..0a374da 100644
10973--- a/arch/sparc/kernel/traps_32.c
10974+++ b/arch/sparc/kernel/traps_32.c
10975@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10976 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10977 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10978
10979+extern void gr_handle_kernel_exploit(void);
10980+
10981 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10982 {
10983 static int die_counter;
10984@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10985 count++ < 30 &&
10986 (((unsigned long) rw) >= PAGE_OFFSET) &&
10987 !(((unsigned long) rw) & 0x7)) {
10988- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10989+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10990 (void *) rw->ins[7]);
10991 rw = (struct reg_window32 *)rw->ins[6];
10992 }
10993 }
10994 printk("Instruction DUMP:");
10995 instruction_dump ((unsigned long *) regs->pc);
10996- if(regs->psr & PSR_PS)
10997+ if(regs->psr & PSR_PS) {
10998+ gr_handle_kernel_exploit();
10999 do_exit(SIGKILL);
11000+ }
11001 do_exit(SIGSEGV);
11002 }
11003
11004diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
11005index d21cd62..00a4a17 100644
11006--- a/arch/sparc/kernel/traps_64.c
11007+++ b/arch/sparc/kernel/traps_64.c
11008@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
11009 i + 1,
11010 p->trapstack[i].tstate, p->trapstack[i].tpc,
11011 p->trapstack[i].tnpc, p->trapstack[i].tt);
11012- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
11013+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
11014 }
11015 }
11016
11017@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
11018
11019 lvl -= 0x100;
11020 if (regs->tstate & TSTATE_PRIV) {
11021+
11022+#ifdef CONFIG_PAX_REFCOUNT
11023+ if (lvl == 6)
11024+ pax_report_refcount_overflow(regs);
11025+#endif
11026+
11027 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11028 die_if_kernel(buffer, regs);
11029 }
11030@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11031 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11032 {
11033 char buffer[32];
11034-
11035+
11036 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11037 0, lvl, SIGTRAP) == NOTIFY_STOP)
11038 return;
11039
11040+#ifdef CONFIG_PAX_REFCOUNT
11041+ if (lvl == 6)
11042+ pax_report_refcount_overflow(regs);
11043+#endif
11044+
11045 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11046
11047 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11048@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11049 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11050 printk("%s" "ERROR(%d): ",
11051 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11052- printk("TPC<%pS>\n", (void *) regs->tpc);
11053+ printk("TPC<%pA>\n", (void *) regs->tpc);
11054 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11055 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11056 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11057@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11058 smp_processor_id(),
11059 (type & 0x1) ? 'I' : 'D',
11060 regs->tpc);
11061- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11062+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11063 panic("Irrecoverable Cheetah+ parity error.");
11064 }
11065
11066@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11067 smp_processor_id(),
11068 (type & 0x1) ? 'I' : 'D',
11069 regs->tpc);
11070- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11071+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11072 }
11073
11074 struct sun4v_error_entry {
11075@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11076 /*0x38*/u64 reserved_5;
11077 };
11078
11079-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11080-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11081+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11082+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11083
11084 static const char *sun4v_err_type_to_str(u8 type)
11085 {
11086@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11087 }
11088
11089 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11090- int cpu, const char *pfx, atomic_t *ocnt)
11091+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11092 {
11093 u64 *raw_ptr = (u64 *) ent;
11094 u32 attrs;
11095@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11096
11097 show_regs(regs);
11098
11099- if ((cnt = atomic_read(ocnt)) != 0) {
11100- atomic_set(ocnt, 0);
11101+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11102+ atomic_set_unchecked(ocnt, 0);
11103 wmb();
11104 printk("%s: Queue overflowed %d times.\n",
11105 pfx, cnt);
11106@@ -2048,7 +2059,7 @@ out:
11107 */
11108 void sun4v_resum_overflow(struct pt_regs *regs)
11109 {
11110- atomic_inc(&sun4v_resum_oflow_cnt);
11111+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11112 }
11113
11114 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11115@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11116 /* XXX Actually even this can make not that much sense. Perhaps
11117 * XXX we should just pull the plug and panic directly from here?
11118 */
11119- atomic_inc(&sun4v_nonresum_oflow_cnt);
11120+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11121 }
11122
11123 static void sun4v_tlb_error(struct pt_regs *regs)
11124@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11125
11126 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11127 regs->tpc, tl);
11128- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11129+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11130 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11131- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11132+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11133 (void *) regs->u_regs[UREG_I7]);
11134 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11135 "pte[%lx] error[%lx]\n",
11136@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11137
11138 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11139 regs->tpc, tl);
11140- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11141+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11142 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11143- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11144+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11145 (void *) regs->u_regs[UREG_I7]);
11146 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11147 "pte[%lx] error[%lx]\n",
11148@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11149 fp = (unsigned long)sf->fp + STACK_BIAS;
11150 }
11151
11152- printk(" [%016lx] %pS\n", pc, (void *) pc);
11153+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11154 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11155 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11156 int index = tsk->curr_ret_stack;
11157 if (tsk->ret_stack && index >= graph) {
11158 pc = tsk->ret_stack[index - graph].ret;
11159- printk(" [%016lx] %pS\n", pc, (void *) pc);
11160+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11161 graph++;
11162 }
11163 }
11164@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11165 return (struct reg_window *) (fp + STACK_BIAS);
11166 }
11167
11168+extern void gr_handle_kernel_exploit(void);
11169+
11170 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11171 {
11172 static int die_counter;
11173@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11174 while (rw &&
11175 count++ < 30 &&
11176 kstack_valid(tp, (unsigned long) rw)) {
11177- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11178+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11179 (void *) rw->ins[7]);
11180
11181 rw = kernel_stack_up(rw);
11182@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11183 }
11184 if (panic_on_oops)
11185 panic("Fatal exception");
11186- if (regs->tstate & TSTATE_PRIV)
11187+ if (regs->tstate & TSTATE_PRIV) {
11188+ gr_handle_kernel_exploit();
11189 do_exit(SIGKILL);
11190+ }
11191 do_exit(SIGSEGV);
11192 }
11193 EXPORT_SYMBOL(die_if_kernel);
11194diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11195index 62098a8..547ab2c 100644
11196--- a/arch/sparc/kernel/unaligned_64.c
11197+++ b/arch/sparc/kernel/unaligned_64.c
11198@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11199 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11200
11201 if (__ratelimit(&ratelimit)) {
11202- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11203+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11204 regs->tpc, (void *) regs->tpc);
11205 }
11206 }
11207diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11208index 3269b02..64f5231 100644
11209--- a/arch/sparc/lib/Makefile
11210+++ b/arch/sparc/lib/Makefile
11211@@ -2,7 +2,7 @@
11212 #
11213
11214 asflags-y := -ansi -DST_DIV0=0x02
11215-ccflags-y := -Werror
11216+#ccflags-y := -Werror
11217
11218 lib-$(CONFIG_SPARC32) += ashrdi3.o
11219 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11220diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11221index 05dac43..76f8ed4 100644
11222--- a/arch/sparc/lib/atomic_64.S
11223+++ b/arch/sparc/lib/atomic_64.S
11224@@ -15,11 +15,22 @@
11225 * a value and does the barriers.
11226 */
11227
11228-#define ATOMIC_OP(op) \
11229-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11230+#ifdef CONFIG_PAX_REFCOUNT
11231+#define __REFCOUNT_OP(op) op##cc
11232+#define __OVERFLOW_IOP tvs %icc, 6;
11233+#define __OVERFLOW_XOP tvs %xcc, 6;
11234+#else
11235+#define __REFCOUNT_OP(op) op
11236+#define __OVERFLOW_IOP
11237+#define __OVERFLOW_XOP
11238+#endif
11239+
11240+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11241+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11242 BACKOFF_SETUP(%o2); \
11243 1: lduw [%o1], %g1; \
11244- op %g1, %o0, %g7; \
11245+ asm_op %g1, %o0, %g7; \
11246+ post_op \
11247 cas [%o1], %g1, %g7; \
11248 cmp %g1, %g7; \
11249 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11250@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11251 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11252 ENDPROC(atomic_##op); \
11253
11254-#define ATOMIC_OP_RETURN(op) \
11255-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11256+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11257+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11258+
11259+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11260+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11261 BACKOFF_SETUP(%o2); \
11262 1: lduw [%o1], %g1; \
11263- op %g1, %o0, %g7; \
11264+ asm_op %g1, %o0, %g7; \
11265+ post_op \
11266 cas [%o1], %g1, %g7; \
11267 cmp %g1, %g7; \
11268 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11269@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11270 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11271 ENDPROC(atomic_##op##_return);
11272
11273+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11274+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11275+
11276 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11277
11278 ATOMIC_OPS(add)
11279@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11280
11281 #undef ATOMIC_OPS
11282 #undef ATOMIC_OP_RETURN
11283+#undef __ATOMIC_OP_RETURN
11284 #undef ATOMIC_OP
11285+#undef __ATOMIC_OP
11286
11287-#define ATOMIC64_OP(op) \
11288-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11289+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11290+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11291 BACKOFF_SETUP(%o2); \
11292 1: ldx [%o1], %g1; \
11293- op %g1, %o0, %g7; \
11294+ asm_op %g1, %o0, %g7; \
11295+ post_op \
11296 casx [%o1], %g1, %g7; \
11297 cmp %g1, %g7; \
11298 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11299@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11300 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11301 ENDPROC(atomic64_##op); \
11302
11303-#define ATOMIC64_OP_RETURN(op) \
11304-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11305+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11306+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11307+
11308+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11309+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11310 BACKOFF_SETUP(%o2); \
11311 1: ldx [%o1], %g1; \
11312- op %g1, %o0, %g7; \
11313+ asm_op %g1, %o0, %g7; \
11314+ post_op \
11315 casx [%o1], %g1, %g7; \
11316 cmp %g1, %g7; \
11317 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11318@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11319 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11320 ENDPROC(atomic64_##op##_return);
11321
11322+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11323+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11324+
11325 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11326
11327 ATOMIC64_OPS(add)
11328@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11329
11330 #undef ATOMIC64_OPS
11331 #undef ATOMIC64_OP_RETURN
11332+#undef __ATOMIC64_OP_RETURN
11333 #undef ATOMIC64_OP
11334+#undef __ATOMIC64_OP
11335+#undef __OVERFLOW_XOP
11336+#undef __OVERFLOW_IOP
11337+#undef __REFCOUNT_OP
11338
11339 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11340 BACKOFF_SETUP(%o2)
11341diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11342index 1d649a9..fbc5bfc 100644
11343--- a/arch/sparc/lib/ksyms.c
11344+++ b/arch/sparc/lib/ksyms.c
11345@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11346 /* Atomic counter implementation. */
11347 #define ATOMIC_OP(op) \
11348 EXPORT_SYMBOL(atomic_##op); \
11349-EXPORT_SYMBOL(atomic64_##op);
11350+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11351+EXPORT_SYMBOL(atomic64_##op); \
11352+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11353
11354 #define ATOMIC_OP_RETURN(op) \
11355 EXPORT_SYMBOL(atomic_##op##_return); \
11356@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11357 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11358
11359 ATOMIC_OPS(add)
11360+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11361+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11362 ATOMIC_OPS(sub)
11363
11364 #undef ATOMIC_OPS
11365diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11366index 30c3ecc..736f015 100644
11367--- a/arch/sparc/mm/Makefile
11368+++ b/arch/sparc/mm/Makefile
11369@@ -2,7 +2,7 @@
11370 #
11371
11372 asflags-y := -ansi
11373-ccflags-y := -Werror
11374+#ccflags-y := -Werror
11375
11376 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11377 obj-y += fault_$(BITS).o
11378diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11379index 70d8171..274c6c0 100644
11380--- a/arch/sparc/mm/fault_32.c
11381+++ b/arch/sparc/mm/fault_32.c
11382@@ -21,6 +21,9 @@
11383 #include <linux/perf_event.h>
11384 #include <linux/interrupt.h>
11385 #include <linux/kdebug.h>
11386+#include <linux/slab.h>
11387+#include <linux/pagemap.h>
11388+#include <linux/compiler.h>
11389
11390 #include <asm/page.h>
11391 #include <asm/pgtable.h>
11392@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11393 return safe_compute_effective_address(regs, insn);
11394 }
11395
11396+#ifdef CONFIG_PAX_PAGEEXEC
11397+#ifdef CONFIG_PAX_DLRESOLVE
11398+static void pax_emuplt_close(struct vm_area_struct *vma)
11399+{
11400+ vma->vm_mm->call_dl_resolve = 0UL;
11401+}
11402+
11403+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11404+{
11405+ unsigned int *kaddr;
11406+
11407+ vmf->page = alloc_page(GFP_HIGHUSER);
11408+ if (!vmf->page)
11409+ return VM_FAULT_OOM;
11410+
11411+ kaddr = kmap(vmf->page);
11412+ memset(kaddr, 0, PAGE_SIZE);
11413+ kaddr[0] = 0x9DE3BFA8U; /* save */
11414+ flush_dcache_page(vmf->page);
11415+ kunmap(vmf->page);
11416+ return VM_FAULT_MAJOR;
11417+}
11418+
11419+static const struct vm_operations_struct pax_vm_ops = {
11420+ .close = pax_emuplt_close,
11421+ .fault = pax_emuplt_fault
11422+};
11423+
11424+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11425+{
11426+ int ret;
11427+
11428+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11429+ vma->vm_mm = current->mm;
11430+ vma->vm_start = addr;
11431+ vma->vm_end = addr + PAGE_SIZE;
11432+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11433+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11434+ vma->vm_ops = &pax_vm_ops;
11435+
11436+ ret = insert_vm_struct(current->mm, vma);
11437+ if (ret)
11438+ return ret;
11439+
11440+ ++current->mm->total_vm;
11441+ return 0;
11442+}
11443+#endif
11444+
11445+/*
11446+ * PaX: decide what to do with offenders (regs->pc = fault address)
11447+ *
11448+ * returns 1 when task should be killed
11449+ * 2 when patched PLT trampoline was detected
11450+ * 3 when unpatched PLT trampoline was detected
11451+ */
11452+static int pax_handle_fetch_fault(struct pt_regs *regs)
11453+{
11454+
11455+#ifdef CONFIG_PAX_EMUPLT
11456+ int err;
11457+
11458+ do { /* PaX: patched PLT emulation #1 */
11459+ unsigned int sethi1, sethi2, jmpl;
11460+
11461+ err = get_user(sethi1, (unsigned int *)regs->pc);
11462+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11463+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11464+
11465+ if (err)
11466+ break;
11467+
11468+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11469+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11470+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11471+ {
11472+ unsigned int addr;
11473+
11474+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11475+ addr = regs->u_regs[UREG_G1];
11476+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11477+ regs->pc = addr;
11478+ regs->npc = addr+4;
11479+ return 2;
11480+ }
11481+ } while (0);
11482+
11483+ do { /* PaX: patched PLT emulation #2 */
11484+ unsigned int ba;
11485+
11486+ err = get_user(ba, (unsigned int *)regs->pc);
11487+
11488+ if (err)
11489+ break;
11490+
11491+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11492+ unsigned int addr;
11493+
11494+ if ((ba & 0xFFC00000U) == 0x30800000U)
11495+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11496+ else
11497+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11498+ regs->pc = addr;
11499+ regs->npc = addr+4;
11500+ return 2;
11501+ }
11502+ } while (0);
11503+
11504+ do { /* PaX: patched PLT emulation #3 */
11505+ unsigned int sethi, bajmpl, nop;
11506+
11507+ err = get_user(sethi, (unsigned int *)regs->pc);
11508+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11509+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11510+
11511+ if (err)
11512+ break;
11513+
11514+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11515+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11516+ nop == 0x01000000U)
11517+ {
11518+ unsigned int addr;
11519+
11520+ addr = (sethi & 0x003FFFFFU) << 10;
11521+ regs->u_regs[UREG_G1] = addr;
11522+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11523+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11524+ else
11525+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11526+ regs->pc = addr;
11527+ regs->npc = addr+4;
11528+ return 2;
11529+ }
11530+ } while (0);
11531+
11532+ do { /* PaX: unpatched PLT emulation step 1 */
11533+ unsigned int sethi, ba, nop;
11534+
11535+ err = get_user(sethi, (unsigned int *)regs->pc);
11536+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11537+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11538+
11539+ if (err)
11540+ break;
11541+
11542+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11543+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11544+ nop == 0x01000000U)
11545+ {
11546+ unsigned int addr, save, call;
11547+
11548+ if ((ba & 0xFFC00000U) == 0x30800000U)
11549+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11550+ else
11551+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11552+
11553+ err = get_user(save, (unsigned int *)addr);
11554+ err |= get_user(call, (unsigned int *)(addr+4));
11555+ err |= get_user(nop, (unsigned int *)(addr+8));
11556+ if (err)
11557+ break;
11558+
11559+#ifdef CONFIG_PAX_DLRESOLVE
11560+ if (save == 0x9DE3BFA8U &&
11561+ (call & 0xC0000000U) == 0x40000000U &&
11562+ nop == 0x01000000U)
11563+ {
11564+ struct vm_area_struct *vma;
11565+ unsigned long call_dl_resolve;
11566+
11567+ down_read(&current->mm->mmap_sem);
11568+ call_dl_resolve = current->mm->call_dl_resolve;
11569+ up_read(&current->mm->mmap_sem);
11570+ if (likely(call_dl_resolve))
11571+ goto emulate;
11572+
11573+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11574+
11575+ down_write(&current->mm->mmap_sem);
11576+ if (current->mm->call_dl_resolve) {
11577+ call_dl_resolve = current->mm->call_dl_resolve;
11578+ up_write(&current->mm->mmap_sem);
11579+ if (vma)
11580+ kmem_cache_free(vm_area_cachep, vma);
11581+ goto emulate;
11582+ }
11583+
11584+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11585+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11586+ up_write(&current->mm->mmap_sem);
11587+ if (vma)
11588+ kmem_cache_free(vm_area_cachep, vma);
11589+ return 1;
11590+ }
11591+
11592+ if (pax_insert_vma(vma, call_dl_resolve)) {
11593+ up_write(&current->mm->mmap_sem);
11594+ kmem_cache_free(vm_area_cachep, vma);
11595+ return 1;
11596+ }
11597+
11598+ current->mm->call_dl_resolve = call_dl_resolve;
11599+ up_write(&current->mm->mmap_sem);
11600+
11601+emulate:
11602+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11603+ regs->pc = call_dl_resolve;
11604+ regs->npc = addr+4;
11605+ return 3;
11606+ }
11607+#endif
11608+
11609+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11610+ if ((save & 0xFFC00000U) == 0x05000000U &&
11611+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11612+ nop == 0x01000000U)
11613+ {
11614+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11615+ regs->u_regs[UREG_G2] = addr + 4;
11616+ addr = (save & 0x003FFFFFU) << 10;
11617+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11618+ regs->pc = addr;
11619+ regs->npc = addr+4;
11620+ return 3;
11621+ }
11622+ }
11623+ } while (0);
11624+
11625+ do { /* PaX: unpatched PLT emulation step 2 */
11626+ unsigned int save, call, nop;
11627+
11628+ err = get_user(save, (unsigned int *)(regs->pc-4));
11629+ err |= get_user(call, (unsigned int *)regs->pc);
11630+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11631+ if (err)
11632+ break;
11633+
11634+ if (save == 0x9DE3BFA8U &&
11635+ (call & 0xC0000000U) == 0x40000000U &&
11636+ nop == 0x01000000U)
11637+ {
11638+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11639+
11640+ regs->u_regs[UREG_RETPC] = regs->pc;
11641+ regs->pc = dl_resolve;
11642+ regs->npc = dl_resolve+4;
11643+ return 3;
11644+ }
11645+ } while (0);
11646+#endif
11647+
11648+ return 1;
11649+}
11650+
11651+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11652+{
11653+ unsigned long i;
11654+
11655+ printk(KERN_ERR "PAX: bytes at PC: ");
11656+ for (i = 0; i < 8; i++) {
11657+ unsigned int c;
11658+ if (get_user(c, (unsigned int *)pc+i))
11659+ printk(KERN_CONT "???????? ");
11660+ else
11661+ printk(KERN_CONT "%08x ", c);
11662+ }
11663+ printk("\n");
11664+}
11665+#endif
11666+
11667 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11668 int text_fault)
11669 {
11670@@ -226,6 +500,24 @@ good_area:
11671 if (!(vma->vm_flags & VM_WRITE))
11672 goto bad_area;
11673 } else {
11674+
11675+#ifdef CONFIG_PAX_PAGEEXEC
11676+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11677+ up_read(&mm->mmap_sem);
11678+ switch (pax_handle_fetch_fault(regs)) {
11679+
11680+#ifdef CONFIG_PAX_EMUPLT
11681+ case 2:
11682+ case 3:
11683+ return;
11684+#endif
11685+
11686+ }
11687+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11688+ do_group_exit(SIGKILL);
11689+ }
11690+#endif
11691+
11692 /* Allow reads even for write-only mappings */
11693 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11694 goto bad_area;
11695diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11696index 4798232..f76e3aa 100644
11697--- a/arch/sparc/mm/fault_64.c
11698+++ b/arch/sparc/mm/fault_64.c
11699@@ -22,6 +22,9 @@
11700 #include <linux/kdebug.h>
11701 #include <linux/percpu.h>
11702 #include <linux/context_tracking.h>
11703+#include <linux/slab.h>
11704+#include <linux/pagemap.h>
11705+#include <linux/compiler.h>
11706
11707 #include <asm/page.h>
11708 #include <asm/pgtable.h>
11709@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11710 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11711 regs->tpc);
11712 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11713- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11714+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11715 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11716 dump_stack();
11717 unhandled_fault(regs->tpc, current, regs);
11718@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11719 show_regs(regs);
11720 }
11721
11722+#ifdef CONFIG_PAX_PAGEEXEC
11723+#ifdef CONFIG_PAX_DLRESOLVE
11724+static void pax_emuplt_close(struct vm_area_struct *vma)
11725+{
11726+ vma->vm_mm->call_dl_resolve = 0UL;
11727+}
11728+
11729+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11730+{
11731+ unsigned int *kaddr;
11732+
11733+ vmf->page = alloc_page(GFP_HIGHUSER);
11734+ if (!vmf->page)
11735+ return VM_FAULT_OOM;
11736+
11737+ kaddr = kmap(vmf->page);
11738+ memset(kaddr, 0, PAGE_SIZE);
11739+ kaddr[0] = 0x9DE3BFA8U; /* save */
11740+ flush_dcache_page(vmf->page);
11741+ kunmap(vmf->page);
11742+ return VM_FAULT_MAJOR;
11743+}
11744+
11745+static const struct vm_operations_struct pax_vm_ops = {
11746+ .close = pax_emuplt_close,
11747+ .fault = pax_emuplt_fault
11748+};
11749+
11750+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11751+{
11752+ int ret;
11753+
11754+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11755+ vma->vm_mm = current->mm;
11756+ vma->vm_start = addr;
11757+ vma->vm_end = addr + PAGE_SIZE;
11758+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11759+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11760+ vma->vm_ops = &pax_vm_ops;
11761+
11762+ ret = insert_vm_struct(current->mm, vma);
11763+ if (ret)
11764+ return ret;
11765+
11766+ ++current->mm->total_vm;
11767+ return 0;
11768+}
11769+#endif
11770+
11771+/*
11772+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11773+ *
11774+ * returns 1 when task should be killed
11775+ * 2 when patched PLT trampoline was detected
11776+ * 3 when unpatched PLT trampoline was detected
11777+ */
11778+static int pax_handle_fetch_fault(struct pt_regs *regs)
11779+{
11780+
11781+#ifdef CONFIG_PAX_EMUPLT
11782+ int err;
11783+
11784+ do { /* PaX: patched PLT emulation #1 */
11785+ unsigned int sethi1, sethi2, jmpl;
11786+
11787+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11788+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11789+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11790+
11791+ if (err)
11792+ break;
11793+
11794+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11795+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11796+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11797+ {
11798+ unsigned long addr;
11799+
11800+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11801+ addr = regs->u_regs[UREG_G1];
11802+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11803+
11804+ if (test_thread_flag(TIF_32BIT))
11805+ addr &= 0xFFFFFFFFUL;
11806+
11807+ regs->tpc = addr;
11808+ regs->tnpc = addr+4;
11809+ return 2;
11810+ }
11811+ } while (0);
11812+
11813+ do { /* PaX: patched PLT emulation #2 */
11814+ unsigned int ba;
11815+
11816+ err = get_user(ba, (unsigned int *)regs->tpc);
11817+
11818+ if (err)
11819+ break;
11820+
11821+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11822+ unsigned long addr;
11823+
11824+ if ((ba & 0xFFC00000U) == 0x30800000U)
11825+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11826+ else
11827+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11828+
11829+ if (test_thread_flag(TIF_32BIT))
11830+ addr &= 0xFFFFFFFFUL;
11831+
11832+ regs->tpc = addr;
11833+ regs->tnpc = addr+4;
11834+ return 2;
11835+ }
11836+ } while (0);
11837+
11838+ do { /* PaX: patched PLT emulation #3 */
11839+ unsigned int sethi, bajmpl, nop;
11840+
11841+ err = get_user(sethi, (unsigned int *)regs->tpc);
11842+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11843+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11844+
11845+ if (err)
11846+ break;
11847+
11848+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11849+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11850+ nop == 0x01000000U)
11851+ {
11852+ unsigned long addr;
11853+
11854+ addr = (sethi & 0x003FFFFFU) << 10;
11855+ regs->u_regs[UREG_G1] = addr;
11856+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11857+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11858+ else
11859+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11860+
11861+ if (test_thread_flag(TIF_32BIT))
11862+ addr &= 0xFFFFFFFFUL;
11863+
11864+ regs->tpc = addr;
11865+ regs->tnpc = addr+4;
11866+ return 2;
11867+ }
11868+ } while (0);
11869+
11870+ do { /* PaX: patched PLT emulation #4 */
11871+ unsigned int sethi, mov1, call, mov2;
11872+
11873+ err = get_user(sethi, (unsigned int *)regs->tpc);
11874+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11875+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11876+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11877+
11878+ if (err)
11879+ break;
11880+
11881+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11882+ mov1 == 0x8210000FU &&
11883+ (call & 0xC0000000U) == 0x40000000U &&
11884+ mov2 == 0x9E100001U)
11885+ {
11886+ unsigned long addr;
11887+
11888+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11889+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11890+
11891+ if (test_thread_flag(TIF_32BIT))
11892+ addr &= 0xFFFFFFFFUL;
11893+
11894+ regs->tpc = addr;
11895+ regs->tnpc = addr+4;
11896+ return 2;
11897+ }
11898+ } while (0);
11899+
11900+ do { /* PaX: patched PLT emulation #5 */
11901+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11902+
11903+ err = get_user(sethi, (unsigned int *)regs->tpc);
11904+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11905+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11906+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11907+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11908+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11909+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11910+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11911+
11912+ if (err)
11913+ break;
11914+
11915+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11916+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11917+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11918+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11919+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11920+ sllx == 0x83287020U &&
11921+ jmpl == 0x81C04005U &&
11922+ nop == 0x01000000U)
11923+ {
11924+ unsigned long addr;
11925+
11926+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11927+ regs->u_regs[UREG_G1] <<= 32;
11928+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11929+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11930+ regs->tpc = addr;
11931+ regs->tnpc = addr+4;
11932+ return 2;
11933+ }
11934+ } while (0);
11935+
11936+ do { /* PaX: patched PLT emulation #6 */
11937+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11938+
11939+ err = get_user(sethi, (unsigned int *)regs->tpc);
11940+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11941+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11942+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11943+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11944+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11945+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11946+
11947+ if (err)
11948+ break;
11949+
11950+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11951+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11952+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11953+ sllx == 0x83287020U &&
11954+ (or & 0xFFFFE000U) == 0x8A116000U &&
11955+ jmpl == 0x81C04005U &&
11956+ nop == 0x01000000U)
11957+ {
11958+ unsigned long addr;
11959+
11960+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11961+ regs->u_regs[UREG_G1] <<= 32;
11962+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11963+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11964+ regs->tpc = addr;
11965+ regs->tnpc = addr+4;
11966+ return 2;
11967+ }
11968+ } while (0);
11969+
11970+ do { /* PaX: unpatched PLT emulation step 1 */
11971+ unsigned int sethi, ba, nop;
11972+
11973+ err = get_user(sethi, (unsigned int *)regs->tpc);
11974+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11975+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11976+
11977+ if (err)
11978+ break;
11979+
11980+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11981+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11982+ nop == 0x01000000U)
11983+ {
11984+ unsigned long addr;
11985+ unsigned int save, call;
11986+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11987+
11988+ if ((ba & 0xFFC00000U) == 0x30800000U)
11989+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11990+ else
11991+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11992+
11993+ if (test_thread_flag(TIF_32BIT))
11994+ addr &= 0xFFFFFFFFUL;
11995+
11996+ err = get_user(save, (unsigned int *)addr);
11997+ err |= get_user(call, (unsigned int *)(addr+4));
11998+ err |= get_user(nop, (unsigned int *)(addr+8));
11999+ if (err)
12000+ break;
12001+
12002+#ifdef CONFIG_PAX_DLRESOLVE
12003+ if (save == 0x9DE3BFA8U &&
12004+ (call & 0xC0000000U) == 0x40000000U &&
12005+ nop == 0x01000000U)
12006+ {
12007+ struct vm_area_struct *vma;
12008+ unsigned long call_dl_resolve;
12009+
12010+ down_read(&current->mm->mmap_sem);
12011+ call_dl_resolve = current->mm->call_dl_resolve;
12012+ up_read(&current->mm->mmap_sem);
12013+ if (likely(call_dl_resolve))
12014+ goto emulate;
12015+
12016+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
12017+
12018+ down_write(&current->mm->mmap_sem);
12019+ if (current->mm->call_dl_resolve) {
12020+ call_dl_resolve = current->mm->call_dl_resolve;
12021+ up_write(&current->mm->mmap_sem);
12022+ if (vma)
12023+ kmem_cache_free(vm_area_cachep, vma);
12024+ goto emulate;
12025+ }
12026+
12027+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12028+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12029+ up_write(&current->mm->mmap_sem);
12030+ if (vma)
12031+ kmem_cache_free(vm_area_cachep, vma);
12032+ return 1;
12033+ }
12034+
12035+ if (pax_insert_vma(vma, call_dl_resolve)) {
12036+ up_write(&current->mm->mmap_sem);
12037+ kmem_cache_free(vm_area_cachep, vma);
12038+ return 1;
12039+ }
12040+
12041+ current->mm->call_dl_resolve = call_dl_resolve;
12042+ up_write(&current->mm->mmap_sem);
12043+
12044+emulate:
12045+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12046+ regs->tpc = call_dl_resolve;
12047+ regs->tnpc = addr+4;
12048+ return 3;
12049+ }
12050+#endif
12051+
12052+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12053+ if ((save & 0xFFC00000U) == 0x05000000U &&
12054+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12055+ nop == 0x01000000U)
12056+ {
12057+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12058+ regs->u_regs[UREG_G2] = addr + 4;
12059+ addr = (save & 0x003FFFFFU) << 10;
12060+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12061+
12062+ if (test_thread_flag(TIF_32BIT))
12063+ addr &= 0xFFFFFFFFUL;
12064+
12065+ regs->tpc = addr;
12066+ regs->tnpc = addr+4;
12067+ return 3;
12068+ }
12069+
12070+ /* PaX: 64-bit PLT stub */
12071+ err = get_user(sethi1, (unsigned int *)addr);
12072+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12073+ err |= get_user(or1, (unsigned int *)(addr+8));
12074+ err |= get_user(or2, (unsigned int *)(addr+12));
12075+ err |= get_user(sllx, (unsigned int *)(addr+16));
12076+ err |= get_user(add, (unsigned int *)(addr+20));
12077+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12078+ err |= get_user(nop, (unsigned int *)(addr+28));
12079+ if (err)
12080+ break;
12081+
12082+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12083+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12084+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12085+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12086+ sllx == 0x89293020U &&
12087+ add == 0x8A010005U &&
12088+ jmpl == 0x89C14000U &&
12089+ nop == 0x01000000U)
12090+ {
12091+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12092+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12093+ regs->u_regs[UREG_G4] <<= 32;
12094+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12095+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12096+ regs->u_regs[UREG_G4] = addr + 24;
12097+ addr = regs->u_regs[UREG_G5];
12098+ regs->tpc = addr;
12099+ regs->tnpc = addr+4;
12100+ return 3;
12101+ }
12102+ }
12103+ } while (0);
12104+
12105+#ifdef CONFIG_PAX_DLRESOLVE
12106+ do { /* PaX: unpatched PLT emulation step 2 */
12107+ unsigned int save, call, nop;
12108+
12109+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12110+ err |= get_user(call, (unsigned int *)regs->tpc);
12111+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12112+ if (err)
12113+ break;
12114+
12115+ if (save == 0x9DE3BFA8U &&
12116+ (call & 0xC0000000U) == 0x40000000U &&
12117+ nop == 0x01000000U)
12118+ {
12119+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12120+
12121+ if (test_thread_flag(TIF_32BIT))
12122+ dl_resolve &= 0xFFFFFFFFUL;
12123+
12124+ regs->u_regs[UREG_RETPC] = regs->tpc;
12125+ regs->tpc = dl_resolve;
12126+ regs->tnpc = dl_resolve+4;
12127+ return 3;
12128+ }
12129+ } while (0);
12130+#endif
12131+
12132+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12133+ unsigned int sethi, ba, nop;
12134+
12135+ err = get_user(sethi, (unsigned int *)regs->tpc);
12136+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12137+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12138+
12139+ if (err)
12140+ break;
12141+
12142+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12143+ (ba & 0xFFF00000U) == 0x30600000U &&
12144+ nop == 0x01000000U)
12145+ {
12146+ unsigned long addr;
12147+
12148+ addr = (sethi & 0x003FFFFFU) << 10;
12149+ regs->u_regs[UREG_G1] = addr;
12150+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12151+
12152+ if (test_thread_flag(TIF_32BIT))
12153+ addr &= 0xFFFFFFFFUL;
12154+
12155+ regs->tpc = addr;
12156+ regs->tnpc = addr+4;
12157+ return 2;
12158+ }
12159+ } while (0);
12160+
12161+#endif
12162+
12163+ return 1;
12164+}
12165+
12166+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12167+{
12168+ unsigned long i;
12169+
12170+ printk(KERN_ERR "PAX: bytes at PC: ");
12171+ for (i = 0; i < 8; i++) {
12172+ unsigned int c;
12173+ if (get_user(c, (unsigned int *)pc+i))
12174+ printk(KERN_CONT "???????? ");
12175+ else
12176+ printk(KERN_CONT "%08x ", c);
12177+ }
12178+ printk("\n");
12179+}
12180+#endif
12181+
12182 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12183 {
12184 enum ctx_state prev_state = exception_enter();
12185@@ -353,6 +816,29 @@ retry:
12186 if (!vma)
12187 goto bad_area;
12188
12189+#ifdef CONFIG_PAX_PAGEEXEC
12190+ /* PaX: detect ITLB misses on non-exec pages */
12191+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12192+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12193+ {
12194+ if (address != regs->tpc)
12195+ goto good_area;
12196+
12197+ up_read(&mm->mmap_sem);
12198+ switch (pax_handle_fetch_fault(regs)) {
12199+
12200+#ifdef CONFIG_PAX_EMUPLT
12201+ case 2:
12202+ case 3:
12203+ return;
12204+#endif
12205+
12206+ }
12207+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12208+ do_group_exit(SIGKILL);
12209+ }
12210+#endif
12211+
12212 /* Pure DTLB misses do not tell us whether the fault causing
12213 * load/store/atomic was a write or not, it only says that there
12214 * was no match. So in such a case we (carefully) read the
12215diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12216index 4242eab..9ae6360 100644
12217--- a/arch/sparc/mm/hugetlbpage.c
12218+++ b/arch/sparc/mm/hugetlbpage.c
12219@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12220 unsigned long addr,
12221 unsigned long len,
12222 unsigned long pgoff,
12223- unsigned long flags)
12224+ unsigned long flags,
12225+ unsigned long offset)
12226 {
12227+ struct mm_struct *mm = current->mm;
12228 unsigned long task_size = TASK_SIZE;
12229 struct vm_unmapped_area_info info;
12230
12231@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12232
12233 info.flags = 0;
12234 info.length = len;
12235- info.low_limit = TASK_UNMAPPED_BASE;
12236+ info.low_limit = mm->mmap_base;
12237 info.high_limit = min(task_size, VA_EXCLUDE_START);
12238 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12239 info.align_offset = 0;
12240+ info.threadstack_offset = offset;
12241 addr = vm_unmapped_area(&info);
12242
12243 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12244 VM_BUG_ON(addr != -ENOMEM);
12245 info.low_limit = VA_EXCLUDE_END;
12246+
12247+#ifdef CONFIG_PAX_RANDMMAP
12248+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12249+ info.low_limit += mm->delta_mmap;
12250+#endif
12251+
12252 info.high_limit = task_size;
12253 addr = vm_unmapped_area(&info);
12254 }
12255@@ -55,7 +64,8 @@ static unsigned long
12256 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12257 const unsigned long len,
12258 const unsigned long pgoff,
12259- const unsigned long flags)
12260+ const unsigned long flags,
12261+ const unsigned long offset)
12262 {
12263 struct mm_struct *mm = current->mm;
12264 unsigned long addr = addr0;
12265@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12266 info.high_limit = mm->mmap_base;
12267 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12268 info.align_offset = 0;
12269+ info.threadstack_offset = offset;
12270 addr = vm_unmapped_area(&info);
12271
12272 /*
12273@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12274 VM_BUG_ON(addr != -ENOMEM);
12275 info.flags = 0;
12276 info.low_limit = TASK_UNMAPPED_BASE;
12277+
12278+#ifdef CONFIG_PAX_RANDMMAP
12279+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12280+ info.low_limit += mm->delta_mmap;
12281+#endif
12282+
12283 info.high_limit = STACK_TOP32;
12284 addr = vm_unmapped_area(&info);
12285 }
12286@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12287 struct mm_struct *mm = current->mm;
12288 struct vm_area_struct *vma;
12289 unsigned long task_size = TASK_SIZE;
12290+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12291
12292 if (test_thread_flag(TIF_32BIT))
12293 task_size = STACK_TOP32;
12294@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12295 return addr;
12296 }
12297
12298+#ifdef CONFIG_PAX_RANDMMAP
12299+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12300+#endif
12301+
12302 if (addr) {
12303 addr = ALIGN(addr, HPAGE_SIZE);
12304 vma = find_vma(mm, addr);
12305- if (task_size - len >= addr &&
12306- (!vma || addr + len <= vma->vm_start))
12307+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12308 return addr;
12309 }
12310 if (mm->get_unmapped_area == arch_get_unmapped_area)
12311 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12312- pgoff, flags);
12313+ pgoff, flags, offset);
12314 else
12315 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12316- pgoff, flags);
12317+ pgoff, flags, offset);
12318 }
12319
12320 pte_t *huge_pte_alloc(struct mm_struct *mm,
12321diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12322index 559cb74..9e5f097 100644
12323--- a/arch/sparc/mm/init_64.c
12324+++ b/arch/sparc/mm/init_64.c
12325@@ -187,9 +187,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12326 int num_kernel_image_mappings;
12327
12328 #ifdef CONFIG_DEBUG_DCFLUSH
12329-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12330+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12331 #ifdef CONFIG_SMP
12332-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12333+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12334 #endif
12335 #endif
12336
12337@@ -197,7 +197,7 @@ inline void flush_dcache_page_impl(struct page *page)
12338 {
12339 BUG_ON(tlb_type == hypervisor);
12340 #ifdef CONFIG_DEBUG_DCFLUSH
12341- atomic_inc(&dcpage_flushes);
12342+ atomic_inc_unchecked(&dcpage_flushes);
12343 #endif
12344
12345 #ifdef DCACHE_ALIASING_POSSIBLE
12346@@ -469,10 +469,10 @@ void mmu_info(struct seq_file *m)
12347
12348 #ifdef CONFIG_DEBUG_DCFLUSH
12349 seq_printf(m, "DCPageFlushes\t: %d\n",
12350- atomic_read(&dcpage_flushes));
12351+ atomic_read_unchecked(&dcpage_flushes));
12352 #ifdef CONFIG_SMP
12353 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12354- atomic_read(&dcpage_flushes_xcall));
12355+ atomic_read_unchecked(&dcpage_flushes_xcall));
12356 #endif /* CONFIG_SMP */
12357 #endif /* CONFIG_DEBUG_DCFLUSH */
12358 }
12359diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12360index a07e31b..85c9003 100644
12361--- a/arch/tile/Kconfig
12362+++ b/arch/tile/Kconfig
12363@@ -198,6 +198,7 @@ source "kernel/Kconfig.hz"
12364
12365 config KEXEC
12366 bool "kexec system call"
12367+ depends on !GRKERNSEC_KMEM
12368 ---help---
12369 kexec is a system call that implements the ability to shutdown your
12370 current kernel, and to start another kernel. It is like a reboot
12371diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12372index 7b11c5f..755a026 100644
12373--- a/arch/tile/include/asm/atomic_64.h
12374+++ b/arch/tile/include/asm/atomic_64.h
12375@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12376
12377 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12378
12379+#define atomic64_read_unchecked(v) atomic64_read(v)
12380+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12381+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12382+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12383+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12384+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12385+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12386+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12387+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12388+
12389 /* Define this to indicate that cmpxchg is an efficient operation. */
12390 #define __HAVE_ARCH_CMPXCHG
12391
12392diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12393index 6160761..00cac88 100644
12394--- a/arch/tile/include/asm/cache.h
12395+++ b/arch/tile/include/asm/cache.h
12396@@ -15,11 +15,12 @@
12397 #ifndef _ASM_TILE_CACHE_H
12398 #define _ASM_TILE_CACHE_H
12399
12400+#include <linux/const.h>
12401 #include <arch/chip.h>
12402
12403 /* bytes per L1 data cache line */
12404 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12405-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12406+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12407
12408 /* bytes per L2 cache line */
12409 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12410diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12411index f41cb53..31d3ab4 100644
12412--- a/arch/tile/include/asm/uaccess.h
12413+++ b/arch/tile/include/asm/uaccess.h
12414@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12415 const void __user *from,
12416 unsigned long n)
12417 {
12418- int sz = __compiletime_object_size(to);
12419+ size_t sz = __compiletime_object_size(to);
12420
12421- if (likely(sz == -1 || sz >= n))
12422+ if (likely(sz == (size_t)-1 || sz >= n))
12423 n = _copy_from_user(to, from, n);
12424 else
12425 copy_from_user_overflow();
12426diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12427index 8416240..a012fb7 100644
12428--- a/arch/tile/mm/hugetlbpage.c
12429+++ b/arch/tile/mm/hugetlbpage.c
12430@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12431 info.high_limit = TASK_SIZE;
12432 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12433 info.align_offset = 0;
12434+ info.threadstack_offset = 0;
12435 return vm_unmapped_area(&info);
12436 }
12437
12438@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12439 info.high_limit = current->mm->mmap_base;
12440 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12441 info.align_offset = 0;
12442+ info.threadstack_offset = 0;
12443 addr = vm_unmapped_area(&info);
12444
12445 /*
12446diff --git a/arch/um/Makefile b/arch/um/Makefile
12447index 17d4460..9d74338e3de4 100644
12448--- a/arch/um/Makefile
12449+++ b/arch/um/Makefile
12450@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12451 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12452 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12453
12454+ifdef CONSTIFY_PLUGIN
12455+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12456+endif
12457+
12458 #This will adjust *FLAGS accordingly to the platform.
12459 include $(ARCH_DIR)/Makefile-os-$(OS)
12460
12461diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12462index 19e1bdd..3665b77 100644
12463--- a/arch/um/include/asm/cache.h
12464+++ b/arch/um/include/asm/cache.h
12465@@ -1,6 +1,7 @@
12466 #ifndef __UM_CACHE_H
12467 #define __UM_CACHE_H
12468
12469+#include <linux/const.h>
12470
12471 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12472 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12473@@ -12,6 +13,6 @@
12474 # define L1_CACHE_SHIFT 5
12475 #endif
12476
12477-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12478+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12479
12480 #endif
12481diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12482index 2e0a6b1..a64d0f5 100644
12483--- a/arch/um/include/asm/kmap_types.h
12484+++ b/arch/um/include/asm/kmap_types.h
12485@@ -8,6 +8,6 @@
12486
12487 /* No more #include "asm/arch/kmap_types.h" ! */
12488
12489-#define KM_TYPE_NR 14
12490+#define KM_TYPE_NR 15
12491
12492 #endif
12493diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12494index 71c5d13..4c7b9f1 100644
12495--- a/arch/um/include/asm/page.h
12496+++ b/arch/um/include/asm/page.h
12497@@ -14,6 +14,9 @@
12498 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12499 #define PAGE_MASK (~(PAGE_SIZE-1))
12500
12501+#define ktla_ktva(addr) (addr)
12502+#define ktva_ktla(addr) (addr)
12503+
12504 #ifndef __ASSEMBLY__
12505
12506 struct page;
12507diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12508index 2b4274e..754fe06 100644
12509--- a/arch/um/include/asm/pgtable-3level.h
12510+++ b/arch/um/include/asm/pgtable-3level.h
12511@@ -58,6 +58,7 @@
12512 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12513 #define pud_populate(mm, pud, pmd) \
12514 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12515+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12516
12517 #ifdef CONFIG_64BIT
12518 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12519diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12520index 68b9119..f72353c 100644
12521--- a/arch/um/kernel/process.c
12522+++ b/arch/um/kernel/process.c
12523@@ -345,22 +345,6 @@ int singlestepping(void * t)
12524 return 2;
12525 }
12526
12527-/*
12528- * Only x86 and x86_64 have an arch_align_stack().
12529- * All other arches have "#define arch_align_stack(x) (x)"
12530- * in their asm/exec.h
12531- * As this is included in UML from asm-um/system-generic.h,
12532- * we can use it to behave as the subarch does.
12533- */
12534-#ifndef arch_align_stack
12535-unsigned long arch_align_stack(unsigned long sp)
12536-{
12537- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12538- sp -= get_random_int() % 8192;
12539- return sp & ~0xf;
12540-}
12541-#endif
12542-
12543 unsigned long get_wchan(struct task_struct *p)
12544 {
12545 unsigned long stack_page, sp, ip;
12546diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12547index ad8f795..2c7eec6 100644
12548--- a/arch/unicore32/include/asm/cache.h
12549+++ b/arch/unicore32/include/asm/cache.h
12550@@ -12,8 +12,10 @@
12551 #ifndef __UNICORE_CACHE_H__
12552 #define __UNICORE_CACHE_H__
12553
12554-#define L1_CACHE_SHIFT (5)
12555-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12556+#include <linux/const.h>
12557+
12558+#define L1_CACHE_SHIFT 5
12559+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12560
12561 /*
12562 * Memory returned by kmalloc() may be used for DMA, so we must make
12563diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12564index 226d569..d420edc 100644
12565--- a/arch/x86/Kconfig
12566+++ b/arch/x86/Kconfig
12567@@ -32,7 +32,7 @@ config X86
12568 select HAVE_AOUT if X86_32
12569 select HAVE_UNSTABLE_SCHED_CLOCK
12570 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
12571- select ARCH_SUPPORTS_INT128 if X86_64
12572+ select ARCH_SUPPORTS_INT128 if X86_64 && !PAX_SIZE_OVERFLOW
12573 select HAVE_IDE
12574 select HAVE_OPROFILE
12575 select HAVE_PCSPKR_PLATFORM
12576@@ -134,7 +134,7 @@ config X86
12577 select RTC_LIB
12578 select HAVE_DEBUG_STACKOVERFLOW
12579 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12580- select HAVE_CC_STACKPROTECTOR
12581+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12582 select GENERIC_CPU_AUTOPROBE
12583 select HAVE_ARCH_AUDITSYSCALL
12584 select ARCH_SUPPORTS_ATOMIC_RMW
12585@@ -266,7 +266,7 @@ config X86_HT
12586
12587 config X86_32_LAZY_GS
12588 def_bool y
12589- depends on X86_32 && !CC_STACKPROTECTOR
12590+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12591
12592 config ARCH_HWEIGHT_CFLAGS
12593 string
12594@@ -638,6 +638,7 @@ config SCHED_OMIT_FRAME_POINTER
12595
12596 menuconfig HYPERVISOR_GUEST
12597 bool "Linux guest support"
12598+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12599 ---help---
12600 Say Y here to enable options for running Linux under various hyper-
12601 visors. This option enables basic hypervisor detection and platform
12602@@ -1005,6 +1006,7 @@ config VM86
12603
12604 config X86_16BIT
12605 bool "Enable support for 16-bit segments" if EXPERT
12606+ depends on !GRKERNSEC
12607 default y
12608 ---help---
12609 This option is required by programs like Wine to run 16-bit
12610@@ -1178,6 +1180,7 @@ choice
12611
12612 config NOHIGHMEM
12613 bool "off"
12614+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12615 ---help---
12616 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12617 However, the address space of 32-bit x86 processors is only 4
12618@@ -1214,6 +1217,7 @@ config NOHIGHMEM
12619
12620 config HIGHMEM4G
12621 bool "4GB"
12622+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12623 ---help---
12624 Select this if you have a 32-bit processor and between 1 and 4
12625 gigabytes of physical RAM.
12626@@ -1266,7 +1270,7 @@ config PAGE_OFFSET
12627 hex
12628 default 0xB0000000 if VMSPLIT_3G_OPT
12629 default 0x80000000 if VMSPLIT_2G
12630- default 0x78000000 if VMSPLIT_2G_OPT
12631+ default 0x70000000 if VMSPLIT_2G_OPT
12632 default 0x40000000 if VMSPLIT_1G
12633 default 0xC0000000
12634 depends on X86_32
12635@@ -1717,6 +1721,7 @@ source kernel/Kconfig.hz
12636
12637 config KEXEC
12638 bool "kexec system call"
12639+ depends on !GRKERNSEC_KMEM
12640 ---help---
12641 kexec is a system call that implements the ability to shutdown your
12642 current kernel, and to start another kernel. It is like a reboot
12643@@ -1899,7 +1904,9 @@ config X86_NEED_RELOCS
12644
12645 config PHYSICAL_ALIGN
12646 hex "Alignment value to which kernel should be aligned"
12647- default "0x200000"
12648+ default "0x1000000"
12649+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12650+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12651 range 0x2000 0x1000000 if X86_32
12652 range 0x200000 0x1000000 if X86_64
12653 ---help---
12654@@ -1982,6 +1989,7 @@ config COMPAT_VDSO
12655 def_bool n
12656 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12657 depends on X86_32 || IA32_EMULATION
12658+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12659 ---help---
12660 Certain buggy versions of glibc will crash if they are
12661 presented with a 32-bit vDSO that is not mapped at the address
12662@@ -2046,6 +2054,22 @@ config CMDLINE_OVERRIDE
12663 This is used to work around broken boot loaders. This should
12664 be set to 'N' under normal conditions.
12665
12666+config DEFAULT_MODIFY_LDT_SYSCALL
12667+ bool "Allow userspace to modify the LDT by default"
12668+ default y
12669+
12670+ ---help---
12671+ Modifying the LDT (Local Descriptor Table) may be needed to run a
12672+ 16-bit or segmented code such as Dosemu or Wine. This is done via
12673+ a system call which is not needed to run portable applications,
12674+ and which can sometimes be abused to exploit some weaknesses of
12675+ the architecture, opening new vulnerabilities.
12676+
12677+ For this reason this option allows one to enable or disable the
12678+ feature at runtime. It is recommended to say 'N' here to leave
12679+ the system protected, and to enable it at runtime only if needed
12680+ by setting the sys.kernel.modify_ldt sysctl.
12681+
12682 source "kernel/livepatch/Kconfig"
12683
12684 endmenu
12685diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12686index 6983314..54ad7e8 100644
12687--- a/arch/x86/Kconfig.cpu
12688+++ b/arch/x86/Kconfig.cpu
12689@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12690
12691 config X86_F00F_BUG
12692 def_bool y
12693- depends on M586MMX || M586TSC || M586 || M486
12694+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12695
12696 config X86_INVD_BUG
12697 def_bool y
12698@@ -327,7 +327,7 @@ config X86_INVD_BUG
12699
12700 config X86_ALIGNMENT_16
12701 def_bool y
12702- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12703+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12704
12705 config X86_INTEL_USERCOPY
12706 def_bool y
12707@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12708 # generates cmov.
12709 config X86_CMOV
12710 def_bool y
12711- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12712+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12713
12714 config X86_MINIMUM_CPU_FAMILY
12715 int
12716diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12717index 72484a6..83a4411 100644
12718--- a/arch/x86/Kconfig.debug
12719+++ b/arch/x86/Kconfig.debug
12720@@ -89,7 +89,7 @@ config EFI_PGT_DUMP
12721 config DEBUG_RODATA
12722 bool "Write protect kernel read-only data structures"
12723 default y
12724- depends on DEBUG_KERNEL
12725+ depends on DEBUG_KERNEL && BROKEN
12726 ---help---
12727 Mark the kernel read-only data as write-protected in the pagetables,
12728 in order to catch accidental (and incorrect) writes to such const
12729@@ -107,7 +107,7 @@ config DEBUG_RODATA_TEST
12730
12731 config DEBUG_SET_MODULE_RONX
12732 bool "Set loadable kernel module data as NX and text as RO"
12733- depends on MODULES
12734+ depends on MODULES && BROKEN
12735 ---help---
12736 This option helps catch unintended modifications to loadable
12737 kernel module's text and read-only data. It also prevents execution
12738diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12739index 2fda005..2c72d40 100644
12740--- a/arch/x86/Makefile
12741+++ b/arch/x86/Makefile
12742@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12743 # CPU-specific tuning. Anything which can be shared with UML should go here.
12744 include arch/x86/Makefile_32.cpu
12745 KBUILD_CFLAGS += $(cflags-y)
12746-
12747- # temporary until string.h is fixed
12748- KBUILD_CFLAGS += -ffreestanding
12749 else
12750 BITS := 64
12751 UTS_MACHINE := x86_64
12752@@ -107,6 +104,9 @@ else
12753 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12754 endif
12755
12756+# temporary until string.h is fixed
12757+KBUILD_CFLAGS += -ffreestanding
12758+
12759 # Make sure compiler does not have buggy stack-protector support.
12760 ifdef CONFIG_CC_STACKPROTECTOR
12761 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12762@@ -181,6 +181,7 @@ archheaders:
12763 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12764
12765 archprepare:
12766+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12767 ifeq ($(CONFIG_KEXEC_FILE),y)
12768 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12769 endif
12770@@ -264,3 +265,9 @@ define archhelp
12771 echo ' FDARGS="..." arguments for the booted kernel'
12772 echo ' FDINITRD=file initrd for the booted kernel'
12773 endef
12774+
12775+define OLD_LD
12776+
12777+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12778+*** Please upgrade your binutils to 2.18 or newer
12779+endef
12780diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12781index 57bbf2f..b100fce 100644
12782--- a/arch/x86/boot/Makefile
12783+++ b/arch/x86/boot/Makefile
12784@@ -58,6 +58,9 @@ clean-files += cpustr.h
12785 # ---------------------------------------------------------------------------
12786
12787 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12788+ifdef CONSTIFY_PLUGIN
12789+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12790+endif
12791 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12792 GCOV_PROFILE := n
12793
12794diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12795index 878e4b9..20537ab 100644
12796--- a/arch/x86/boot/bitops.h
12797+++ b/arch/x86/boot/bitops.h
12798@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12799 u8 v;
12800 const u32 *p = (const u32 *)addr;
12801
12802- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12803+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12804 return v;
12805 }
12806
12807@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12808
12809 static inline void set_bit(int nr, void *addr)
12810 {
12811- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12812+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12813 }
12814
12815 #endif /* BOOT_BITOPS_H */
12816diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12817index bd49ec6..94c7f58 100644
12818--- a/arch/x86/boot/boot.h
12819+++ b/arch/x86/boot/boot.h
12820@@ -84,7 +84,7 @@ static inline void io_delay(void)
12821 static inline u16 ds(void)
12822 {
12823 u16 seg;
12824- asm("movw %%ds,%0" : "=rm" (seg));
12825+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12826 return seg;
12827 }
12828
12829diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12830index 0a291cd..9686efc 100644
12831--- a/arch/x86/boot/compressed/Makefile
12832+++ b/arch/x86/boot/compressed/Makefile
12833@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12834 KBUILD_CFLAGS += -mno-mmx -mno-sse
12835 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12836 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12837+ifdef CONSTIFY_PLUGIN
12838+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12839+endif
12840
12841 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12842 GCOV_PROFILE := n
12843diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12844index a53440e..c3dbf1e 100644
12845--- a/arch/x86/boot/compressed/efi_stub_32.S
12846+++ b/arch/x86/boot/compressed/efi_stub_32.S
12847@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12848 * parameter 2, ..., param n. To make things easy, we save the return
12849 * address of efi_call_phys in a global variable.
12850 */
12851- popl %ecx
12852- movl %ecx, saved_return_addr(%edx)
12853- /* get the function pointer into ECX*/
12854- popl %ecx
12855- movl %ecx, efi_rt_function_ptr(%edx)
12856+ popl saved_return_addr(%edx)
12857+ popl efi_rt_function_ptr(%edx)
12858
12859 /*
12860 * 3. Call the physical function.
12861 */
12862- call *%ecx
12863+ call *efi_rt_function_ptr(%edx)
12864
12865 /*
12866 * 4. Balance the stack. And because EAX contain the return value,
12867@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12868 1: popl %edx
12869 subl $1b, %edx
12870
12871- movl efi_rt_function_ptr(%edx), %ecx
12872- pushl %ecx
12873+ pushl efi_rt_function_ptr(%edx)
12874
12875 /*
12876 * 10. Push the saved return address onto the stack and return.
12877 */
12878- movl saved_return_addr(%edx), %ecx
12879- pushl %ecx
12880- ret
12881+ jmpl *saved_return_addr(%edx)
12882 ENDPROC(efi_call_phys)
12883 .previous
12884
12885diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12886index 630384a..278e788 100644
12887--- a/arch/x86/boot/compressed/efi_thunk_64.S
12888+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12889@@ -189,8 +189,8 @@ efi_gdt64:
12890 .long 0 /* Filled out by user */
12891 .word 0
12892 .quad 0x0000000000000000 /* NULL descriptor */
12893- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12894- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12895+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12896+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12897 .quad 0x0080890000000000 /* TS descriptor */
12898 .quad 0x0000000000000000 /* TS continued */
12899 efi_gdt64_end:
12900diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12901index 8ef964d..fcfb8aa 100644
12902--- a/arch/x86/boot/compressed/head_32.S
12903+++ b/arch/x86/boot/compressed/head_32.S
12904@@ -141,10 +141,10 @@ preferred_addr:
12905 addl %eax, %ebx
12906 notl %eax
12907 andl %eax, %ebx
12908- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12909+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12910 jge 1f
12911 #endif
12912- movl $LOAD_PHYSICAL_ADDR, %ebx
12913+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12914 1:
12915
12916 /* Target address to relocate to for decompression */
12917diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12918index b0c0d16..3b44ff8 100644
12919--- a/arch/x86/boot/compressed/head_64.S
12920+++ b/arch/x86/boot/compressed/head_64.S
12921@@ -95,10 +95,10 @@ ENTRY(startup_32)
12922 addl %eax, %ebx
12923 notl %eax
12924 andl %eax, %ebx
12925- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12926+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12927 jge 1f
12928 #endif
12929- movl $LOAD_PHYSICAL_ADDR, %ebx
12930+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12931 1:
12932
12933 /* Target address to relocate to for decompression */
12934@@ -323,10 +323,10 @@ preferred_addr:
12935 addq %rax, %rbp
12936 notq %rax
12937 andq %rax, %rbp
12938- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12939+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12940 jge 1f
12941 #endif
12942- movq $LOAD_PHYSICAL_ADDR, %rbp
12943+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12944 1:
12945
12946 /* Target address to relocate to for decompression */
12947@@ -435,8 +435,8 @@ gdt:
12948 .long gdt
12949 .word 0
12950 .quad 0x0000000000000000 /* NULL descriptor */
12951- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12952- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12953+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12954+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12955 .quad 0x0080890000000000 /* TS descriptor */
12956 .quad 0x0000000000000000 /* TS continued */
12957 gdt_end:
12958diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12959index a107b93..55602de 100644
12960--- a/arch/x86/boot/compressed/misc.c
12961+++ b/arch/x86/boot/compressed/misc.c
12962@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12963 * Calculate the delta between where vmlinux was linked to load
12964 * and where it was actually loaded.
12965 */
12966- delta = min_addr - LOAD_PHYSICAL_ADDR;
12967+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12968 if (!delta) {
12969 debug_putstr("No relocation needed... ");
12970 return;
12971@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12972 Elf32_Ehdr ehdr;
12973 Elf32_Phdr *phdrs, *phdr;
12974 #endif
12975- void *dest;
12976+ void *dest, *prev;
12977 int i;
12978
12979 memcpy(&ehdr, output, sizeof(ehdr));
12980@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12981 case PT_LOAD:
12982 #ifdef CONFIG_RELOCATABLE
12983 dest = output;
12984- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12985+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12986 #else
12987 dest = (void *)(phdr->p_paddr);
12988 #endif
12989 memcpy(dest,
12990 output + phdr->p_offset,
12991 phdr->p_filesz);
12992+ if (i)
12993+ memset(prev, 0xff, dest - prev);
12994+ prev = dest + phdr->p_filesz;
12995 break;
12996 default: /* Ignore other PT_* */ break;
12997 }
12998@@ -419,7 +422,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12999 error("Destination address too large");
13000 #endif
13001 #ifndef CONFIG_RELOCATABLE
13002- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
13003+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
13004 error("Wrong destination address");
13005 #endif
13006
13007diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
13008index 1fd7d57..0f7d096 100644
13009--- a/arch/x86/boot/cpucheck.c
13010+++ b/arch/x86/boot/cpucheck.c
13011@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13012 u32 ecx = MSR_K7_HWCR;
13013 u32 eax, edx;
13014
13015- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13016+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13017 eax &= ~(1 << 15);
13018- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13019+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13020
13021 get_cpuflags(); /* Make sure it really did something */
13022 err = check_cpuflags();
13023@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13024 u32 ecx = MSR_VIA_FCR;
13025 u32 eax, edx;
13026
13027- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13028+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13029 eax |= (1<<1)|(1<<7);
13030- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13031+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13032
13033 set_bit(X86_FEATURE_CX8, cpu.flags);
13034 err = check_cpuflags();
13035@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13036 u32 eax, edx;
13037 u32 level = 1;
13038
13039- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13040- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13041- asm("cpuid"
13042+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13043+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13044+ asm volatile("cpuid"
13045 : "+a" (level), "=d" (cpu.flags[0])
13046 : : "ecx", "ebx");
13047- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13048+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13049
13050 err = check_cpuflags();
13051 } else if (err == 0x01 &&
13052diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
13053index 16ef025..91e033b 100644
13054--- a/arch/x86/boot/header.S
13055+++ b/arch/x86/boot/header.S
13056@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
13057 # single linked list of
13058 # struct setup_data
13059
13060-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
13061+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
13062
13063 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
13064+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13065+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
13066+#else
13067 #define VO_INIT_SIZE (VO__end - VO__text)
13068+#endif
13069 #if ZO_INIT_SIZE > VO_INIT_SIZE
13070 #define INIT_SIZE ZO_INIT_SIZE
13071 #else
13072diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13073index db75d07..8e6d0af 100644
13074--- a/arch/x86/boot/memory.c
13075+++ b/arch/x86/boot/memory.c
13076@@ -19,7 +19,7 @@
13077
13078 static int detect_memory_e820(void)
13079 {
13080- int count = 0;
13081+ unsigned int count = 0;
13082 struct biosregs ireg, oreg;
13083 struct e820entry *desc = boot_params.e820_map;
13084 static struct e820entry buf; /* static so it is zeroed */
13085diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13086index ba3e100..6501b8f 100644
13087--- a/arch/x86/boot/video-vesa.c
13088+++ b/arch/x86/boot/video-vesa.c
13089@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13090
13091 boot_params.screen_info.vesapm_seg = oreg.es;
13092 boot_params.screen_info.vesapm_off = oreg.di;
13093+ boot_params.screen_info.vesapm_size = oreg.cx;
13094 }
13095
13096 /*
13097diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13098index 05111bb..a1ae1f0 100644
13099--- a/arch/x86/boot/video.c
13100+++ b/arch/x86/boot/video.c
13101@@ -98,7 +98,7 @@ static void store_mode_params(void)
13102 static unsigned int get_entry(void)
13103 {
13104 char entry_buf[4];
13105- int i, len = 0;
13106+ unsigned int i, len = 0;
13107 int key;
13108 unsigned int v;
13109
13110diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13111index 9105655..41779c1 100644
13112--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13113+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13114@@ -8,6 +8,8 @@
13115 * including this sentence is retained in full.
13116 */
13117
13118+#include <asm/alternative-asm.h>
13119+
13120 .extern crypto_ft_tab
13121 .extern crypto_it_tab
13122 .extern crypto_fl_tab
13123@@ -70,6 +72,8 @@
13124 je B192; \
13125 leaq 32(r9),r9;
13126
13127+#define ret pax_force_retaddr; ret
13128+
13129 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13130 movq r1,r2; \
13131 movq r3,r4; \
13132diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13133index 6bd2c6c..368c93e 100644
13134--- a/arch/x86/crypto/aesni-intel_asm.S
13135+++ b/arch/x86/crypto/aesni-intel_asm.S
13136@@ -31,6 +31,7 @@
13137
13138 #include <linux/linkage.h>
13139 #include <asm/inst.h>
13140+#include <asm/alternative-asm.h>
13141
13142 /*
13143 * The following macros are used to move an (un)aligned 16 byte value to/from
13144@@ -217,7 +218,7 @@ enc: .octa 0x2
13145 * num_initial_blocks = b mod 4
13146 * encrypt the initial num_initial_blocks blocks and apply ghash on
13147 * the ciphertext
13148-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13149+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13150 * are clobbered
13151 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13152 */
13153@@ -227,8 +228,8 @@ enc: .octa 0x2
13154 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13155 MOVADQ SHUF_MASK(%rip), %xmm14
13156 mov arg7, %r10 # %r10 = AAD
13157- mov arg8, %r12 # %r12 = aadLen
13158- mov %r12, %r11
13159+ mov arg8, %r15 # %r15 = aadLen
13160+ mov %r15, %r11
13161 pxor %xmm\i, %xmm\i
13162
13163 _get_AAD_loop\num_initial_blocks\operation:
13164@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13165 psrldq $4, %xmm\i
13166 pxor \TMP1, %xmm\i
13167 add $4, %r10
13168- sub $4, %r12
13169+ sub $4, %r15
13170 jne _get_AAD_loop\num_initial_blocks\operation
13171
13172 cmp $16, %r11
13173 je _get_AAD_loop2_done\num_initial_blocks\operation
13174
13175- mov $16, %r12
13176+ mov $16, %r15
13177 _get_AAD_loop2\num_initial_blocks\operation:
13178 psrldq $4, %xmm\i
13179- sub $4, %r12
13180- cmp %r11, %r12
13181+ sub $4, %r15
13182+ cmp %r11, %r15
13183 jne _get_AAD_loop2\num_initial_blocks\operation
13184
13185 _get_AAD_loop2_done\num_initial_blocks\operation:
13186@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13187 * num_initial_blocks = b mod 4
13188 * encrypt the initial num_initial_blocks blocks and apply ghash on
13189 * the ciphertext
13190-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13191+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13192 * are clobbered
13193 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13194 */
13195@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13196 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13197 MOVADQ SHUF_MASK(%rip), %xmm14
13198 mov arg7, %r10 # %r10 = AAD
13199- mov arg8, %r12 # %r12 = aadLen
13200- mov %r12, %r11
13201+ mov arg8, %r15 # %r15 = aadLen
13202+ mov %r15, %r11
13203 pxor %xmm\i, %xmm\i
13204 _get_AAD_loop\num_initial_blocks\operation:
13205 movd (%r10), \TMP1
13206@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13207 psrldq $4, %xmm\i
13208 pxor \TMP1, %xmm\i
13209 add $4, %r10
13210- sub $4, %r12
13211+ sub $4, %r15
13212 jne _get_AAD_loop\num_initial_blocks\operation
13213 cmp $16, %r11
13214 je _get_AAD_loop2_done\num_initial_blocks\operation
13215- mov $16, %r12
13216+ mov $16, %r15
13217 _get_AAD_loop2\num_initial_blocks\operation:
13218 psrldq $4, %xmm\i
13219- sub $4, %r12
13220- cmp %r11, %r12
13221+ sub $4, %r15
13222+ cmp %r11, %r15
13223 jne _get_AAD_loop2\num_initial_blocks\operation
13224 _get_AAD_loop2_done\num_initial_blocks\operation:
13225 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13226@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13227 *
13228 *****************************************************************************/
13229 ENTRY(aesni_gcm_dec)
13230- push %r12
13231+ push %r15
13232 push %r13
13233 push %r14
13234 mov %rsp, %r14
13235@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13236 */
13237 sub $VARIABLE_OFFSET, %rsp
13238 and $~63, %rsp # align rsp to 64 bytes
13239- mov %arg6, %r12
13240- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13241+ mov %arg6, %r15
13242+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13243 movdqa SHUF_MASK(%rip), %xmm2
13244 PSHUFB_XMM %xmm2, %xmm13
13245
13246@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13247 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13248 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13249 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13250- mov %r13, %r12
13251- and $(3<<4), %r12
13252+ mov %r13, %r15
13253+ and $(3<<4), %r15
13254 jz _initial_num_blocks_is_0_decrypt
13255- cmp $(2<<4), %r12
13256+ cmp $(2<<4), %r15
13257 jb _initial_num_blocks_is_1_decrypt
13258 je _initial_num_blocks_is_2_decrypt
13259 _initial_num_blocks_is_3_decrypt:
13260@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13261 sub $16, %r11
13262 add %r13, %r11
13263 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13264- lea SHIFT_MASK+16(%rip), %r12
13265- sub %r13, %r12
13266+ lea SHIFT_MASK+16(%rip), %r15
13267+ sub %r13, %r15
13268 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13269 # (%r13 is the number of bytes in plaintext mod 16)
13270- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13271+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13272 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13273
13274 movdqa %xmm1, %xmm2
13275 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13276- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13277+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13278 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13279 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13280 pand %xmm1, %xmm2
13281@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13282 sub $1, %r13
13283 jne _less_than_8_bytes_left_decrypt
13284 _multiple_of_16_bytes_decrypt:
13285- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13286- shl $3, %r12 # convert into number of bits
13287- movd %r12d, %xmm15 # len(A) in %xmm15
13288+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13289+ shl $3, %r15 # convert into number of bits
13290+ movd %r15d, %xmm15 # len(A) in %xmm15
13291 shl $3, %arg4 # len(C) in bits (*128)
13292 MOVQ_R64_XMM %arg4, %xmm1
13293 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13294@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13295 mov %r14, %rsp
13296 pop %r14
13297 pop %r13
13298- pop %r12
13299+ pop %r15
13300+ pax_force_retaddr
13301 ret
13302 ENDPROC(aesni_gcm_dec)
13303
13304@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13305 * poly = x^128 + x^127 + x^126 + x^121 + 1
13306 ***************************************************************************/
13307 ENTRY(aesni_gcm_enc)
13308- push %r12
13309+ push %r15
13310 push %r13
13311 push %r14
13312 mov %rsp, %r14
13313@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13314 #
13315 sub $VARIABLE_OFFSET, %rsp
13316 and $~63, %rsp
13317- mov %arg6, %r12
13318- movdqu (%r12), %xmm13
13319+ mov %arg6, %r15
13320+ movdqu (%r15), %xmm13
13321 movdqa SHUF_MASK(%rip), %xmm2
13322 PSHUFB_XMM %xmm2, %xmm13
13323
13324@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13325 movdqa %xmm13, HashKey(%rsp)
13326 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13327 and $-16, %r13
13328- mov %r13, %r12
13329+ mov %r13, %r15
13330
13331 # Encrypt first few blocks
13332
13333- and $(3<<4), %r12
13334+ and $(3<<4), %r15
13335 jz _initial_num_blocks_is_0_encrypt
13336- cmp $(2<<4), %r12
13337+ cmp $(2<<4), %r15
13338 jb _initial_num_blocks_is_1_encrypt
13339 je _initial_num_blocks_is_2_encrypt
13340 _initial_num_blocks_is_3_encrypt:
13341@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13342 sub $16, %r11
13343 add %r13, %r11
13344 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13345- lea SHIFT_MASK+16(%rip), %r12
13346- sub %r13, %r12
13347+ lea SHIFT_MASK+16(%rip), %r15
13348+ sub %r13, %r15
13349 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13350 # (%r13 is the number of bytes in plaintext mod 16)
13351- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13352+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13353 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13354 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13355- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13356+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13357 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13358 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13359 movdqa SHUF_MASK(%rip), %xmm10
13360@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13361 sub $1, %r13
13362 jne _less_than_8_bytes_left_encrypt
13363 _multiple_of_16_bytes_encrypt:
13364- mov arg8, %r12 # %r12 = addLen (number of bytes)
13365- shl $3, %r12
13366- movd %r12d, %xmm15 # len(A) in %xmm15
13367+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13368+ shl $3, %r15
13369+ movd %r15d, %xmm15 # len(A) in %xmm15
13370 shl $3, %arg4 # len(C) in bits (*128)
13371 MOVQ_R64_XMM %arg4, %xmm1
13372 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13373@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13374 mov %r14, %rsp
13375 pop %r14
13376 pop %r13
13377- pop %r12
13378+ pop %r15
13379+ pax_force_retaddr
13380 ret
13381 ENDPROC(aesni_gcm_enc)
13382
13383@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13384 pxor %xmm1, %xmm0
13385 movaps %xmm0, (TKEYP)
13386 add $0x10, TKEYP
13387+ pax_force_retaddr
13388 ret
13389 ENDPROC(_key_expansion_128)
13390 ENDPROC(_key_expansion_256a)
13391@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13392 shufps $0b01001110, %xmm2, %xmm1
13393 movaps %xmm1, 0x10(TKEYP)
13394 add $0x20, TKEYP
13395+ pax_force_retaddr
13396 ret
13397 ENDPROC(_key_expansion_192a)
13398
13399@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13400
13401 movaps %xmm0, (TKEYP)
13402 add $0x10, TKEYP
13403+ pax_force_retaddr
13404 ret
13405 ENDPROC(_key_expansion_192b)
13406
13407@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13408 pxor %xmm1, %xmm2
13409 movaps %xmm2, (TKEYP)
13410 add $0x10, TKEYP
13411+ pax_force_retaddr
13412 ret
13413 ENDPROC(_key_expansion_256b)
13414
13415@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13416 #ifndef __x86_64__
13417 popl KEYP
13418 #endif
13419+ pax_force_retaddr
13420 ret
13421 ENDPROC(aesni_set_key)
13422
13423@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13424 popl KLEN
13425 popl KEYP
13426 #endif
13427+ pax_force_retaddr
13428 ret
13429 ENDPROC(aesni_enc)
13430
13431@@ -1985,6 +1994,7 @@ _aesni_enc1:
13432 AESENC KEY STATE
13433 movaps 0x70(TKEYP), KEY
13434 AESENCLAST KEY STATE
13435+ pax_force_retaddr
13436 ret
13437 ENDPROC(_aesni_enc1)
13438
13439@@ -2094,6 +2104,7 @@ _aesni_enc4:
13440 AESENCLAST KEY STATE2
13441 AESENCLAST KEY STATE3
13442 AESENCLAST KEY STATE4
13443+ pax_force_retaddr
13444 ret
13445 ENDPROC(_aesni_enc4)
13446
13447@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13448 popl KLEN
13449 popl KEYP
13450 #endif
13451+ pax_force_retaddr
13452 ret
13453 ENDPROC(aesni_dec)
13454
13455@@ -2175,6 +2187,7 @@ _aesni_dec1:
13456 AESDEC KEY STATE
13457 movaps 0x70(TKEYP), KEY
13458 AESDECLAST KEY STATE
13459+ pax_force_retaddr
13460 ret
13461 ENDPROC(_aesni_dec1)
13462
13463@@ -2284,6 +2297,7 @@ _aesni_dec4:
13464 AESDECLAST KEY STATE2
13465 AESDECLAST KEY STATE3
13466 AESDECLAST KEY STATE4
13467+ pax_force_retaddr
13468 ret
13469 ENDPROC(_aesni_dec4)
13470
13471@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13472 popl KEYP
13473 popl LEN
13474 #endif
13475+ pax_force_retaddr
13476 ret
13477 ENDPROC(aesni_ecb_enc)
13478
13479@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13480 popl KEYP
13481 popl LEN
13482 #endif
13483+ pax_force_retaddr
13484 ret
13485 ENDPROC(aesni_ecb_dec)
13486
13487@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13488 popl LEN
13489 popl IVP
13490 #endif
13491+ pax_force_retaddr
13492 ret
13493 ENDPROC(aesni_cbc_enc)
13494
13495@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13496 popl LEN
13497 popl IVP
13498 #endif
13499+ pax_force_retaddr
13500 ret
13501 ENDPROC(aesni_cbc_dec)
13502
13503@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13504 mov $1, TCTR_LOW
13505 MOVQ_R64_XMM TCTR_LOW INC
13506 MOVQ_R64_XMM CTR TCTR_LOW
13507+ pax_force_retaddr
13508 ret
13509 ENDPROC(_aesni_inc_init)
13510
13511@@ -2590,6 +2609,7 @@ _aesni_inc:
13512 .Linc_low:
13513 movaps CTR, IV
13514 PSHUFB_XMM BSWAP_MASK IV
13515+ pax_force_retaddr
13516 ret
13517 ENDPROC(_aesni_inc)
13518
13519@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13520 .Lctr_enc_ret:
13521 movups IV, (IVP)
13522 .Lctr_enc_just_ret:
13523+ pax_force_retaddr
13524 ret
13525 ENDPROC(aesni_ctr_enc)
13526
13527@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13528 pxor INC, STATE4
13529 movdqu STATE4, 0x70(OUTP)
13530
13531+ pax_force_retaddr
13532 ret
13533 ENDPROC(aesni_xts_crypt8)
13534
13535diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13536index 246c670..466e2d6 100644
13537--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13538+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13539@@ -21,6 +21,7 @@
13540 */
13541
13542 #include <linux/linkage.h>
13543+#include <asm/alternative-asm.h>
13544
13545 .file "blowfish-x86_64-asm.S"
13546 .text
13547@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13548 jnz .L__enc_xor;
13549
13550 write_block();
13551+ pax_force_retaddr
13552 ret;
13553 .L__enc_xor:
13554 xor_block();
13555+ pax_force_retaddr
13556 ret;
13557 ENDPROC(__blowfish_enc_blk)
13558
13559@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13560
13561 movq %r11, %rbp;
13562
13563+ pax_force_retaddr
13564 ret;
13565 ENDPROC(blowfish_dec_blk)
13566
13567@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13568
13569 popq %rbx;
13570 popq %rbp;
13571+ pax_force_retaddr
13572 ret;
13573
13574 .L__enc_xor4:
13575@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13576
13577 popq %rbx;
13578 popq %rbp;
13579+ pax_force_retaddr
13580 ret;
13581 ENDPROC(__blowfish_enc_blk_4way)
13582
13583@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13584 popq %rbx;
13585 popq %rbp;
13586
13587+ pax_force_retaddr
13588 ret;
13589 ENDPROC(blowfish_dec_blk_4way)
13590diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13591index ce71f92..1dce7ec 100644
13592--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13593+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13594@@ -16,6 +16,7 @@
13595 */
13596
13597 #include <linux/linkage.h>
13598+#include <asm/alternative-asm.h>
13599
13600 #define CAMELLIA_TABLE_BYTE_LEN 272
13601
13602@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13603 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13604 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13605 %rcx, (%r9));
13606+ pax_force_retaddr
13607 ret;
13608 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13609
13610@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13611 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13612 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13613 %rax, (%r9));
13614+ pax_force_retaddr
13615 ret;
13616 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13617
13618@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13619 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13620 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13621
13622+ pax_force_retaddr
13623 ret;
13624
13625 .align 8
13626@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13627 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13628 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13629
13630+ pax_force_retaddr
13631 ret;
13632
13633 .align 8
13634@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13635 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13636 %xmm8, %rsi);
13637
13638+ pax_force_retaddr
13639 ret;
13640 ENDPROC(camellia_ecb_enc_16way)
13641
13642@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13643 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13644 %xmm8, %rsi);
13645
13646+ pax_force_retaddr
13647 ret;
13648 ENDPROC(camellia_ecb_dec_16way)
13649
13650@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13651 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13652 %xmm8, %rsi);
13653
13654+ pax_force_retaddr
13655 ret;
13656 ENDPROC(camellia_cbc_dec_16way)
13657
13658@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13659 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13660 %xmm8, %rsi);
13661
13662+ pax_force_retaddr
13663 ret;
13664 ENDPROC(camellia_ctr_16way)
13665
13666@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13667 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13668 %xmm8, %rsi);
13669
13670+ pax_force_retaddr
13671 ret;
13672 ENDPROC(camellia_xts_crypt_16way)
13673
13674diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13675index 0e0b886..5a3123c 100644
13676--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13677+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13678@@ -11,6 +11,7 @@
13679 */
13680
13681 #include <linux/linkage.h>
13682+#include <asm/alternative-asm.h>
13683
13684 #define CAMELLIA_TABLE_BYTE_LEN 272
13685
13686@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13687 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13688 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13689 %rcx, (%r9));
13690+ pax_force_retaddr
13691 ret;
13692 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13693
13694@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13695 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13696 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13697 %rax, (%r9));
13698+ pax_force_retaddr
13699 ret;
13700 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13701
13702@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13703 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13704 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13705
13706+ pax_force_retaddr
13707 ret;
13708
13709 .align 8
13710@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13711 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13712 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13713
13714+ pax_force_retaddr
13715 ret;
13716
13717 .align 8
13718@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13719
13720 vzeroupper;
13721
13722+ pax_force_retaddr
13723 ret;
13724 ENDPROC(camellia_ecb_enc_32way)
13725
13726@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13727
13728 vzeroupper;
13729
13730+ pax_force_retaddr
13731 ret;
13732 ENDPROC(camellia_ecb_dec_32way)
13733
13734@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13735
13736 vzeroupper;
13737
13738+ pax_force_retaddr
13739 ret;
13740 ENDPROC(camellia_cbc_dec_32way)
13741
13742@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13743
13744 vzeroupper;
13745
13746+ pax_force_retaddr
13747 ret;
13748 ENDPROC(camellia_ctr_32way)
13749
13750@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13751
13752 vzeroupper;
13753
13754+ pax_force_retaddr
13755 ret;
13756 ENDPROC(camellia_xts_crypt_32way)
13757
13758diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13759index 310319c..db3d7b5 100644
13760--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13761+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13762@@ -21,6 +21,7 @@
13763 */
13764
13765 #include <linux/linkage.h>
13766+#include <asm/alternative-asm.h>
13767
13768 .file "camellia-x86_64-asm_64.S"
13769 .text
13770@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13771 enc_outunpack(mov, RT1);
13772
13773 movq RRBP, %rbp;
13774+ pax_force_retaddr
13775 ret;
13776
13777 .L__enc_xor:
13778 enc_outunpack(xor, RT1);
13779
13780 movq RRBP, %rbp;
13781+ pax_force_retaddr
13782 ret;
13783 ENDPROC(__camellia_enc_blk)
13784
13785@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13786 dec_outunpack();
13787
13788 movq RRBP, %rbp;
13789+ pax_force_retaddr
13790 ret;
13791 ENDPROC(camellia_dec_blk)
13792
13793@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13794
13795 movq RRBP, %rbp;
13796 popq %rbx;
13797+ pax_force_retaddr
13798 ret;
13799
13800 .L__enc2_xor:
13801@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13802
13803 movq RRBP, %rbp;
13804 popq %rbx;
13805+ pax_force_retaddr
13806 ret;
13807 ENDPROC(__camellia_enc_blk_2way)
13808
13809@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13810
13811 movq RRBP, %rbp;
13812 movq RXOR, %rbx;
13813+ pax_force_retaddr
13814 ret;
13815 ENDPROC(camellia_dec_blk_2way)
13816diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13817index c35fd5d..2d8c7db 100644
13818--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13819+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13820@@ -24,6 +24,7 @@
13821 */
13822
13823 #include <linux/linkage.h>
13824+#include <asm/alternative-asm.h>
13825
13826 .file "cast5-avx-x86_64-asm_64.S"
13827
13828@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13829 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13830 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13831
13832+ pax_force_retaddr
13833 ret;
13834 ENDPROC(__cast5_enc_blk16)
13835
13836@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13837 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13838 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13839
13840+ pax_force_retaddr
13841 ret;
13842
13843 .L__skip_dec:
13844@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13845 vmovdqu RR4, (6*4*4)(%r11);
13846 vmovdqu RL4, (7*4*4)(%r11);
13847
13848+ pax_force_retaddr
13849 ret;
13850 ENDPROC(cast5_ecb_enc_16way)
13851
13852@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13853 vmovdqu RR4, (6*4*4)(%r11);
13854 vmovdqu RL4, (7*4*4)(%r11);
13855
13856+ pax_force_retaddr
13857 ret;
13858 ENDPROC(cast5_ecb_dec_16way)
13859
13860@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13861 * %rdx: src
13862 */
13863
13864- pushq %r12;
13865+ pushq %r14;
13866
13867 movq %rsi, %r11;
13868- movq %rdx, %r12;
13869+ movq %rdx, %r14;
13870
13871 vmovdqu (0*16)(%rdx), RL1;
13872 vmovdqu (1*16)(%rdx), RR1;
13873@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13874 call __cast5_dec_blk16;
13875
13876 /* xor with src */
13877- vmovq (%r12), RX;
13878+ vmovq (%r14), RX;
13879 vpshufd $0x4f, RX, RX;
13880 vpxor RX, RR1, RR1;
13881- vpxor 0*16+8(%r12), RL1, RL1;
13882- vpxor 1*16+8(%r12), RR2, RR2;
13883- vpxor 2*16+8(%r12), RL2, RL2;
13884- vpxor 3*16+8(%r12), RR3, RR3;
13885- vpxor 4*16+8(%r12), RL3, RL3;
13886- vpxor 5*16+8(%r12), RR4, RR4;
13887- vpxor 6*16+8(%r12), RL4, RL4;
13888+ vpxor 0*16+8(%r14), RL1, RL1;
13889+ vpxor 1*16+8(%r14), RR2, RR2;
13890+ vpxor 2*16+8(%r14), RL2, RL2;
13891+ vpxor 3*16+8(%r14), RR3, RR3;
13892+ vpxor 4*16+8(%r14), RL3, RL3;
13893+ vpxor 5*16+8(%r14), RR4, RR4;
13894+ vpxor 6*16+8(%r14), RL4, RL4;
13895
13896 vmovdqu RR1, (0*16)(%r11);
13897 vmovdqu RL1, (1*16)(%r11);
13898@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13899 vmovdqu RR4, (6*16)(%r11);
13900 vmovdqu RL4, (7*16)(%r11);
13901
13902- popq %r12;
13903+ popq %r14;
13904
13905+ pax_force_retaddr
13906 ret;
13907 ENDPROC(cast5_cbc_dec_16way)
13908
13909@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13910 * %rcx: iv (big endian, 64bit)
13911 */
13912
13913- pushq %r12;
13914+ pushq %r14;
13915
13916 movq %rsi, %r11;
13917- movq %rdx, %r12;
13918+ movq %rdx, %r14;
13919
13920 vpcmpeqd RTMP, RTMP, RTMP;
13921 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13922@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13923 call __cast5_enc_blk16;
13924
13925 /* dst = src ^ iv */
13926- vpxor (0*16)(%r12), RR1, RR1;
13927- vpxor (1*16)(%r12), RL1, RL1;
13928- vpxor (2*16)(%r12), RR2, RR2;
13929- vpxor (3*16)(%r12), RL2, RL2;
13930- vpxor (4*16)(%r12), RR3, RR3;
13931- vpxor (5*16)(%r12), RL3, RL3;
13932- vpxor (6*16)(%r12), RR4, RR4;
13933- vpxor (7*16)(%r12), RL4, RL4;
13934+ vpxor (0*16)(%r14), RR1, RR1;
13935+ vpxor (1*16)(%r14), RL1, RL1;
13936+ vpxor (2*16)(%r14), RR2, RR2;
13937+ vpxor (3*16)(%r14), RL2, RL2;
13938+ vpxor (4*16)(%r14), RR3, RR3;
13939+ vpxor (5*16)(%r14), RL3, RL3;
13940+ vpxor (6*16)(%r14), RR4, RR4;
13941+ vpxor (7*16)(%r14), RL4, RL4;
13942 vmovdqu RR1, (0*16)(%r11);
13943 vmovdqu RL1, (1*16)(%r11);
13944 vmovdqu RR2, (2*16)(%r11);
13945@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13946 vmovdqu RR4, (6*16)(%r11);
13947 vmovdqu RL4, (7*16)(%r11);
13948
13949- popq %r12;
13950+ popq %r14;
13951
13952+ pax_force_retaddr
13953 ret;
13954 ENDPROC(cast5_ctr_16way)
13955diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13956index e3531f8..e123f35 100644
13957--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13958+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13959@@ -24,6 +24,7 @@
13960 */
13961
13962 #include <linux/linkage.h>
13963+#include <asm/alternative-asm.h>
13964 #include "glue_helper-asm-avx.S"
13965
13966 .file "cast6-avx-x86_64-asm_64.S"
13967@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13968 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13969 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13970
13971+ pax_force_retaddr
13972 ret;
13973 ENDPROC(__cast6_enc_blk8)
13974
13975@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13976 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13977 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13978
13979+ pax_force_retaddr
13980 ret;
13981 ENDPROC(__cast6_dec_blk8)
13982
13983@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13984
13985 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13986
13987+ pax_force_retaddr
13988 ret;
13989 ENDPROC(cast6_ecb_enc_8way)
13990
13991@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13992
13993 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13994
13995+ pax_force_retaddr
13996 ret;
13997 ENDPROC(cast6_ecb_dec_8way)
13998
13999@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
14000 * %rdx: src
14001 */
14002
14003- pushq %r12;
14004+ pushq %r14;
14005
14006 movq %rsi, %r11;
14007- movq %rdx, %r12;
14008+ movq %rdx, %r14;
14009
14010 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14011
14012 call __cast6_dec_blk8;
14013
14014- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14015+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14016
14017- popq %r12;
14018+ popq %r14;
14019
14020+ pax_force_retaddr
14021 ret;
14022 ENDPROC(cast6_cbc_dec_8way)
14023
14024@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
14025 * %rcx: iv (little endian, 128bit)
14026 */
14027
14028- pushq %r12;
14029+ pushq %r14;
14030
14031 movq %rsi, %r11;
14032- movq %rdx, %r12;
14033+ movq %rdx, %r14;
14034
14035 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14036 RD2, RX, RKR, RKM);
14037
14038 call __cast6_enc_blk8;
14039
14040- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14041+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14042
14043- popq %r12;
14044+ popq %r14;
14045
14046+ pax_force_retaddr
14047 ret;
14048 ENDPROC(cast6_ctr_8way)
14049
14050@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
14051 /* dst <= regs xor IVs(in dst) */
14052 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14053
14054+ pax_force_retaddr
14055 ret;
14056 ENDPROC(cast6_xts_enc_8way)
14057
14058@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
14059 /* dst <= regs xor IVs(in dst) */
14060 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14061
14062+ pax_force_retaddr
14063 ret;
14064 ENDPROC(cast6_xts_dec_8way)
14065diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14066index 225be06..2885e731 100644
14067--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14068+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14069@@ -45,6 +45,7 @@
14070
14071 #include <asm/inst.h>
14072 #include <linux/linkage.h>
14073+#include <asm/alternative-asm.h>
14074
14075 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14076
14077@@ -309,6 +310,7 @@ do_return:
14078 popq %rsi
14079 popq %rdi
14080 popq %rbx
14081+ pax_force_retaddr
14082 ret
14083
14084 ################################################################
14085@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14086 ## PCLMULQDQ tables
14087 ## Table is 128 entries x 2 words (8 bytes) each
14088 ################################################################
14089-.section .rotata, "a", %progbits
14090+.section .rodata, "a", %progbits
14091 .align 8
14092 K_table:
14093 .long 0x493c7d27, 0x00000001
14094diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14095index 5d1e007..098cb4f 100644
14096--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14097+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14098@@ -18,6 +18,7 @@
14099
14100 #include <linux/linkage.h>
14101 #include <asm/inst.h>
14102+#include <asm/alternative-asm.h>
14103
14104 .data
14105
14106@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14107 psrlq $1, T2
14108 pxor T2, T1
14109 pxor T1, DATA
14110+ pax_force_retaddr
14111 ret
14112 ENDPROC(__clmul_gf128mul_ble)
14113
14114@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14115 call __clmul_gf128mul_ble
14116 PSHUFB_XMM BSWAP DATA
14117 movups DATA, (%rdi)
14118+ pax_force_retaddr
14119 ret
14120 ENDPROC(clmul_ghash_mul)
14121
14122@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14123 PSHUFB_XMM BSWAP DATA
14124 movups DATA, (%rdi)
14125 .Lupdate_just_ret:
14126+ pax_force_retaddr
14127 ret
14128 ENDPROC(clmul_ghash_update)
14129diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14130index 9279e0b..c4b3d2c 100644
14131--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14132+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14133@@ -1,4 +1,5 @@
14134 #include <linux/linkage.h>
14135+#include <asm/alternative-asm.h>
14136
14137 # enter salsa20_encrypt_bytes
14138 ENTRY(salsa20_encrypt_bytes)
14139@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14140 add %r11,%rsp
14141 mov %rdi,%rax
14142 mov %rsi,%rdx
14143+ pax_force_retaddr
14144 ret
14145 # bytesatleast65:
14146 ._bytesatleast65:
14147@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14148 add %r11,%rsp
14149 mov %rdi,%rax
14150 mov %rsi,%rdx
14151+ pax_force_retaddr
14152 ret
14153 ENDPROC(salsa20_keysetup)
14154
14155@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14156 add %r11,%rsp
14157 mov %rdi,%rax
14158 mov %rsi,%rdx
14159+ pax_force_retaddr
14160 ret
14161 ENDPROC(salsa20_ivsetup)
14162diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14163index 2f202f4..d9164d6 100644
14164--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14165+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14166@@ -24,6 +24,7 @@
14167 */
14168
14169 #include <linux/linkage.h>
14170+#include <asm/alternative-asm.h>
14171 #include "glue_helper-asm-avx.S"
14172
14173 .file "serpent-avx-x86_64-asm_64.S"
14174@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14175 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14176 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14177
14178+ pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_enc_blk8_avx)
14181
14182@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14183 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14184 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14185
14186+ pax_force_retaddr
14187 ret;
14188 ENDPROC(__serpent_dec_blk8_avx)
14189
14190@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14191
14192 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14193
14194+ pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_enc_8way_avx)
14197
14198@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14199
14200 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14201
14202+ pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_ecb_dec_8way_avx)
14205
14206@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14207
14208 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14209
14210+ pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_cbc_dec_8way_avx)
14213
14214@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14215
14216 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14217
14218+ pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_ctr_8way_avx)
14221
14222@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14223 /* dst <= regs xor IVs(in dst) */
14224 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14225
14226+ pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_enc_8way_avx)
14229
14230@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14231 /* dst <= regs xor IVs(in dst) */
14232 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14233
14234+ pax_force_retaddr
14235 ret;
14236 ENDPROC(serpent_xts_dec_8way_avx)
14237diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14238index b222085..abd483c 100644
14239--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14240+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14241@@ -15,6 +15,7 @@
14242 */
14243
14244 #include <linux/linkage.h>
14245+#include <asm/alternative-asm.h>
14246 #include "glue_helper-asm-avx2.S"
14247
14248 .file "serpent-avx2-asm_64.S"
14249@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14250 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14251 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14252
14253+ pax_force_retaddr
14254 ret;
14255 ENDPROC(__serpent_enc_blk16)
14256
14257@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14258 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14259 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14260
14261+ pax_force_retaddr
14262 ret;
14263 ENDPROC(__serpent_dec_blk16)
14264
14265@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14266
14267 vzeroupper;
14268
14269+ pax_force_retaddr
14270 ret;
14271 ENDPROC(serpent_ecb_enc_16way)
14272
14273@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14274
14275 vzeroupper;
14276
14277+ pax_force_retaddr
14278 ret;
14279 ENDPROC(serpent_ecb_dec_16way)
14280
14281@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14282
14283 vzeroupper;
14284
14285+ pax_force_retaddr
14286 ret;
14287 ENDPROC(serpent_cbc_dec_16way)
14288
14289@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14290
14291 vzeroupper;
14292
14293+ pax_force_retaddr
14294 ret;
14295 ENDPROC(serpent_ctr_16way)
14296
14297@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14298
14299 vzeroupper;
14300
14301+ pax_force_retaddr
14302 ret;
14303 ENDPROC(serpent_xts_enc_16way)
14304
14305@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14306
14307 vzeroupper;
14308
14309+ pax_force_retaddr
14310 ret;
14311 ENDPROC(serpent_xts_dec_16way)
14312diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14313index acc066c..1559cc4 100644
14314--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14315+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14316@@ -25,6 +25,7 @@
14317 */
14318
14319 #include <linux/linkage.h>
14320+#include <asm/alternative-asm.h>
14321
14322 .file "serpent-sse2-x86_64-asm_64.S"
14323 .text
14324@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14325 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14326 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14327
14328+ pax_force_retaddr
14329 ret;
14330
14331 .L__enc_xor8:
14332 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14333 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14334
14335+ pax_force_retaddr
14336 ret;
14337 ENDPROC(__serpent_enc_blk_8way)
14338
14339@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14340 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14341 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14342
14343+ pax_force_retaddr
14344 ret;
14345 ENDPROC(serpent_dec_blk_8way)
14346diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14347index a410950..9dfe7ad 100644
14348--- a/arch/x86/crypto/sha1_ssse3_asm.S
14349+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14350@@ -29,6 +29,7 @@
14351 */
14352
14353 #include <linux/linkage.h>
14354+#include <asm/alternative-asm.h>
14355
14356 #define CTX %rdi // arg1
14357 #define BUF %rsi // arg2
14358@@ -75,9 +76,9 @@
14359
14360 push %rbx
14361 push %rbp
14362- push %r12
14363+ push %r14
14364
14365- mov %rsp, %r12
14366+ mov %rsp, %r14
14367 sub $64, %rsp # allocate workspace
14368 and $~15, %rsp # align stack
14369
14370@@ -99,11 +100,12 @@
14371 xor %rax, %rax
14372 rep stosq
14373
14374- mov %r12, %rsp # deallocate workspace
14375+ mov %r14, %rsp # deallocate workspace
14376
14377- pop %r12
14378+ pop %r14
14379 pop %rbp
14380 pop %rbx
14381+ pax_force_retaddr
14382 ret
14383
14384 ENDPROC(\name)
14385diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14386index 92b3b5d..0dc1dcb 100644
14387--- a/arch/x86/crypto/sha256-avx-asm.S
14388+++ b/arch/x86/crypto/sha256-avx-asm.S
14389@@ -49,6 +49,7 @@
14390
14391 #ifdef CONFIG_AS_AVX
14392 #include <linux/linkage.h>
14393+#include <asm/alternative-asm.h>
14394
14395 ## assume buffers not aligned
14396 #define VMOVDQ vmovdqu
14397@@ -460,6 +461,7 @@ done_hash:
14398 popq %r13
14399 popq %rbp
14400 popq %rbx
14401+ pax_force_retaddr
14402 ret
14403 ENDPROC(sha256_transform_avx)
14404
14405diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14406index 570ec5e..cf2b625 100644
14407--- a/arch/x86/crypto/sha256-avx2-asm.S
14408+++ b/arch/x86/crypto/sha256-avx2-asm.S
14409@@ -50,6 +50,7 @@
14410
14411 #ifdef CONFIG_AS_AVX2
14412 #include <linux/linkage.h>
14413+#include <asm/alternative-asm.h>
14414
14415 ## assume buffers not aligned
14416 #define VMOVDQ vmovdqu
14417@@ -720,6 +721,7 @@ done_hash:
14418 popq %r12
14419 popq %rbp
14420 popq %rbx
14421+ pax_force_retaddr
14422 ret
14423 ENDPROC(sha256_transform_rorx)
14424
14425diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14426index 2cedc44..5144899 100644
14427--- a/arch/x86/crypto/sha256-ssse3-asm.S
14428+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14429@@ -47,6 +47,7 @@
14430 ########################################################################
14431
14432 #include <linux/linkage.h>
14433+#include <asm/alternative-asm.h>
14434
14435 ## assume buffers not aligned
14436 #define MOVDQ movdqu
14437@@ -471,6 +472,7 @@ done_hash:
14438 popq %rbp
14439 popq %rbx
14440
14441+ pax_force_retaddr
14442 ret
14443 ENDPROC(sha256_transform_ssse3)
14444
14445diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14446index 565274d..af6bc08 100644
14447--- a/arch/x86/crypto/sha512-avx-asm.S
14448+++ b/arch/x86/crypto/sha512-avx-asm.S
14449@@ -49,6 +49,7 @@
14450
14451 #ifdef CONFIG_AS_AVX
14452 #include <linux/linkage.h>
14453+#include <asm/alternative-asm.h>
14454
14455 .text
14456
14457@@ -364,6 +365,7 @@ updateblock:
14458 mov frame_RSPSAVE(%rsp), %rsp
14459
14460 nowork:
14461+ pax_force_retaddr
14462 ret
14463 ENDPROC(sha512_transform_avx)
14464
14465diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14466index 1f20b35..f25c8c1 100644
14467--- a/arch/x86/crypto/sha512-avx2-asm.S
14468+++ b/arch/x86/crypto/sha512-avx2-asm.S
14469@@ -51,6 +51,7 @@
14470
14471 #ifdef CONFIG_AS_AVX2
14472 #include <linux/linkage.h>
14473+#include <asm/alternative-asm.h>
14474
14475 .text
14476
14477@@ -678,6 +679,7 @@ done_hash:
14478
14479 # Restore Stack Pointer
14480 mov frame_RSPSAVE(%rsp), %rsp
14481+ pax_force_retaddr
14482 ret
14483 ENDPROC(sha512_transform_rorx)
14484
14485diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14486index e610e29..ffcb5ed 100644
14487--- a/arch/x86/crypto/sha512-ssse3-asm.S
14488+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14489@@ -48,6 +48,7 @@
14490 ########################################################################
14491
14492 #include <linux/linkage.h>
14493+#include <asm/alternative-asm.h>
14494
14495 .text
14496
14497@@ -363,6 +364,7 @@ updateblock:
14498 mov frame_RSPSAVE(%rsp), %rsp
14499
14500 nowork:
14501+ pax_force_retaddr
14502 ret
14503 ENDPROC(sha512_transform_ssse3)
14504
14505diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14506index 0505813..b067311 100644
14507--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14508+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14509@@ -24,6 +24,7 @@
14510 */
14511
14512 #include <linux/linkage.h>
14513+#include <asm/alternative-asm.h>
14514 #include "glue_helper-asm-avx.S"
14515
14516 .file "twofish-avx-x86_64-asm_64.S"
14517@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14518 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14519 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14520
14521+ pax_force_retaddr
14522 ret;
14523 ENDPROC(__twofish_enc_blk8)
14524
14525@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14526 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14527 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14528
14529+ pax_force_retaddr
14530 ret;
14531 ENDPROC(__twofish_dec_blk8)
14532
14533@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14534
14535 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14536
14537+ pax_force_retaddr
14538 ret;
14539 ENDPROC(twofish_ecb_enc_8way)
14540
14541@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14542
14543 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14544
14545+ pax_force_retaddr
14546 ret;
14547 ENDPROC(twofish_ecb_dec_8way)
14548
14549@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14550 * %rdx: src
14551 */
14552
14553- pushq %r12;
14554+ pushq %r14;
14555
14556 movq %rsi, %r11;
14557- movq %rdx, %r12;
14558+ movq %rdx, %r14;
14559
14560 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14561
14562 call __twofish_dec_blk8;
14563
14564- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14565+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14566
14567- popq %r12;
14568+ popq %r14;
14569
14570+ pax_force_retaddr
14571 ret;
14572 ENDPROC(twofish_cbc_dec_8way)
14573
14574@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14575 * %rcx: iv (little endian, 128bit)
14576 */
14577
14578- pushq %r12;
14579+ pushq %r14;
14580
14581 movq %rsi, %r11;
14582- movq %rdx, %r12;
14583+ movq %rdx, %r14;
14584
14585 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14586 RD2, RX0, RX1, RY0);
14587
14588 call __twofish_enc_blk8;
14589
14590- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14591+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14592
14593- popq %r12;
14594+ popq %r14;
14595
14596+ pax_force_retaddr
14597 ret;
14598 ENDPROC(twofish_ctr_8way)
14599
14600@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14601 /* dst <= regs xor IVs(in dst) */
14602 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14603
14604+ pax_force_retaddr
14605 ret;
14606 ENDPROC(twofish_xts_enc_8way)
14607
14608@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14609 /* dst <= regs xor IVs(in dst) */
14610 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14611
14612+ pax_force_retaddr
14613 ret;
14614 ENDPROC(twofish_xts_dec_8way)
14615diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14616index 1c3b7ce..02f578d 100644
14617--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14618+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14619@@ -21,6 +21,7 @@
14620 */
14621
14622 #include <linux/linkage.h>
14623+#include <asm/alternative-asm.h>
14624
14625 .file "twofish-x86_64-asm-3way.S"
14626 .text
14627@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14628 popq %r13;
14629 popq %r14;
14630 popq %r15;
14631+ pax_force_retaddr
14632 ret;
14633
14634 .L__enc_xor3:
14635@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14636 popq %r13;
14637 popq %r14;
14638 popq %r15;
14639+ pax_force_retaddr
14640 ret;
14641 ENDPROC(__twofish_enc_blk_3way)
14642
14643@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14644 popq %r13;
14645 popq %r14;
14646 popq %r15;
14647+ pax_force_retaddr
14648 ret;
14649 ENDPROC(twofish_dec_blk_3way)
14650diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14651index a350c99..c1bac24 100644
14652--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14653+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14654@@ -22,6 +22,7 @@
14655
14656 #include <linux/linkage.h>
14657 #include <asm/asm-offsets.h>
14658+#include <asm/alternative-asm.h>
14659
14660 #define a_offset 0
14661 #define b_offset 4
14662@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14663
14664 popq R1
14665 movl $1,%eax
14666+ pax_force_retaddr
14667 ret
14668 ENDPROC(twofish_enc_blk)
14669
14670@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14671
14672 popq R1
14673 movl $1,%eax
14674+ pax_force_retaddr
14675 ret
14676 ENDPROC(twofish_dec_blk)
14677diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14678index ae6aad1..719d6d9 100644
14679--- a/arch/x86/ia32/ia32_aout.c
14680+++ b/arch/x86/ia32/ia32_aout.c
14681@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14682 unsigned long dump_start, dump_size;
14683 struct user32 dump;
14684
14685+ memset(&dump, 0, sizeof(dump));
14686+
14687 fs = get_fs();
14688 set_fs(KERNEL_DS);
14689 has_dumped = 1;
14690diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14691index c81d35e6..3500144 100644
14692--- a/arch/x86/ia32/ia32_signal.c
14693+++ b/arch/x86/ia32/ia32_signal.c
14694@@ -216,7 +216,7 @@ asmlinkage long sys32_sigreturn(void)
14695 if (__get_user(set.sig[0], &frame->sc.oldmask)
14696 || (_COMPAT_NSIG_WORDS > 1
14697 && __copy_from_user((((char *) &set.sig) + 4),
14698- &frame->extramask,
14699+ frame->extramask,
14700 sizeof(frame->extramask))))
14701 goto badframe;
14702
14703@@ -335,7 +335,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14704 sp -= frame_size;
14705 /* Align the stack pointer according to the i386 ABI,
14706 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14707- sp = ((sp + 4) & -16ul) - 4;
14708+ sp = ((sp - 12) & -16ul) - 4;
14709 return (void __user *) sp;
14710 }
14711
14712@@ -380,10 +380,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14713 } else {
14714 /* Return stub is in 32bit vsyscall page */
14715 if (current->mm->context.vdso)
14716- restorer = current->mm->context.vdso +
14717- selected_vdso32->sym___kernel_sigreturn;
14718+ restorer = (void __force_user *)(current->mm->context.vdso +
14719+ selected_vdso32->sym___kernel_sigreturn);
14720 else
14721- restorer = &frame->retcode;
14722+ restorer = frame->retcode;
14723 }
14724
14725 put_user_try {
14726@@ -393,7 +393,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14727 * These are actually not used anymore, but left because some
14728 * gdb versions depend on them as a marker.
14729 */
14730- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14731+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14732 } put_user_catch(err);
14733
14734 if (err)
14735@@ -435,7 +435,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14736 0xb8,
14737 __NR_ia32_rt_sigreturn,
14738 0x80cd,
14739- 0,
14740+ 0
14741 };
14742
14743 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14744@@ -458,16 +458,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14745
14746 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14747 restorer = ksig->ka.sa.sa_restorer;
14748+ else if (current->mm->context.vdso)
14749+ /* Return stub is in 32bit vsyscall page */
14750+ restorer = (void __force_user *)(current->mm->context.vdso +
14751+ selected_vdso32->sym___kernel_rt_sigreturn);
14752 else
14753- restorer = current->mm->context.vdso +
14754- selected_vdso32->sym___kernel_rt_sigreturn;
14755+ restorer = frame->retcode;
14756 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14757
14758 /*
14759 * Not actually used anymore, but left because some gdb
14760 * versions need it.
14761 */
14762- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14763+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14764 } put_user_catch(err);
14765
14766 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14767diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14768index 72bf268..127572a 100644
14769--- a/arch/x86/ia32/ia32entry.S
14770+++ b/arch/x86/ia32/ia32entry.S
14771@@ -15,8 +15,10 @@
14772 #include <asm/irqflags.h>
14773 #include <asm/asm.h>
14774 #include <asm/smap.h>
14775+#include <asm/pgtable.h>
14776 #include <linux/linkage.h>
14777 #include <linux/err.h>
14778+#include <asm/alternative-asm.h>
14779
14780 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14781 #include <linux/elf-em.h>
14782@@ -85,6 +87,32 @@ ENTRY(native_irq_enable_sysexit)
14783 ENDPROC(native_irq_enable_sysexit)
14784 #endif
14785
14786+ .macro pax_enter_kernel_user
14787+ pax_set_fptr_mask
14788+#ifdef CONFIG_PAX_MEMORY_UDEREF
14789+ call pax_enter_kernel_user
14790+#endif
14791+ .endm
14792+
14793+ .macro pax_exit_kernel_user
14794+#ifdef CONFIG_PAX_MEMORY_UDEREF
14795+ call pax_exit_kernel_user
14796+#endif
14797+#ifdef CONFIG_PAX_RANDKSTACK
14798+ pushq %rax
14799+ pushq %r11
14800+ call pax_randomize_kstack
14801+ popq %r11
14802+ popq %rax
14803+#endif
14804+ .endm
14805+
14806+ .macro pax_erase_kstack
14807+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14808+ call pax_erase_kstack
14809+#endif
14810+ .endm
14811+
14812 /*
14813 * 32bit SYSENTER instruction entry.
14814 *
14815@@ -119,23 +147,24 @@ ENTRY(ia32_sysenter_target)
14816 * it is too small to ever cause noticeable irq latency.
14817 */
14818 SWAPGS_UNSAFE_STACK
14819- movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp
14820- ENABLE_INTERRUPTS(CLBR_NONE)
14821+ movq PER_CPU_VAR(kernel_stack), %rsp
14822
14823 /* Zero-extending 32-bit regs, do not remove */
14824 movl %ebp, %ebp
14825 movl %eax, %eax
14826
14827- movl ASM_THREAD_INFO(TI_sysenter_return, %rsp, 0), %r10d
14828- CFI_REGISTER rip,r10
14829+ GET_THREAD_INFO(%r11)
14830+ movl TI_sysenter_return(%r11), %r11d
14831+ CFI_REGISTER rip,r11
14832
14833 /* Construct struct pt_regs on stack */
14834 pushq_cfi $__USER32_DS /* pt_regs->ss */
14835 pushq_cfi %rbp /* pt_regs->sp */
14836 CFI_REL_OFFSET rsp,0
14837 pushfq_cfi /* pt_regs->flags */
14838+ orl $X86_EFLAGS_IF,(%rsp)
14839 pushq_cfi $__USER32_CS /* pt_regs->cs */
14840- pushq_cfi %r10 /* pt_regs->ip = thread_info->sysenter_return */
14841+ pushq_cfi %r11 /* pt_regs->ip = thread_info->sysenter_return */
14842 CFI_REL_OFFSET rip,0
14843 pushq_cfi_reg rax /* pt_regs->orig_ax */
14844 pushq_cfi_reg rdi /* pt_regs->di */
14845@@ -147,15 +176,37 @@ ENTRY(ia32_sysenter_target)
14846 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14847 CFI_ADJUST_CFA_OFFSET 10*8
14848
14849+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14850+ movq_cfi r12, R12
14851+#endif
14852+
14853+ pax_enter_kernel_user
14854+
14855+#ifdef CONFIG_PAX_RANDKSTACK
14856+ pax_erase_kstack
14857+#endif
14858+
14859+ ENABLE_INTERRUPTS(CLBR_NONE)
14860+
14861 /*
14862 * no need to do an access_ok check here because rbp has been
14863 * 32bit zero extended
14864 */
14865+
14866+#ifdef CONFIG_PAX_MEMORY_UDEREF
14867+ addq pax_user_shadow_base,%rbp
14868+ ASM_PAX_OPEN_USERLAND
14869+#endif
14870+
14871 ASM_STAC
14872 1: movl (%rbp),%ebp
14873 _ASM_EXTABLE(1b,ia32_badarg)
14874 ASM_CLAC
14875
14876+#ifdef CONFIG_PAX_MEMORY_UDEREF
14877+ ASM_PAX_CLOSE_USERLAND
14878+#endif
14879+
14880 /*
14881 * Sysenter doesn't filter flags, so we need to clear NT
14882 * ourselves. To save a few cycles, we can check whether
14883@@ -165,8 +216,9 @@ ENTRY(ia32_sysenter_target)
14884 jnz sysenter_fix_flags
14885 sysenter_flags_fixed:
14886
14887- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14888- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14889+ GET_THREAD_INFO(%r11)
14890+ orl $TS_COMPAT,TI_status(%r11)
14891+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14892 CFI_REMEMBER_STATE
14893 jnz sysenter_tracesys
14894 cmpq $(IA32_NR_syscalls-1),%rax
14895@@ -181,9 +233,10 @@ sysenter_do_call:
14896 sysenter_dispatch:
14897 call *ia32_sys_call_table(,%rax,8)
14898 movq %rax,RAX(%rsp)
14899+ GET_THREAD_INFO(%r11)
14900 DISABLE_INTERRUPTS(CLBR_NONE)
14901 TRACE_IRQS_OFF
14902- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14903+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14904 jnz sysexit_audit
14905 sysexit_from_sys_call:
14906 /*
14907@@ -196,7 +249,9 @@ sysexit_from_sys_call:
14908 * This code path is still called 'sysexit' because it pairs
14909 * with 'sysenter' and it uses the SYSENTER calling convention.
14910 */
14911- andl $~TS_COMPAT,ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14912+ pax_exit_kernel_user
14913+ pax_erase_kstack
14914+ andl $~TS_COMPAT,TI_status(%r11)
14915 movl RIP(%rsp),%ecx /* User %eip */
14916 CFI_REGISTER rip,rcx
14917 RESTORE_RSI_RDI
14918@@ -247,6 +302,9 @@ sysexit_from_sys_call:
14919 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14920 movl %eax,%edi /* 1st arg: syscall number */
14921 call __audit_syscall_entry
14922+
14923+ pax_erase_kstack
14924+
14925 movl RAX(%rsp),%eax /* reload syscall number */
14926 cmpq $(IA32_NR_syscalls-1),%rax
14927 ja ia32_badsys
14928@@ -258,7 +316,7 @@ sysexit_from_sys_call:
14929 .endm
14930
14931 .macro auditsys_exit exit
14932- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14933+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14934 jnz ia32_ret_from_sys_call
14935 TRACE_IRQS_ON
14936 ENABLE_INTERRUPTS(CLBR_NONE)
14937@@ -269,11 +327,12 @@ sysexit_from_sys_call:
14938 1: setbe %al /* 1 if error, 0 if not */
14939 movzbl %al,%edi /* zero-extend that into %edi */
14940 call __audit_syscall_exit
14941+ GET_THREAD_INFO(%r11)
14942 movq RAX(%rsp),%rax /* reload syscall return value */
14943 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14944 DISABLE_INTERRUPTS(CLBR_NONE)
14945 TRACE_IRQS_OFF
14946- testl %edi, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14947+ testl %edi,TI_flags(%r11)
14948 jz \exit
14949 CLEAR_RREGS
14950 jmp int_with_check
14951@@ -295,7 +354,7 @@ sysenter_fix_flags:
14952
14953 sysenter_tracesys:
14954 #ifdef CONFIG_AUDITSYSCALL
14955- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14956+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14957 jz sysenter_auditsys
14958 #endif
14959 SAVE_EXTRA_REGS
14960@@ -307,6 +366,9 @@ sysenter_tracesys:
14961 RESTORE_EXTRA_REGS
14962 cmpq $(IA32_NR_syscalls-1),%rax
14963 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14964+
14965+ pax_erase_kstack
14966+
14967 jmp sysenter_do_call
14968 CFI_ENDPROC
14969 ENDPROC(ia32_sysenter_target)
14970@@ -357,7 +419,6 @@ ENTRY(ia32_cstar_target)
14971 movl %esp,%r8d
14972 CFI_REGISTER rsp,r8
14973 movq PER_CPU_VAR(kernel_stack),%rsp
14974- ENABLE_INTERRUPTS(CLBR_NONE)
14975
14976 /* Zero-extending 32-bit regs, do not remove */
14977 movl %eax,%eax
14978@@ -380,16 +441,41 @@ ENTRY(ia32_cstar_target)
14979 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14980 CFI_ADJUST_CFA_OFFSET 10*8
14981
14982+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14983+ movq_cfi r12, R12
14984+#endif
14985+
14986+ pax_enter_kernel_user
14987+
14988+#ifdef CONFIG_PAX_RANDKSTACK
14989+ pax_erase_kstack
14990+#endif
14991+
14992+ ENABLE_INTERRUPTS(CLBR_NONE)
14993+
14994 /*
14995 * no need to do an access_ok check here because r8 has been
14996 * 32bit zero extended
14997 */
14998+
14999+#ifdef CONFIG_PAX_MEMORY_UDEREF
15000+ ASM_PAX_OPEN_USERLAND
15001+ movq pax_user_shadow_base,%r8
15002+ addq RSP(%rsp),%r8
15003+#endif
15004+
15005 ASM_STAC
15006 1: movl (%r8),%r9d
15007 _ASM_EXTABLE(1b,ia32_badarg)
15008 ASM_CLAC
15009- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15010- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15011+
15012+#ifdef CONFIG_PAX_MEMORY_UDEREF
15013+ ASM_PAX_CLOSE_USERLAND
15014+#endif
15015+
15016+ GET_THREAD_INFO(%r11)
15017+ orl $TS_COMPAT,TI_status(%r11)
15018+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15019 CFI_REMEMBER_STATE
15020 jnz cstar_tracesys
15021 cmpq $IA32_NR_syscalls-1,%rax
15022@@ -404,12 +490,15 @@ cstar_do_call:
15023 cstar_dispatch:
15024 call *ia32_sys_call_table(,%rax,8)
15025 movq %rax,RAX(%rsp)
15026+ GET_THREAD_INFO(%r11)
15027 DISABLE_INTERRUPTS(CLBR_NONE)
15028 TRACE_IRQS_OFF
15029- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15030+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
15031 jnz sysretl_audit
15032 sysretl_from_sys_call:
15033- andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15034+ pax_exit_kernel_user
15035+ pax_erase_kstack
15036+ andl $~TS_COMPAT,TI_status(%r11)
15037 RESTORE_RSI_RDI_RDX
15038 movl RIP(%rsp),%ecx
15039 CFI_REGISTER rip,rcx
15040@@ -451,7 +540,7 @@ sysretl_audit:
15041
15042 cstar_tracesys:
15043 #ifdef CONFIG_AUDITSYSCALL
15044- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15045+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
15046 jz cstar_auditsys
15047 #endif
15048 xchgl %r9d,%ebp
15049@@ -465,11 +554,19 @@ cstar_tracesys:
15050 xchgl %ebp,%r9d
15051 cmpq $(IA32_NR_syscalls-1),%rax
15052 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
15053+
15054+ pax_erase_kstack
15055+
15056 jmp cstar_do_call
15057 END(ia32_cstar_target)
15058
15059 ia32_badarg:
15060 ASM_CLAC
15061+
15062+#ifdef CONFIG_PAX_MEMORY_UDEREF
15063+ ASM_PAX_CLOSE_USERLAND
15064+#endif
15065+
15066 movq $-EFAULT,%rax
15067 jmp ia32_sysret
15068 CFI_ENDPROC
15069@@ -505,14 +602,8 @@ ENTRY(ia32_syscall)
15070 /*CFI_REL_OFFSET cs,1*8 */
15071 CFI_REL_OFFSET rip,0*8
15072
15073- /*
15074- * Interrupts are off on entry.
15075- * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15076- * it is too small to ever cause noticeable irq latency.
15077- */
15078 PARAVIRT_ADJUST_EXCEPTION_FRAME
15079 SWAPGS
15080- ENABLE_INTERRUPTS(CLBR_NONE)
15081
15082 /* Zero-extending 32-bit regs, do not remove */
15083 movl %eax,%eax
15084@@ -528,8 +619,26 @@ ENTRY(ia32_syscall)
15085 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
15086 CFI_ADJUST_CFA_OFFSET 10*8
15087
15088- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15089- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15090+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15091+ movq_cfi r12, R12
15092+#endif
15093+
15094+ pax_enter_kernel_user
15095+
15096+#ifdef CONFIG_PAX_RANDKSTACK
15097+ pax_erase_kstack
15098+#endif
15099+
15100+ /*
15101+ * Interrupts are off on entry.
15102+ * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15103+ * it is too small to ever cause noticeable irq latency.
15104+ */
15105+ ENABLE_INTERRUPTS(CLBR_NONE)
15106+
15107+ GET_THREAD_INFO(%r11)
15108+ orl $TS_COMPAT,TI_status(%r11)
15109+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15110 jnz ia32_tracesys
15111 cmpq $(IA32_NR_syscalls-1),%rax
15112 ja ia32_badsys
15113@@ -557,6 +666,9 @@ ia32_tracesys:
15114 RESTORE_EXTRA_REGS
15115 cmpq $(IA32_NR_syscalls-1),%rax
15116 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15117+
15118+ pax_erase_kstack
15119+
15120 jmp ia32_do_call
15121 END(ia32_syscall)
15122
15123diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15124index 719cd70..69d576b 100644
15125--- a/arch/x86/ia32/sys_ia32.c
15126+++ b/arch/x86/ia32/sys_ia32.c
15127@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15128 */
15129 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15130 {
15131- typeof(ubuf->st_uid) uid = 0;
15132- typeof(ubuf->st_gid) gid = 0;
15133+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15134+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15135 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15136 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15137 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15138diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15139index bdf02ee..51a4656 100644
15140--- a/arch/x86/include/asm/alternative-asm.h
15141+++ b/arch/x86/include/asm/alternative-asm.h
15142@@ -18,6 +18,45 @@
15143 .endm
15144 #endif
15145
15146+#ifdef KERNEXEC_PLUGIN
15147+ .macro pax_force_retaddr_bts rip=0
15148+ btsq $63,\rip(%rsp)
15149+ .endm
15150+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15151+ .macro pax_force_retaddr rip=0, reload=0
15152+ btsq $63,\rip(%rsp)
15153+ .endm
15154+ .macro pax_force_fptr ptr
15155+ btsq $63,\ptr
15156+ .endm
15157+ .macro pax_set_fptr_mask
15158+ .endm
15159+#endif
15160+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15161+ .macro pax_force_retaddr rip=0, reload=0
15162+ .if \reload
15163+ pax_set_fptr_mask
15164+ .endif
15165+ orq %r12,\rip(%rsp)
15166+ .endm
15167+ .macro pax_force_fptr ptr
15168+ orq %r12,\ptr
15169+ .endm
15170+ .macro pax_set_fptr_mask
15171+ movabs $0x8000000000000000,%r12
15172+ .endm
15173+#endif
15174+#else
15175+ .macro pax_force_retaddr rip=0, reload=0
15176+ .endm
15177+ .macro pax_force_fptr ptr
15178+ .endm
15179+ .macro pax_force_retaddr_bts rip=0
15180+ .endm
15181+ .macro pax_set_fptr_mask
15182+ .endm
15183+#endif
15184+
15185 .macro altinstruction_entry orig alt feature orig_len alt_len pad_len
15186 .long \orig - .
15187 .long \alt - .
15188@@ -38,7 +77,7 @@
15189 altinstruction_entry 140b,143f,\feature,142b-140b,144f-143f,142b-141b
15190 .popsection
15191
15192- .pushsection .altinstr_replacement,"ax"
15193+ .pushsection .altinstr_replacement,"a"
15194 143:
15195 \newinstr
15196 144:
15197@@ -68,7 +107,7 @@
15198 altinstruction_entry 140b,144f,\feature2,142b-140b,145f-144f,142b-141b
15199 .popsection
15200
15201- .pushsection .altinstr_replacement,"ax"
15202+ .pushsection .altinstr_replacement,"a"
15203 143:
15204 \newinstr1
15205 144:
15206diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15207index ba32af0..ff42fc0 100644
15208--- a/arch/x86/include/asm/alternative.h
15209+++ b/arch/x86/include/asm/alternative.h
15210@@ -130,7 +130,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15211 ".pushsection .altinstructions,\"a\"\n" \
15212 ALTINSTR_ENTRY(feature, 1) \
15213 ".popsection\n" \
15214- ".pushsection .altinstr_replacement, \"ax\"\n" \
15215+ ".pushsection .altinstr_replacement, \"a\"\n" \
15216 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15217 ".popsection"
15218
15219@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15220 ALTINSTR_ENTRY(feature1, 1) \
15221 ALTINSTR_ENTRY(feature2, 2) \
15222 ".popsection\n" \
15223- ".pushsection .altinstr_replacement, \"ax\"\n" \
15224+ ".pushsection .altinstr_replacement, \"a\"\n" \
15225 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15226 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15227 ".popsection"
15228diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15229index 976b86a..f3bc83a 100644
15230--- a/arch/x86/include/asm/apic.h
15231+++ b/arch/x86/include/asm/apic.h
15232@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15233
15234 #ifdef CONFIG_X86_LOCAL_APIC
15235
15236-extern unsigned int apic_verbosity;
15237+extern int apic_verbosity;
15238 extern int local_apic_timer_c2_ok;
15239
15240 extern int disable_apic;
15241diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15242index 20370c6..a2eb9b0 100644
15243--- a/arch/x86/include/asm/apm.h
15244+++ b/arch/x86/include/asm/apm.h
15245@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15246 __asm__ __volatile__(APM_DO_ZERO_SEGS
15247 "pushl %%edi\n\t"
15248 "pushl %%ebp\n\t"
15249- "lcall *%%cs:apm_bios_entry\n\t"
15250+ "lcall *%%ss:apm_bios_entry\n\t"
15251 "setc %%al\n\t"
15252 "popl %%ebp\n\t"
15253 "popl %%edi\n\t"
15254@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15255 __asm__ __volatile__(APM_DO_ZERO_SEGS
15256 "pushl %%edi\n\t"
15257 "pushl %%ebp\n\t"
15258- "lcall *%%cs:apm_bios_entry\n\t"
15259+ "lcall *%%ss:apm_bios_entry\n\t"
15260 "setc %%bl\n\t"
15261 "popl %%ebp\n\t"
15262 "popl %%edi\n\t"
15263diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15264index 5e5cd12..51cdc93 100644
15265--- a/arch/x86/include/asm/atomic.h
15266+++ b/arch/x86/include/asm/atomic.h
15267@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15268 }
15269
15270 /**
15271+ * atomic_read_unchecked - read atomic variable
15272+ * @v: pointer of type atomic_unchecked_t
15273+ *
15274+ * Atomically reads the value of @v.
15275+ */
15276+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15277+{
15278+ return ACCESS_ONCE((v)->counter);
15279+}
15280+
15281+/**
15282 * atomic_set - set atomic variable
15283 * @v: pointer of type atomic_t
15284 * @i: required value
15285@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15286 }
15287
15288 /**
15289+ * atomic_set_unchecked - set atomic variable
15290+ * @v: pointer of type atomic_unchecked_t
15291+ * @i: required value
15292+ *
15293+ * Atomically sets the value of @v to @i.
15294+ */
15295+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15296+{
15297+ v->counter = i;
15298+}
15299+
15300+/**
15301 * atomic_add - add integer to atomic variable
15302 * @i: integer value to add
15303 * @v: pointer of type atomic_t
15304@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15305 */
15306 static inline void atomic_add(int i, atomic_t *v)
15307 {
15308- asm volatile(LOCK_PREFIX "addl %1,%0"
15309+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15310+
15311+#ifdef CONFIG_PAX_REFCOUNT
15312+ "jno 0f\n"
15313+ LOCK_PREFIX "subl %1,%0\n"
15314+ "int $4\n0:\n"
15315+ _ASM_EXTABLE(0b, 0b)
15316+#endif
15317+
15318+ : "+m" (v->counter)
15319+ : "ir" (i));
15320+}
15321+
15322+/**
15323+ * atomic_add_unchecked - add integer to atomic variable
15324+ * @i: integer value to add
15325+ * @v: pointer of type atomic_unchecked_t
15326+ *
15327+ * Atomically adds @i to @v.
15328+ */
15329+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15330+{
15331+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15332 : "+m" (v->counter)
15333 : "ir" (i));
15334 }
15335@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15336 */
15337 static inline void atomic_sub(int i, atomic_t *v)
15338 {
15339- asm volatile(LOCK_PREFIX "subl %1,%0"
15340+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15341+
15342+#ifdef CONFIG_PAX_REFCOUNT
15343+ "jno 0f\n"
15344+ LOCK_PREFIX "addl %1,%0\n"
15345+ "int $4\n0:\n"
15346+ _ASM_EXTABLE(0b, 0b)
15347+#endif
15348+
15349+ : "+m" (v->counter)
15350+ : "ir" (i));
15351+}
15352+
15353+/**
15354+ * atomic_sub_unchecked - subtract integer from atomic variable
15355+ * @i: integer value to subtract
15356+ * @v: pointer of type atomic_unchecked_t
15357+ *
15358+ * Atomically subtracts @i from @v.
15359+ */
15360+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15361+{
15362+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15363 : "+m" (v->counter)
15364 : "ir" (i));
15365 }
15366@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15367 */
15368 static inline int atomic_sub_and_test(int i, atomic_t *v)
15369 {
15370- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15371+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15372 }
15373
15374 /**
15375@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15376 */
15377 static inline void atomic_inc(atomic_t *v)
15378 {
15379- asm volatile(LOCK_PREFIX "incl %0"
15380+ asm volatile(LOCK_PREFIX "incl %0\n"
15381+
15382+#ifdef CONFIG_PAX_REFCOUNT
15383+ "jno 0f\n"
15384+ LOCK_PREFIX "decl %0\n"
15385+ "int $4\n0:\n"
15386+ _ASM_EXTABLE(0b, 0b)
15387+#endif
15388+
15389+ : "+m" (v->counter));
15390+}
15391+
15392+/**
15393+ * atomic_inc_unchecked - increment atomic variable
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically increments @v by 1.
15397+ */
15398+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15399+{
15400+ asm volatile(LOCK_PREFIX "incl %0\n"
15401 : "+m" (v->counter));
15402 }
15403
15404@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15405 */
15406 static inline void atomic_dec(atomic_t *v)
15407 {
15408- asm volatile(LOCK_PREFIX "decl %0"
15409+ asm volatile(LOCK_PREFIX "decl %0\n"
15410+
15411+#ifdef CONFIG_PAX_REFCOUNT
15412+ "jno 0f\n"
15413+ LOCK_PREFIX "incl %0\n"
15414+ "int $4\n0:\n"
15415+ _ASM_EXTABLE(0b, 0b)
15416+#endif
15417+
15418+ : "+m" (v->counter));
15419+}
15420+
15421+/**
15422+ * atomic_dec_unchecked - decrement atomic variable
15423+ * @v: pointer of type atomic_unchecked_t
15424+ *
15425+ * Atomically decrements @v by 1.
15426+ */
15427+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15428+{
15429+ asm volatile(LOCK_PREFIX "decl %0\n"
15430 : "+m" (v->counter));
15431 }
15432
15433@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15434 */
15435 static inline int atomic_dec_and_test(atomic_t *v)
15436 {
15437- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15438+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15439 }
15440
15441 /**
15442@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15443 */
15444 static inline int atomic_inc_and_test(atomic_t *v)
15445 {
15446- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15447+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15448+}
15449+
15450+/**
15451+ * atomic_inc_and_test_unchecked - increment and test
15452+ * @v: pointer of type atomic_unchecked_t
15453+ *
15454+ * Atomically increments @v by 1
15455+ * and returns true if the result is zero, or false for all
15456+ * other cases.
15457+ */
15458+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15459+{
15460+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15461 }
15462
15463 /**
15464@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15465 */
15466 static inline int atomic_add_negative(int i, atomic_t *v)
15467 {
15468- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15469+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15470 }
15471
15472 /**
15473@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15474 *
15475 * Atomically adds @i to @v and returns @i + @v
15476 */
15477-static inline int atomic_add_return(int i, atomic_t *v)
15478+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15479+{
15480+ return i + xadd_check_overflow(&v->counter, i);
15481+}
15482+
15483+/**
15484+ * atomic_add_return_unchecked - add integer and return
15485+ * @i: integer value to add
15486+ * @v: pointer of type atomic_unchecked_t
15487+ *
15488+ * Atomically adds @i to @v and returns @i + @v
15489+ */
15490+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15491 {
15492 return i + xadd(&v->counter, i);
15493 }
15494@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15495 *
15496 * Atomically subtracts @i from @v and returns @v - @i
15497 */
15498-static inline int atomic_sub_return(int i, atomic_t *v)
15499+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15500 {
15501 return atomic_add_return(-i, v);
15502 }
15503
15504 #define atomic_inc_return(v) (atomic_add_return(1, v))
15505+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15506+{
15507+ return atomic_add_return_unchecked(1, v);
15508+}
15509 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15510
15511-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15512+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15513+{
15514+ return cmpxchg(&v->counter, old, new);
15515+}
15516+
15517+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15518 {
15519 return cmpxchg(&v->counter, old, new);
15520 }
15521@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15522 return xchg(&v->counter, new);
15523 }
15524
15525+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15526+{
15527+ return xchg(&v->counter, new);
15528+}
15529+
15530 /**
15531 * __atomic_add_unless - add unless the number is already a given value
15532 * @v: pointer of type atomic_t
15533@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15534 */
15535 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15536 {
15537- int c, old;
15538+ int c, old, new;
15539 c = atomic_read(v);
15540 for (;;) {
15541- if (unlikely(c == (u)))
15542+ if (unlikely(c == u))
15543 break;
15544- old = atomic_cmpxchg((v), c, c + (a));
15545+
15546+ asm volatile("addl %2,%0\n"
15547+
15548+#ifdef CONFIG_PAX_REFCOUNT
15549+ "jno 0f\n"
15550+ "subl %2,%0\n"
15551+ "int $4\n0:\n"
15552+ _ASM_EXTABLE(0b, 0b)
15553+#endif
15554+
15555+ : "=r" (new)
15556+ : "0" (c), "ir" (a));
15557+
15558+ old = atomic_cmpxchg(v, c, new);
15559 if (likely(old == c))
15560 break;
15561 c = old;
15562@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15563 }
15564
15565 /**
15566+ * atomic_inc_not_zero_hint - increment if not null
15567+ * @v: pointer of type atomic_t
15568+ * @hint: probable value of the atomic before the increment
15569+ *
15570+ * This version of atomic_inc_not_zero() gives a hint of probable
15571+ * value of the atomic. This helps processor to not read the memory
15572+ * before doing the atomic read/modify/write cycle, lowering
15573+ * number of bus transactions on some arches.
15574+ *
15575+ * Returns: 0 if increment was not done, 1 otherwise.
15576+ */
15577+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15578+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15579+{
15580+ int val, c = hint, new;
15581+
15582+ /* sanity test, should be removed by compiler if hint is a constant */
15583+ if (!hint)
15584+ return __atomic_add_unless(v, 1, 0);
15585+
15586+ do {
15587+ asm volatile("incl %0\n"
15588+
15589+#ifdef CONFIG_PAX_REFCOUNT
15590+ "jno 0f\n"
15591+ "decl %0\n"
15592+ "int $4\n0:\n"
15593+ _ASM_EXTABLE(0b, 0b)
15594+#endif
15595+
15596+ : "=r" (new)
15597+ : "0" (c));
15598+
15599+ val = atomic_cmpxchg(v, c, new);
15600+ if (val == c)
15601+ return 1;
15602+ c = val;
15603+ } while (c);
15604+
15605+ return 0;
15606+}
15607+
15608+/**
15609 * atomic_inc_short - increment of a short integer
15610 * @v: pointer to type int
15611 *
15612@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15613 }
15614
15615 /* These are x86-specific, used by some header files */
15616-#define atomic_clear_mask(mask, addr) \
15617- asm volatile(LOCK_PREFIX "andl %0,%1" \
15618- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15619+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15620+{
15621+ asm volatile(LOCK_PREFIX "andl %1,%0"
15622+ : "+m" (v->counter)
15623+ : "r" (~(mask))
15624+ : "memory");
15625+}
15626
15627-#define atomic_set_mask(mask, addr) \
15628- asm volatile(LOCK_PREFIX "orl %0,%1" \
15629- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15630- : "memory")
15631+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15632+{
15633+ asm volatile(LOCK_PREFIX "andl %1,%0"
15634+ : "+m" (v->counter)
15635+ : "r" (~(mask))
15636+ : "memory");
15637+}
15638+
15639+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15640+{
15641+ asm volatile(LOCK_PREFIX "orl %1,%0"
15642+ : "+m" (v->counter)
15643+ : "r" (mask)
15644+ : "memory");
15645+}
15646+
15647+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15648+{
15649+ asm volatile(LOCK_PREFIX "orl %1,%0"
15650+ : "+m" (v->counter)
15651+ : "r" (mask)
15652+ : "memory");
15653+}
15654
15655 #ifdef CONFIG_X86_32
15656 # include <asm/atomic64_32.h>
15657diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15658index b154de7..bf18a5a 100644
15659--- a/arch/x86/include/asm/atomic64_32.h
15660+++ b/arch/x86/include/asm/atomic64_32.h
15661@@ -12,6 +12,14 @@ typedef struct {
15662 u64 __aligned(8) counter;
15663 } atomic64_t;
15664
15665+#ifdef CONFIG_PAX_REFCOUNT
15666+typedef struct {
15667+ u64 __aligned(8) counter;
15668+} atomic64_unchecked_t;
15669+#else
15670+typedef atomic64_t atomic64_unchecked_t;
15671+#endif
15672+
15673 #define ATOMIC64_INIT(val) { (val) }
15674
15675 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15676@@ -37,21 +45,31 @@ typedef struct {
15677 ATOMIC64_DECL_ONE(sym##_386)
15678
15679 ATOMIC64_DECL_ONE(add_386);
15680+ATOMIC64_DECL_ONE(add_unchecked_386);
15681 ATOMIC64_DECL_ONE(sub_386);
15682+ATOMIC64_DECL_ONE(sub_unchecked_386);
15683 ATOMIC64_DECL_ONE(inc_386);
15684+ATOMIC64_DECL_ONE(inc_unchecked_386);
15685 ATOMIC64_DECL_ONE(dec_386);
15686+ATOMIC64_DECL_ONE(dec_unchecked_386);
15687 #endif
15688
15689 #define alternative_atomic64(f, out, in...) \
15690 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15691
15692 ATOMIC64_DECL(read);
15693+ATOMIC64_DECL(read_unchecked);
15694 ATOMIC64_DECL(set);
15695+ATOMIC64_DECL(set_unchecked);
15696 ATOMIC64_DECL(xchg);
15697 ATOMIC64_DECL(add_return);
15698+ATOMIC64_DECL(add_return_unchecked);
15699 ATOMIC64_DECL(sub_return);
15700+ATOMIC64_DECL(sub_return_unchecked);
15701 ATOMIC64_DECL(inc_return);
15702+ATOMIC64_DECL(inc_return_unchecked);
15703 ATOMIC64_DECL(dec_return);
15704+ATOMIC64_DECL(dec_return_unchecked);
15705 ATOMIC64_DECL(dec_if_positive);
15706 ATOMIC64_DECL(inc_not_zero);
15707 ATOMIC64_DECL(add_unless);
15708@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15709 }
15710
15711 /**
15712+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15713+ * @p: pointer to type atomic64_unchecked_t
15714+ * @o: expected value
15715+ * @n: new value
15716+ *
15717+ * Atomically sets @v to @n if it was equal to @o and returns
15718+ * the old value.
15719+ */
15720+
15721+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15722+{
15723+ return cmpxchg64(&v->counter, o, n);
15724+}
15725+
15726+/**
15727 * atomic64_xchg - xchg atomic64 variable
15728 * @v: pointer to type atomic64_t
15729 * @n: value to assign
15730@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15731 }
15732
15733 /**
15734+ * atomic64_set_unchecked - set atomic64 variable
15735+ * @v: pointer to type atomic64_unchecked_t
15736+ * @n: value to assign
15737+ *
15738+ * Atomically sets the value of @v to @n.
15739+ */
15740+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15741+{
15742+ unsigned high = (unsigned)(i >> 32);
15743+ unsigned low = (unsigned)i;
15744+ alternative_atomic64(set, /* no output */,
15745+ "S" (v), "b" (low), "c" (high)
15746+ : "eax", "edx", "memory");
15747+}
15748+
15749+/**
15750 * atomic64_read - read atomic64 variable
15751 * @v: pointer to type atomic64_t
15752 *
15753@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15754 }
15755
15756 /**
15757+ * atomic64_read_unchecked - read atomic64 variable
15758+ * @v: pointer to type atomic64_unchecked_t
15759+ *
15760+ * Atomically reads the value of @v and returns it.
15761+ */
15762+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15763+{
15764+ long long r;
15765+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15766+ return r;
15767+ }
15768+
15769+/**
15770 * atomic64_add_return - add and return
15771 * @i: integer value to add
15772 * @v: pointer to type atomic64_t
15773@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15774 return i;
15775 }
15776
15777+/**
15778+ * atomic64_add_return_unchecked - add and return
15779+ * @i: integer value to add
15780+ * @v: pointer to type atomic64_unchecked_t
15781+ *
15782+ * Atomically adds @i to @v and returns @i + *@v
15783+ */
15784+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15785+{
15786+ alternative_atomic64(add_return_unchecked,
15787+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15788+ ASM_NO_INPUT_CLOBBER("memory"));
15789+ return i;
15790+}
15791+
15792 /*
15793 * Other variants with different arithmetic operators:
15794 */
15795@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15796 return a;
15797 }
15798
15799+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15800+{
15801+ long long a;
15802+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15803+ "S" (v) : "memory", "ecx");
15804+ return a;
15805+}
15806+
15807 static inline long long atomic64_dec_return(atomic64_t *v)
15808 {
15809 long long a;
15810@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15811 }
15812
15813 /**
15814+ * atomic64_add_unchecked - add integer to atomic64 variable
15815+ * @i: integer value to add
15816+ * @v: pointer to type atomic64_unchecked_t
15817+ *
15818+ * Atomically adds @i to @v.
15819+ */
15820+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15821+{
15822+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15823+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15824+ ASM_NO_INPUT_CLOBBER("memory"));
15825+ return i;
15826+}
15827+
15828+/**
15829 * atomic64_sub - subtract the atomic64 variable
15830 * @i: integer value to subtract
15831 * @v: pointer to type atomic64_t
15832diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15833index f8d273e..02f39f3 100644
15834--- a/arch/x86/include/asm/atomic64_64.h
15835+++ b/arch/x86/include/asm/atomic64_64.h
15836@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15837 }
15838
15839 /**
15840+ * atomic64_read_unchecked - read atomic64 variable
15841+ * @v: pointer of type atomic64_unchecked_t
15842+ *
15843+ * Atomically reads the value of @v.
15844+ * Doesn't imply a read memory barrier.
15845+ */
15846+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15847+{
15848+ return ACCESS_ONCE((v)->counter);
15849+}
15850+
15851+/**
15852 * atomic64_set - set atomic64 variable
15853 * @v: pointer to type atomic64_t
15854 * @i: required value
15855@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15856 }
15857
15858 /**
15859+ * atomic64_set_unchecked - set atomic64 variable
15860+ * @v: pointer to type atomic64_unchecked_t
15861+ * @i: required value
15862+ *
15863+ * Atomically sets the value of @v to @i.
15864+ */
15865+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15866+{
15867+ v->counter = i;
15868+}
15869+
15870+/**
15871 * atomic64_add - add integer to atomic64 variable
15872 * @i: integer value to add
15873 * @v: pointer to type atomic64_t
15874@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15875 */
15876 static inline void atomic64_add(long i, atomic64_t *v)
15877 {
15878+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15879+
15880+#ifdef CONFIG_PAX_REFCOUNT
15881+ "jno 0f\n"
15882+ LOCK_PREFIX "subq %1,%0\n"
15883+ "int $4\n0:\n"
15884+ _ASM_EXTABLE(0b, 0b)
15885+#endif
15886+
15887+ : "=m" (v->counter)
15888+ : "er" (i), "m" (v->counter));
15889+}
15890+
15891+/**
15892+ * atomic64_add_unchecked - add integer to atomic64 variable
15893+ * @i: integer value to add
15894+ * @v: pointer to type atomic64_unchecked_t
15895+ *
15896+ * Atomically adds @i to @v.
15897+ */
15898+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15899+{
15900 asm volatile(LOCK_PREFIX "addq %1,%0"
15901 : "=m" (v->counter)
15902 : "er" (i), "m" (v->counter));
15903@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15904 */
15905 static inline void atomic64_sub(long i, atomic64_t *v)
15906 {
15907- asm volatile(LOCK_PREFIX "subq %1,%0"
15908+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15909+
15910+#ifdef CONFIG_PAX_REFCOUNT
15911+ "jno 0f\n"
15912+ LOCK_PREFIX "addq %1,%0\n"
15913+ "int $4\n0:\n"
15914+ _ASM_EXTABLE(0b, 0b)
15915+#endif
15916+
15917+ : "=m" (v->counter)
15918+ : "er" (i), "m" (v->counter));
15919+}
15920+
15921+/**
15922+ * atomic64_sub_unchecked - subtract the atomic64 variable
15923+ * @i: integer value to subtract
15924+ * @v: pointer to type atomic64_unchecked_t
15925+ *
15926+ * Atomically subtracts @i from @v.
15927+ */
15928+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15929+{
15930+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15931 : "=m" (v->counter)
15932 : "er" (i), "m" (v->counter));
15933 }
15934@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15935 */
15936 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15937 {
15938- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15939+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15940 }
15941
15942 /**
15943@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15944 */
15945 static inline void atomic64_inc(atomic64_t *v)
15946 {
15947+ asm volatile(LOCK_PREFIX "incq %0\n"
15948+
15949+#ifdef CONFIG_PAX_REFCOUNT
15950+ "jno 0f\n"
15951+ LOCK_PREFIX "decq %0\n"
15952+ "int $4\n0:\n"
15953+ _ASM_EXTABLE(0b, 0b)
15954+#endif
15955+
15956+ : "=m" (v->counter)
15957+ : "m" (v->counter));
15958+}
15959+
15960+/**
15961+ * atomic64_inc_unchecked - increment atomic64 variable
15962+ * @v: pointer to type atomic64_unchecked_t
15963+ *
15964+ * Atomically increments @v by 1.
15965+ */
15966+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15967+{
15968 asm volatile(LOCK_PREFIX "incq %0"
15969 : "=m" (v->counter)
15970 : "m" (v->counter));
15971@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15972 */
15973 static inline void atomic64_dec(atomic64_t *v)
15974 {
15975- asm volatile(LOCK_PREFIX "decq %0"
15976+ asm volatile(LOCK_PREFIX "decq %0\n"
15977+
15978+#ifdef CONFIG_PAX_REFCOUNT
15979+ "jno 0f\n"
15980+ LOCK_PREFIX "incq %0\n"
15981+ "int $4\n0:\n"
15982+ _ASM_EXTABLE(0b, 0b)
15983+#endif
15984+
15985+ : "=m" (v->counter)
15986+ : "m" (v->counter));
15987+}
15988+
15989+/**
15990+ * atomic64_dec_unchecked - decrement atomic64 variable
15991+ * @v: pointer to type atomic64_t
15992+ *
15993+ * Atomically decrements @v by 1.
15994+ */
15995+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15996+{
15997+ asm volatile(LOCK_PREFIX "decq %0\n"
15998 : "=m" (v->counter)
15999 : "m" (v->counter));
16000 }
16001@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
16002 */
16003 static inline int atomic64_dec_and_test(atomic64_t *v)
16004 {
16005- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
16006+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
16007 }
16008
16009 /**
16010@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
16011 */
16012 static inline int atomic64_inc_and_test(atomic64_t *v)
16013 {
16014- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
16015+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
16016 }
16017
16018 /**
16019@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
16020 */
16021 static inline int atomic64_add_negative(long i, atomic64_t *v)
16022 {
16023- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
16024+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
16025 }
16026
16027 /**
16028@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
16029 */
16030 static inline long atomic64_add_return(long i, atomic64_t *v)
16031 {
16032+ return i + xadd_check_overflow(&v->counter, i);
16033+}
16034+
16035+/**
16036+ * atomic64_add_return_unchecked - add and return
16037+ * @i: integer value to add
16038+ * @v: pointer to type atomic64_unchecked_t
16039+ *
16040+ * Atomically adds @i to @v and returns @i + @v
16041+ */
16042+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
16043+{
16044 return i + xadd(&v->counter, i);
16045 }
16046
16047@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
16048 }
16049
16050 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
16051+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
16052+{
16053+ return atomic64_add_return_unchecked(1, v);
16054+}
16055 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
16056
16057 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16058@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16059 return cmpxchg(&v->counter, old, new);
16060 }
16061
16062+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
16063+{
16064+ return cmpxchg(&v->counter, old, new);
16065+}
16066+
16067 static inline long atomic64_xchg(atomic64_t *v, long new)
16068 {
16069 return xchg(&v->counter, new);
16070@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
16071 */
16072 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
16073 {
16074- long c, old;
16075+ long c, old, new;
16076 c = atomic64_read(v);
16077 for (;;) {
16078- if (unlikely(c == (u)))
16079+ if (unlikely(c == u))
16080 break;
16081- old = atomic64_cmpxchg((v), c, c + (a));
16082+
16083+ asm volatile("add %2,%0\n"
16084+
16085+#ifdef CONFIG_PAX_REFCOUNT
16086+ "jno 0f\n"
16087+ "sub %2,%0\n"
16088+ "int $4\n0:\n"
16089+ _ASM_EXTABLE(0b, 0b)
16090+#endif
16091+
16092+ : "=r" (new)
16093+ : "0" (c), "ir" (a));
16094+
16095+ old = atomic64_cmpxchg(v, c, new);
16096 if (likely(old == c))
16097 break;
16098 c = old;
16099 }
16100- return c != (u);
16101+ return c != u;
16102 }
16103
16104 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16105diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16106index 959e45b..6ea9bf6 100644
16107--- a/arch/x86/include/asm/barrier.h
16108+++ b/arch/x86/include/asm/barrier.h
16109@@ -57,7 +57,7 @@
16110 do { \
16111 compiletime_assert_atomic_type(*p); \
16112 smp_mb(); \
16113- ACCESS_ONCE(*p) = (v); \
16114+ ACCESS_ONCE_RW(*p) = (v); \
16115 } while (0)
16116
16117 #define smp_load_acquire(p) \
16118@@ -74,7 +74,7 @@ do { \
16119 do { \
16120 compiletime_assert_atomic_type(*p); \
16121 barrier(); \
16122- ACCESS_ONCE(*p) = (v); \
16123+ ACCESS_ONCE_RW(*p) = (v); \
16124 } while (0)
16125
16126 #define smp_load_acquire(p) \
16127diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16128index cfe3b95..d01b118 100644
16129--- a/arch/x86/include/asm/bitops.h
16130+++ b/arch/x86/include/asm/bitops.h
16131@@ -50,7 +50,7 @@
16132 * a mask operation on a byte.
16133 */
16134 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16135-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16136+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16137 #define CONST_MASK(nr) (1 << ((nr) & 7))
16138
16139 /**
16140@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16141 */
16142 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16143 {
16144- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16145+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16146 }
16147
16148 /**
16149@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16150 */
16151 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16152 {
16153- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16154+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16155 }
16156
16157 /**
16158@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16159 */
16160 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16161 {
16162- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16163+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16164 }
16165
16166 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16167@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16168 *
16169 * Undefined if no bit exists, so code should check against 0 first.
16170 */
16171-static inline unsigned long __ffs(unsigned long word)
16172+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16173 {
16174 asm("rep; bsf %1,%0"
16175 : "=r" (word)
16176@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16177 *
16178 * Undefined if no zero exists, so code should check against ~0UL first.
16179 */
16180-static inline unsigned long ffz(unsigned long word)
16181+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16182 {
16183 asm("rep; bsf %1,%0"
16184 : "=r" (word)
16185@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16186 *
16187 * Undefined if no set bit exists, so code should check against 0 first.
16188 */
16189-static inline unsigned long __fls(unsigned long word)
16190+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16191 {
16192 asm("bsr %1,%0"
16193 : "=r" (word)
16194@@ -434,7 +434,7 @@ static inline int ffs(int x)
16195 * set bit if value is nonzero. The last (most significant) bit is
16196 * at position 32.
16197 */
16198-static inline int fls(int x)
16199+static inline int __intentional_overflow(-1) fls(int x)
16200 {
16201 int r;
16202
16203@@ -476,7 +476,7 @@ static inline int fls(int x)
16204 * at position 64.
16205 */
16206 #ifdef CONFIG_X86_64
16207-static __always_inline int fls64(__u64 x)
16208+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16209 {
16210 int bitpos = -1;
16211 /*
16212diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16213index 4fa687a..60f2d39 100644
16214--- a/arch/x86/include/asm/boot.h
16215+++ b/arch/x86/include/asm/boot.h
16216@@ -6,10 +6,15 @@
16217 #include <uapi/asm/boot.h>
16218
16219 /* Physical address where kernel should be loaded. */
16220-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16221+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16222 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16223 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16224
16225+#ifndef __ASSEMBLY__
16226+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16227+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16228+#endif
16229+
16230 /* Minimum kernel alignment, as a power of two */
16231 #ifdef CONFIG_X86_64
16232 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16233diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16234index 48f99f1..d78ebf9 100644
16235--- a/arch/x86/include/asm/cache.h
16236+++ b/arch/x86/include/asm/cache.h
16237@@ -5,12 +5,13 @@
16238
16239 /* L1 cache line size */
16240 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16241-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16242+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16243
16244 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16245+#define __read_only __attribute__((__section__(".data..read_only")))
16246
16247 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16248-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16249+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16250
16251 #ifdef CONFIG_X86_VSMP
16252 #ifdef CONFIG_SMP
16253diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16254index 1c8b50e..166bcaa 100644
16255--- a/arch/x86/include/asm/calling.h
16256+++ b/arch/x86/include/asm/calling.h
16257@@ -96,23 +96,26 @@ For 32-bit we have the following conventions - kernel is built with
16258 .endm
16259
16260 .macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1
16261+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16262+ movq_cfi r12, R12+\offset
16263+#endif
16264 .if \r11
16265- movq_cfi r11, 6*8+\offset
16266+ movq_cfi r11, R11+\offset
16267 .endif
16268 .if \r8910
16269- movq_cfi r10, 7*8+\offset
16270- movq_cfi r9, 8*8+\offset
16271- movq_cfi r8, 9*8+\offset
16272+ movq_cfi r10, R10+\offset
16273+ movq_cfi r9, R9+\offset
16274+ movq_cfi r8, R8+\offset
16275 .endif
16276 .if \rax
16277- movq_cfi rax, 10*8+\offset
16278+ movq_cfi rax, RAX+\offset
16279 .endif
16280 .if \rcx
16281- movq_cfi rcx, 11*8+\offset
16282+ movq_cfi rcx, RCX+\offset
16283 .endif
16284- movq_cfi rdx, 12*8+\offset
16285- movq_cfi rsi, 13*8+\offset
16286- movq_cfi rdi, 14*8+\offset
16287+ movq_cfi rdx, RDX+\offset
16288+ movq_cfi rsi, RSI+\offset
16289+ movq_cfi rdi, RDI+\offset
16290 .endm
16291 .macro SAVE_C_REGS offset=0
16292 SAVE_C_REGS_HELPER \offset, 1, 1, 1, 1
16293@@ -131,76 +134,87 @@ For 32-bit we have the following conventions - kernel is built with
16294 .endm
16295
16296 .macro SAVE_EXTRA_REGS offset=0
16297- movq_cfi r15, 0*8+\offset
16298- movq_cfi r14, 1*8+\offset
16299- movq_cfi r13, 2*8+\offset
16300- movq_cfi r12, 3*8+\offset
16301- movq_cfi rbp, 4*8+\offset
16302- movq_cfi rbx, 5*8+\offset
16303+ movq_cfi r15, R15+\offset
16304+ movq_cfi r14, R14+\offset
16305+ movq_cfi r13, R13+\offset
16306+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16307+ movq_cfi r12, R12+\offset
16308+#endif
16309+ movq_cfi rbp, RBP+\offset
16310+ movq_cfi rbx, RBX+\offset
16311 .endm
16312 .macro SAVE_EXTRA_REGS_RBP offset=0
16313- movq_cfi rbp, 4*8+\offset
16314+ movq_cfi rbp, RBP+\offset
16315 .endm
16316
16317 .macro RESTORE_EXTRA_REGS offset=0
16318- movq_cfi_restore 0*8+\offset, r15
16319- movq_cfi_restore 1*8+\offset, r14
16320- movq_cfi_restore 2*8+\offset, r13
16321- movq_cfi_restore 3*8+\offset, r12
16322- movq_cfi_restore 4*8+\offset, rbp
16323- movq_cfi_restore 5*8+\offset, rbx
16324+ movq_cfi_restore R15+\offset, r15
16325+ movq_cfi_restore R14+\offset, r14
16326+ movq_cfi_restore R13+\offset, r13
16327+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16328+ movq_cfi_restore R12+\offset, r12
16329+#endif
16330+ movq_cfi_restore RBP+\offset, rbp
16331+ movq_cfi_restore RBX+\offset, rbx
16332 .endm
16333
16334 .macro ZERO_EXTRA_REGS
16335 xorl %r15d, %r15d
16336 xorl %r14d, %r14d
16337 xorl %r13d, %r13d
16338+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16339 xorl %r12d, %r12d
16340+#endif
16341 xorl %ebp, %ebp
16342 xorl %ebx, %ebx
16343 .endm
16344
16345- .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1
16346+ .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1, rstor_r12=1
16347+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16348+ .if \rstor_r12
16349+ movq_cfi_restore R12, r12
16350+ .endif
16351+#endif
16352 .if \rstor_r11
16353- movq_cfi_restore 6*8, r11
16354+ movq_cfi_restore R11, r11
16355 .endif
16356 .if \rstor_r8910
16357- movq_cfi_restore 7*8, r10
16358- movq_cfi_restore 8*8, r9
16359- movq_cfi_restore 9*8, r8
16360+ movq_cfi_restore R10, r10
16361+ movq_cfi_restore R9, r9
16362+ movq_cfi_restore R8, r8
16363 .endif
16364 .if \rstor_rax
16365- movq_cfi_restore 10*8, rax
16366+ movq_cfi_restore RAX, rax
16367 .endif
16368 .if \rstor_rcx
16369- movq_cfi_restore 11*8, rcx
16370+ movq_cfi_restore RCX, rcx
16371 .endif
16372 .if \rstor_rdx
16373- movq_cfi_restore 12*8, rdx
16374+ movq_cfi_restore RDX, rdx
16375 .endif
16376- movq_cfi_restore 13*8, rsi
16377- movq_cfi_restore 14*8, rdi
16378+ movq_cfi_restore RSI, rsi
16379+ movq_cfi_restore RDI, rdi
16380 .endm
16381 .macro RESTORE_C_REGS
16382- RESTORE_C_REGS_HELPER 1,1,1,1,1
16383+ RESTORE_C_REGS_HELPER 1,1,1,1,1,1
16384 .endm
16385 .macro RESTORE_C_REGS_EXCEPT_RAX
16386- RESTORE_C_REGS_HELPER 0,1,1,1,1
16387+ RESTORE_C_REGS_HELPER 0,1,1,1,1,0
16388 .endm
16389 .macro RESTORE_C_REGS_EXCEPT_RCX
16390- RESTORE_C_REGS_HELPER 1,0,1,1,1
16391+ RESTORE_C_REGS_HELPER 1,0,1,1,1,0
16392 .endm
16393 .macro RESTORE_C_REGS_EXCEPT_R11
16394- RESTORE_C_REGS_HELPER 1,1,0,1,1
16395+ RESTORE_C_REGS_HELPER 1,1,0,1,1,1
16396 .endm
16397 .macro RESTORE_C_REGS_EXCEPT_RCX_R11
16398- RESTORE_C_REGS_HELPER 1,0,0,1,1
16399+ RESTORE_C_REGS_HELPER 1,0,0,1,1,1
16400 .endm
16401 .macro RESTORE_RSI_RDI
16402- RESTORE_C_REGS_HELPER 0,0,0,0,0
16403+ RESTORE_C_REGS_HELPER 0,0,0,0,0,1
16404 .endm
16405 .macro RESTORE_RSI_RDI_RDX
16406- RESTORE_C_REGS_HELPER 0,0,0,0,1
16407+ RESTORE_C_REGS_HELPER 0,0,0,0,1,1
16408 .endm
16409
16410 .macro REMOVE_PT_GPREGS_FROM_STACK addskip=0
16411diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16412index f50de69..2b0a458 100644
16413--- a/arch/x86/include/asm/checksum_32.h
16414+++ b/arch/x86/include/asm/checksum_32.h
16415@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16416 int len, __wsum sum,
16417 int *src_err_ptr, int *dst_err_ptr);
16418
16419+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16420+ int len, __wsum sum,
16421+ int *src_err_ptr, int *dst_err_ptr);
16422+
16423+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16424+ int len, __wsum sum,
16425+ int *src_err_ptr, int *dst_err_ptr);
16426+
16427 /*
16428 * Note: when you get a NULL pointer exception here this means someone
16429 * passed in an incorrect kernel address to one of these functions.
16430@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16431
16432 might_sleep();
16433 stac();
16434- ret = csum_partial_copy_generic((__force void *)src, dst,
16435+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16436 len, sum, err_ptr, NULL);
16437 clac();
16438
16439@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16440 might_sleep();
16441 if (access_ok(VERIFY_WRITE, dst, len)) {
16442 stac();
16443- ret = csum_partial_copy_generic(src, (__force void *)dst,
16444+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16445 len, sum, NULL, err_ptr);
16446 clac();
16447 return ret;
16448diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16449index 99c105d7..2f667ac 100644
16450--- a/arch/x86/include/asm/cmpxchg.h
16451+++ b/arch/x86/include/asm/cmpxchg.h
16452@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16453 __compiletime_error("Bad argument size for cmpxchg");
16454 extern void __xadd_wrong_size(void)
16455 __compiletime_error("Bad argument size for xadd");
16456+extern void __xadd_check_overflow_wrong_size(void)
16457+ __compiletime_error("Bad argument size for xadd_check_overflow");
16458 extern void __add_wrong_size(void)
16459 __compiletime_error("Bad argument size for add");
16460+extern void __add_check_overflow_wrong_size(void)
16461+ __compiletime_error("Bad argument size for add_check_overflow");
16462
16463 /*
16464 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16465@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16466 __ret; \
16467 })
16468
16469+#ifdef CONFIG_PAX_REFCOUNT
16470+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16471+ ({ \
16472+ __typeof__ (*(ptr)) __ret = (arg); \
16473+ switch (sizeof(*(ptr))) { \
16474+ case __X86_CASE_L: \
16475+ asm volatile (lock #op "l %0, %1\n" \
16476+ "jno 0f\n" \
16477+ "mov %0,%1\n" \
16478+ "int $4\n0:\n" \
16479+ _ASM_EXTABLE(0b, 0b) \
16480+ : "+r" (__ret), "+m" (*(ptr)) \
16481+ : : "memory", "cc"); \
16482+ break; \
16483+ case __X86_CASE_Q: \
16484+ asm volatile (lock #op "q %q0, %1\n" \
16485+ "jno 0f\n" \
16486+ "mov %0,%1\n" \
16487+ "int $4\n0:\n" \
16488+ _ASM_EXTABLE(0b, 0b) \
16489+ : "+r" (__ret), "+m" (*(ptr)) \
16490+ : : "memory", "cc"); \
16491+ break; \
16492+ default: \
16493+ __ ## op ## _check_overflow_wrong_size(); \
16494+ } \
16495+ __ret; \
16496+ })
16497+#else
16498+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16499+#endif
16500+
16501 /*
16502 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16503 * Since this is generally used to protect other memory information, we
16504@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16505 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16506 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16507
16508+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16509+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16510+
16511 #define __add(ptr, inc, lock) \
16512 ({ \
16513 __typeof__ (*(ptr)) __ret = (inc); \
16514diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16515index acdee09..a553db3 100644
16516--- a/arch/x86/include/asm/compat.h
16517+++ b/arch/x86/include/asm/compat.h
16518@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16519 typedef u32 compat_uint_t;
16520 typedef u32 compat_ulong_t;
16521 typedef u64 __attribute__((aligned(4))) compat_u64;
16522-typedef u32 compat_uptr_t;
16523+typedef u32 __user compat_uptr_t;
16524
16525 struct compat_timespec {
16526 compat_time_t tv_sec;
16527diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16528index 3d6606f..5e22255 100644
16529--- a/arch/x86/include/asm/cpufeature.h
16530+++ b/arch/x86/include/asm/cpufeature.h
16531@@ -214,7 +214,8 @@
16532 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16533 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16534 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16535-
16536+#define X86_FEATURE_PCIDUDEREF ( 8*32+30) /* PaX PCID based UDEREF */
16537+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16538
16539 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16540 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16541@@ -222,7 +223,7 @@
16542 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16543 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16544 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16545-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16546+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16547 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16548 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16549 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16550@@ -401,6 +402,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16551 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16552 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16553 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16554+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16555
16556 #if __GNUC__ >= 4
16557 extern void warn_pre_alternatives(void);
16558@@ -454,7 +456,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16559
16560 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16561 t_warn:
16562- warn_pre_alternatives();
16563+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16564+ warn_pre_alternatives();
16565 return false;
16566 #endif
16567
16568@@ -475,7 +478,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16569 ".section .discard,\"aw\",@progbits\n"
16570 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16571 ".previous\n"
16572- ".section .altinstr_replacement,\"ax\"\n"
16573+ ".section .altinstr_replacement,\"a\"\n"
16574 "3: movb $1,%0\n"
16575 "4:\n"
16576 ".previous\n"
16577@@ -510,7 +513,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16578 " .byte 5f - 4f\n" /* repl len */
16579 " .byte 3b - 2b\n" /* pad len */
16580 ".previous\n"
16581- ".section .altinstr_replacement,\"ax\"\n"
16582+ ".section .altinstr_replacement,\"a\"\n"
16583 "4: jmp %l[t_no]\n"
16584 "5:\n"
16585 ".previous\n"
16586@@ -545,7 +548,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16587 ".section .discard,\"aw\",@progbits\n"
16588 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16589 ".previous\n"
16590- ".section .altinstr_replacement,\"ax\"\n"
16591+ ".section .altinstr_replacement,\"a\"\n"
16592 "3: movb $0,%0\n"
16593 "4:\n"
16594 ".previous\n"
16595@@ -560,7 +563,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16596 ".section .discard,\"aw\",@progbits\n"
16597 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16598 ".previous\n"
16599- ".section .altinstr_replacement,\"ax\"\n"
16600+ ".section .altinstr_replacement,\"a\"\n"
16601 "5: movb $1,%0\n"
16602 "6:\n"
16603 ".previous\n"
16604diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16605index a0bf89f..56f0b2a 100644
16606--- a/arch/x86/include/asm/desc.h
16607+++ b/arch/x86/include/asm/desc.h
16608@@ -4,6 +4,7 @@
16609 #include <asm/desc_defs.h>
16610 #include <asm/ldt.h>
16611 #include <asm/mmu.h>
16612+#include <asm/pgtable.h>
16613
16614 #include <linux/smp.h>
16615 #include <linux/percpu.h>
16616@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16617
16618 desc->type = (info->read_exec_only ^ 1) << 1;
16619 desc->type |= info->contents << 2;
16620+ desc->type |= info->seg_not_present ^ 1;
16621
16622 desc->s = 1;
16623 desc->dpl = 0x3;
16624@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16625 }
16626
16627 extern struct desc_ptr idt_descr;
16628-extern gate_desc idt_table[];
16629-extern struct desc_ptr debug_idt_descr;
16630-extern gate_desc debug_idt_table[];
16631-
16632-struct gdt_page {
16633- struct desc_struct gdt[GDT_ENTRIES];
16634-} __attribute__((aligned(PAGE_SIZE)));
16635-
16636-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16637+extern gate_desc idt_table[IDT_ENTRIES];
16638+extern const struct desc_ptr debug_idt_descr;
16639+extern gate_desc debug_idt_table[IDT_ENTRIES];
16640
16641+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16642 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16643 {
16644- return per_cpu(gdt_page, cpu).gdt;
16645+ return cpu_gdt_table[cpu];
16646 }
16647
16648 #ifdef CONFIG_X86_64
16649@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16650 unsigned long base, unsigned dpl, unsigned flags,
16651 unsigned short seg)
16652 {
16653- gate->a = (seg << 16) | (base & 0xffff);
16654- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16655+ gate->gate.offset_low = base;
16656+ gate->gate.seg = seg;
16657+ gate->gate.reserved = 0;
16658+ gate->gate.type = type;
16659+ gate->gate.s = 0;
16660+ gate->gate.dpl = dpl;
16661+ gate->gate.p = 1;
16662+ gate->gate.offset_high = base >> 16;
16663 }
16664
16665 #endif
16666@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16667
16668 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16669 {
16670+ pax_open_kernel();
16671 memcpy(&idt[entry], gate, sizeof(*gate));
16672+ pax_close_kernel();
16673 }
16674
16675 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16676 {
16677+ pax_open_kernel();
16678 memcpy(&ldt[entry], desc, 8);
16679+ pax_close_kernel();
16680 }
16681
16682 static inline void
16683@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16684 default: size = sizeof(*gdt); break;
16685 }
16686
16687+ pax_open_kernel();
16688 memcpy(&gdt[entry], desc, size);
16689+ pax_close_kernel();
16690 }
16691
16692 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16693@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16694
16695 static inline void native_load_tr_desc(void)
16696 {
16697+ pax_open_kernel();
16698 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16699+ pax_close_kernel();
16700 }
16701
16702 static inline void native_load_gdt(const struct desc_ptr *dtr)
16703@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16704 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16705 unsigned int i;
16706
16707+ pax_open_kernel();
16708 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16709 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16710+ pax_close_kernel();
16711 }
16712
16713 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16714@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16715 preempt_enable();
16716 }
16717
16718-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16719+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16720 {
16721 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16722 }
16723@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16724 }
16725
16726 #ifdef CONFIG_X86_64
16727-static inline void set_nmi_gate(int gate, void *addr)
16728+static inline void set_nmi_gate(int gate, const void *addr)
16729 {
16730 gate_desc s;
16731
16732@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16733 #endif
16734
16735 #ifdef CONFIG_TRACING
16736-extern struct desc_ptr trace_idt_descr;
16737-extern gate_desc trace_idt_table[];
16738+extern const struct desc_ptr trace_idt_descr;
16739+extern gate_desc trace_idt_table[IDT_ENTRIES];
16740 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16741 {
16742 write_idt_entry(trace_idt_table, entry, gate);
16743 }
16744
16745-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16746+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16747 unsigned dpl, unsigned ist, unsigned seg)
16748 {
16749 gate_desc s;
16750@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16751 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16752 #endif
16753
16754-static inline void _set_gate(int gate, unsigned type, void *addr,
16755+static inline void _set_gate(int gate, unsigned type, const void *addr,
16756 unsigned dpl, unsigned ist, unsigned seg)
16757 {
16758 gate_desc s;
16759@@ -379,14 +392,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16760 #define set_intr_gate_notrace(n, addr) \
16761 do { \
16762 BUG_ON((unsigned)n > 0xFF); \
16763- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16764+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16765 __KERNEL_CS); \
16766 } while (0)
16767
16768 #define set_intr_gate(n, addr) \
16769 do { \
16770 set_intr_gate_notrace(n, addr); \
16771- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16772+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16773 0, 0, __KERNEL_CS); \
16774 } while (0)
16775
16776@@ -414,19 +427,19 @@ static inline void alloc_system_vector(int vector)
16777 /*
16778 * This routine sets up an interrupt gate at directory privilege level 3.
16779 */
16780-static inline void set_system_intr_gate(unsigned int n, void *addr)
16781+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16782 {
16783 BUG_ON((unsigned)n > 0xFF);
16784 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16785 }
16786
16787-static inline void set_system_trap_gate(unsigned int n, void *addr)
16788+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16789 {
16790 BUG_ON((unsigned)n > 0xFF);
16791 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16792 }
16793
16794-static inline void set_trap_gate(unsigned int n, void *addr)
16795+static inline void set_trap_gate(unsigned int n, const void *addr)
16796 {
16797 BUG_ON((unsigned)n > 0xFF);
16798 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16799@@ -435,16 +448,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16800 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16801 {
16802 BUG_ON((unsigned)n > 0xFF);
16803- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16804+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16805 }
16806
16807-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16808+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16809 {
16810 BUG_ON((unsigned)n > 0xFF);
16811 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16812 }
16813
16814-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16815+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16816 {
16817 BUG_ON((unsigned)n > 0xFF);
16818 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16819@@ -516,4 +529,17 @@ static inline void load_current_idt(void)
16820 else
16821 load_idt((const struct desc_ptr *)&idt_descr);
16822 }
16823+
16824+#ifdef CONFIG_X86_32
16825+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16826+{
16827+ struct desc_struct d;
16828+
16829+ if (likely(limit))
16830+ limit = (limit - 1UL) >> PAGE_SHIFT;
16831+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16832+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16833+}
16834+#endif
16835+
16836 #endif /* _ASM_X86_DESC_H */
16837diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16838index 278441f..b95a174 100644
16839--- a/arch/x86/include/asm/desc_defs.h
16840+++ b/arch/x86/include/asm/desc_defs.h
16841@@ -31,6 +31,12 @@ struct desc_struct {
16842 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16843 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16844 };
16845+ struct {
16846+ u16 offset_low;
16847+ u16 seg;
16848+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16849+ unsigned offset_high: 16;
16850+ } gate;
16851 };
16852 } __attribute__((packed));
16853
16854diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16855index ced283a..ffe04cc 100644
16856--- a/arch/x86/include/asm/div64.h
16857+++ b/arch/x86/include/asm/div64.h
16858@@ -39,7 +39,7 @@
16859 __mod; \
16860 })
16861
16862-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16863+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16864 {
16865 union {
16866 u64 v64;
16867diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16868index f161c18..97d43e8 100644
16869--- a/arch/x86/include/asm/elf.h
16870+++ b/arch/x86/include/asm/elf.h
16871@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16872
16873 #include <asm/vdso.h>
16874
16875-#ifdef CONFIG_X86_64
16876-extern unsigned int vdso64_enabled;
16877-#endif
16878 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16879 extern unsigned int vdso32_enabled;
16880 #endif
16881@@ -250,7 +247,25 @@ extern int force_personality32;
16882 the loader. We need to make sure that it is out of the way of the program
16883 that it will "exec", and that there is sufficient room for the brk. */
16884
16885+#ifdef CONFIG_PAX_SEGMEXEC
16886+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16887+#else
16888 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16889+#endif
16890+
16891+#ifdef CONFIG_PAX_ASLR
16892+#ifdef CONFIG_X86_32
16893+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16894+
16895+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16896+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16897+#else
16898+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16899+
16900+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16901+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16902+#endif
16903+#endif
16904
16905 /* This yields a mask that user programs can use to figure out what
16906 instruction set this CPU supports. This could be done in user space,
16907@@ -299,17 +314,13 @@ do { \
16908
16909 #define ARCH_DLINFO \
16910 do { \
16911- if (vdso64_enabled) \
16912- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16913- (unsigned long __force)current->mm->context.vdso); \
16914+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16915 } while (0)
16916
16917 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16918 #define ARCH_DLINFO_X32 \
16919 do { \
16920- if (vdso64_enabled) \
16921- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16922- (unsigned long __force)current->mm->context.vdso); \
16923+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16924 } while (0)
16925
16926 #define AT_SYSINFO 32
16927@@ -324,10 +335,10 @@ else \
16928
16929 #endif /* !CONFIG_X86_32 */
16930
16931-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16932+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16933
16934 #define VDSO_ENTRY \
16935- ((unsigned long)current->mm->context.vdso + \
16936+ (current->mm->context.vdso + \
16937 selected_vdso32->sym___kernel_vsyscall)
16938
16939 struct linux_binprm;
16940diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16941index 77a99ac..39ff7f5 100644
16942--- a/arch/x86/include/asm/emergency-restart.h
16943+++ b/arch/x86/include/asm/emergency-restart.h
16944@@ -1,6 +1,6 @@
16945 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16946 #define _ASM_X86_EMERGENCY_RESTART_H
16947
16948-extern void machine_emergency_restart(void);
16949+extern void machine_emergency_restart(void) __noreturn;
16950
16951 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16952diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16953index 1c7eefe..d0e4702 100644
16954--- a/arch/x86/include/asm/floppy.h
16955+++ b/arch/x86/include/asm/floppy.h
16956@@ -229,18 +229,18 @@ static struct fd_routine_l {
16957 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16958 } fd_routine[] = {
16959 {
16960- request_dma,
16961- free_dma,
16962- get_dma_residue,
16963- dma_mem_alloc,
16964- hard_dma_setup
16965+ ._request_dma = request_dma,
16966+ ._free_dma = free_dma,
16967+ ._get_dma_residue = get_dma_residue,
16968+ ._dma_mem_alloc = dma_mem_alloc,
16969+ ._dma_setup = hard_dma_setup
16970 },
16971 {
16972- vdma_request_dma,
16973- vdma_nop,
16974- vdma_get_dma_residue,
16975- vdma_mem_alloc,
16976- vdma_dma_setup
16977+ ._request_dma = vdma_request_dma,
16978+ ._free_dma = vdma_nop,
16979+ ._get_dma_residue = vdma_get_dma_residue,
16980+ ._dma_mem_alloc = vdma_mem_alloc,
16981+ ._dma_setup = vdma_dma_setup
16982 }
16983 };
16984
16985diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16986index da5e967..ab07eec 100644
16987--- a/arch/x86/include/asm/fpu-internal.h
16988+++ b/arch/x86/include/asm/fpu-internal.h
16989@@ -151,8 +151,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16990 #define user_insn(insn, output, input...) \
16991 ({ \
16992 int err; \
16993+ pax_open_userland(); \
16994 asm volatile(ASM_STAC "\n" \
16995- "1:" #insn "\n\t" \
16996+ "1:" \
16997+ __copyuser_seg \
16998+ #insn "\n\t" \
16999 "2: " ASM_CLAC "\n" \
17000 ".section .fixup,\"ax\"\n" \
17001 "3: movl $-1,%[err]\n" \
17002@@ -161,6 +164,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
17003 _ASM_EXTABLE(1b, 3b) \
17004 : [err] "=r" (err), output \
17005 : "0"(0), input); \
17006+ pax_close_userland(); \
17007 err; \
17008 })
17009
17010@@ -327,7 +331,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
17011 "fnclex\n\t"
17012 "emms\n\t"
17013 "fildl %P[addr]" /* set F?P to defined value */
17014- : : [addr] "m" (tsk->thread.fpu.has_fpu));
17015+ : : [addr] "m" (cpu_tss[raw_smp_processor_id()].x86_tss.sp0));
17016 }
17017
17018 return fpu_restore_checking(&tsk->thread.fpu);
17019diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
17020index b4c1f54..e290c08 100644
17021--- a/arch/x86/include/asm/futex.h
17022+++ b/arch/x86/include/asm/futex.h
17023@@ -12,6 +12,7 @@
17024 #include <asm/smap.h>
17025
17026 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
17027+ typecheck(u32 __user *, uaddr); \
17028 asm volatile("\t" ASM_STAC "\n" \
17029 "1:\t" insn "\n" \
17030 "2:\t" ASM_CLAC "\n" \
17031@@ -20,15 +21,16 @@
17032 "\tjmp\t2b\n" \
17033 "\t.previous\n" \
17034 _ASM_EXTABLE(1b, 3b) \
17035- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
17036+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
17037 : "i" (-EFAULT), "0" (oparg), "1" (0))
17038
17039 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
17040+ typecheck(u32 __user *, uaddr); \
17041 asm volatile("\t" ASM_STAC "\n" \
17042 "1:\tmovl %2, %0\n" \
17043 "\tmovl\t%0, %3\n" \
17044 "\t" insn "\n" \
17045- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
17046+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
17047 "\tjnz\t1b\n" \
17048 "3:\t" ASM_CLAC "\n" \
17049 "\t.section .fixup,\"ax\"\n" \
17050@@ -38,7 +40,7 @@
17051 _ASM_EXTABLE(1b, 4b) \
17052 _ASM_EXTABLE(2b, 4b) \
17053 : "=&a" (oldval), "=&r" (ret), \
17054- "+m" (*uaddr), "=&r" (tem) \
17055+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17056 : "r" (oparg), "i" (-EFAULT), "1" (0))
17057
17058 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17059@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17060
17061 pagefault_disable();
17062
17063+ pax_open_userland();
17064 switch (op) {
17065 case FUTEX_OP_SET:
17066- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17067+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17068 break;
17069 case FUTEX_OP_ADD:
17070- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17071+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17072 uaddr, oparg);
17073 break;
17074 case FUTEX_OP_OR:
17075@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17076 default:
17077 ret = -ENOSYS;
17078 }
17079+ pax_close_userland();
17080
17081 pagefault_enable();
17082
17083diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17084index e9571dd..df5f542 100644
17085--- a/arch/x86/include/asm/hw_irq.h
17086+++ b/arch/x86/include/asm/hw_irq.h
17087@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17088 #endif /* CONFIG_X86_LOCAL_APIC */
17089
17090 /* Statistics */
17091-extern atomic_t irq_err_count;
17092-extern atomic_t irq_mis_count;
17093+extern atomic_unchecked_t irq_err_count;
17094+extern atomic_unchecked_t irq_mis_count;
17095
17096 /* EISA */
17097 extern void eisa_set_level_irq(unsigned int irq);
17098diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17099index ccffa53..3c90c87 100644
17100--- a/arch/x86/include/asm/i8259.h
17101+++ b/arch/x86/include/asm/i8259.h
17102@@ -62,7 +62,7 @@ struct legacy_pic {
17103 void (*init)(int auto_eoi);
17104 int (*irq_pending)(unsigned int irq);
17105 void (*make_irq)(unsigned int irq);
17106-};
17107+} __do_const;
17108
17109 extern struct legacy_pic *legacy_pic;
17110 extern struct legacy_pic null_legacy_pic;
17111diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17112index 34a5b93..27e40a6 100644
17113--- a/arch/x86/include/asm/io.h
17114+++ b/arch/x86/include/asm/io.h
17115@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17116 "m" (*(volatile type __force *)addr) barrier); }
17117
17118 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17119-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17120-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17121+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17122+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17123
17124 build_mmio_read(__readb, "b", unsigned char, "=q", )
17125-build_mmio_read(__readw, "w", unsigned short, "=r", )
17126-build_mmio_read(__readl, "l", unsigned int, "=r", )
17127+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17128+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17129
17130 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17131 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17132@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17133 * this function
17134 */
17135
17136-static inline phys_addr_t virt_to_phys(volatile void *address)
17137+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17138 {
17139 return __pa(address);
17140 }
17141@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17142 return ioremap_nocache(offset, size);
17143 }
17144
17145-extern void iounmap(volatile void __iomem *addr);
17146+extern void iounmap(const volatile void __iomem *addr);
17147
17148 extern void set_iounmap_nonlazy(void);
17149
17150@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17151
17152 #include <linux/vmalloc.h>
17153
17154+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17155+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17156+{
17157+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17158+}
17159+
17160+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17161+{
17162+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17163+}
17164+
17165 /*
17166 * Convert a virtual cached pointer to an uncached pointer
17167 */
17168diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17169index b77f5ed..a2f791e 100644
17170--- a/arch/x86/include/asm/irqflags.h
17171+++ b/arch/x86/include/asm/irqflags.h
17172@@ -137,6 +137,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17173 swapgs; \
17174 sysretl
17175
17176+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17177+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17178+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17179+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17180+
17181 #else
17182 #define INTERRUPT_RETURN iret
17183 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17184diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17185index 4421b5d..8543006 100644
17186--- a/arch/x86/include/asm/kprobes.h
17187+++ b/arch/x86/include/asm/kprobes.h
17188@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17189 #define RELATIVEJUMP_SIZE 5
17190 #define RELATIVECALL_OPCODE 0xe8
17191 #define RELATIVE_ADDR_SIZE 4
17192-#define MAX_STACK_SIZE 64
17193-#define MIN_STACK_SIZE(ADDR) \
17194- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17195- THREAD_SIZE - (unsigned long)(ADDR))) \
17196- ? (MAX_STACK_SIZE) \
17197- : (((unsigned long)current_thread_info()) + \
17198- THREAD_SIZE - (unsigned long)(ADDR)))
17199+#define MAX_STACK_SIZE 64UL
17200+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17201
17202 #define flush_insn_slot(p) do { } while (0)
17203
17204diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17205index 4ad6560..75c7bdd 100644
17206--- a/arch/x86/include/asm/local.h
17207+++ b/arch/x86/include/asm/local.h
17208@@ -10,33 +10,97 @@ typedef struct {
17209 atomic_long_t a;
17210 } local_t;
17211
17212+typedef struct {
17213+ atomic_long_unchecked_t a;
17214+} local_unchecked_t;
17215+
17216 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17217
17218 #define local_read(l) atomic_long_read(&(l)->a)
17219+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17220 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17221+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17222
17223 static inline void local_inc(local_t *l)
17224 {
17225- asm volatile(_ASM_INC "%0"
17226+ asm volatile(_ASM_INC "%0\n"
17227+
17228+#ifdef CONFIG_PAX_REFCOUNT
17229+ "jno 0f\n"
17230+ _ASM_DEC "%0\n"
17231+ "int $4\n0:\n"
17232+ _ASM_EXTABLE(0b, 0b)
17233+#endif
17234+
17235+ : "+m" (l->a.counter));
17236+}
17237+
17238+static inline void local_inc_unchecked(local_unchecked_t *l)
17239+{
17240+ asm volatile(_ASM_INC "%0\n"
17241 : "+m" (l->a.counter));
17242 }
17243
17244 static inline void local_dec(local_t *l)
17245 {
17246- asm volatile(_ASM_DEC "%0"
17247+ asm volatile(_ASM_DEC "%0\n"
17248+
17249+#ifdef CONFIG_PAX_REFCOUNT
17250+ "jno 0f\n"
17251+ _ASM_INC "%0\n"
17252+ "int $4\n0:\n"
17253+ _ASM_EXTABLE(0b, 0b)
17254+#endif
17255+
17256+ : "+m" (l->a.counter));
17257+}
17258+
17259+static inline void local_dec_unchecked(local_unchecked_t *l)
17260+{
17261+ asm volatile(_ASM_DEC "%0\n"
17262 : "+m" (l->a.counter));
17263 }
17264
17265 static inline void local_add(long i, local_t *l)
17266 {
17267- asm volatile(_ASM_ADD "%1,%0"
17268+ asm volatile(_ASM_ADD "%1,%0\n"
17269+
17270+#ifdef CONFIG_PAX_REFCOUNT
17271+ "jno 0f\n"
17272+ _ASM_SUB "%1,%0\n"
17273+ "int $4\n0:\n"
17274+ _ASM_EXTABLE(0b, 0b)
17275+#endif
17276+
17277+ : "+m" (l->a.counter)
17278+ : "ir" (i));
17279+}
17280+
17281+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17282+{
17283+ asm volatile(_ASM_ADD "%1,%0\n"
17284 : "+m" (l->a.counter)
17285 : "ir" (i));
17286 }
17287
17288 static inline void local_sub(long i, local_t *l)
17289 {
17290- asm volatile(_ASM_SUB "%1,%0"
17291+ asm volatile(_ASM_SUB "%1,%0\n"
17292+
17293+#ifdef CONFIG_PAX_REFCOUNT
17294+ "jno 0f\n"
17295+ _ASM_ADD "%1,%0\n"
17296+ "int $4\n0:\n"
17297+ _ASM_EXTABLE(0b, 0b)
17298+#endif
17299+
17300+ : "+m" (l->a.counter)
17301+ : "ir" (i));
17302+}
17303+
17304+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17305+{
17306+ asm volatile(_ASM_SUB "%1,%0\n"
17307 : "+m" (l->a.counter)
17308 : "ir" (i));
17309 }
17310@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17311 */
17312 static inline int local_sub_and_test(long i, local_t *l)
17313 {
17314- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17315+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17316 }
17317
17318 /**
17319@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17320 */
17321 static inline int local_dec_and_test(local_t *l)
17322 {
17323- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17324+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17325 }
17326
17327 /**
17328@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17329 */
17330 static inline int local_inc_and_test(local_t *l)
17331 {
17332- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17333+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17334 }
17335
17336 /**
17337@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17338 */
17339 static inline int local_add_negative(long i, local_t *l)
17340 {
17341- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17342+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17343 }
17344
17345 /**
17346@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17347 static inline long local_add_return(long i, local_t *l)
17348 {
17349 long __i = i;
17350+ asm volatile(_ASM_XADD "%0, %1\n"
17351+
17352+#ifdef CONFIG_PAX_REFCOUNT
17353+ "jno 0f\n"
17354+ _ASM_MOV "%0,%1\n"
17355+ "int $4\n0:\n"
17356+ _ASM_EXTABLE(0b, 0b)
17357+#endif
17358+
17359+ : "+r" (i), "+m" (l->a.counter)
17360+ : : "memory");
17361+ return i + __i;
17362+}
17363+
17364+/**
17365+ * local_add_return_unchecked - add and return
17366+ * @i: integer value to add
17367+ * @l: pointer to type local_unchecked_t
17368+ *
17369+ * Atomically adds @i to @l and returns @i + @l
17370+ */
17371+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17372+{
17373+ long __i = i;
17374 asm volatile(_ASM_XADD "%0, %1;"
17375 : "+r" (i), "+m" (l->a.counter)
17376 : : "memory");
17377@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17378
17379 #define local_cmpxchg(l, o, n) \
17380 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17381+#define local_cmpxchg_unchecked(l, o, n) \
17382+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17383 /* Always has a lock prefix */
17384 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17385
17386diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17387new file mode 100644
17388index 0000000..2bfd3ba
17389--- /dev/null
17390+++ b/arch/x86/include/asm/mman.h
17391@@ -0,0 +1,15 @@
17392+#ifndef _X86_MMAN_H
17393+#define _X86_MMAN_H
17394+
17395+#include <uapi/asm/mman.h>
17396+
17397+#ifdef __KERNEL__
17398+#ifndef __ASSEMBLY__
17399+#ifdef CONFIG_X86_32
17400+#define arch_mmap_check i386_mmap_check
17401+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17402+#endif
17403+#endif
17404+#endif
17405+
17406+#endif /* X86_MMAN_H */
17407diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17408index 09b9620..923aecd 100644
17409--- a/arch/x86/include/asm/mmu.h
17410+++ b/arch/x86/include/asm/mmu.h
17411@@ -9,7 +9,7 @@
17412 * we put the segment information here.
17413 */
17414 typedef struct {
17415- void *ldt;
17416+ struct desc_struct *ldt;
17417 int size;
17418
17419 #ifdef CONFIG_X86_64
17420@@ -18,7 +18,19 @@ typedef struct {
17421 #endif
17422
17423 struct mutex lock;
17424- void __user *vdso;
17425+ unsigned long vdso;
17426+
17427+#ifdef CONFIG_X86_32
17428+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17429+ unsigned long user_cs_base;
17430+ unsigned long user_cs_limit;
17431+
17432+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17433+ cpumask_t cpu_user_cs_mask;
17434+#endif
17435+
17436+#endif
17437+#endif
17438
17439 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17440 } mm_context_t;
17441diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17442index 883f6b93..5184058 100644
17443--- a/arch/x86/include/asm/mmu_context.h
17444+++ b/arch/x86/include/asm/mmu_context.h
17445@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17446
17447 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17448 {
17449+
17450+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17451+ if (!(static_cpu_has(X86_FEATURE_PCIDUDEREF))) {
17452+ unsigned int i;
17453+ pgd_t *pgd;
17454+
17455+ pax_open_kernel();
17456+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17457+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17458+ set_pgd_batched(pgd+i, native_make_pgd(0));
17459+ pax_close_kernel();
17460+ }
17461+#endif
17462+
17463 #ifdef CONFIG_SMP
17464 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17465 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17466@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17467 struct task_struct *tsk)
17468 {
17469 unsigned cpu = smp_processor_id();
17470+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17471+ int tlbstate = TLBSTATE_OK;
17472+#endif
17473
17474 if (likely(prev != next)) {
17475 #ifdef CONFIG_SMP
17476+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17477+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17478+#endif
17479 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17480 this_cpu_write(cpu_tlbstate.active_mm, next);
17481 #endif
17482 cpumask_set_cpu(cpu, mm_cpumask(next));
17483
17484 /* Re-load page tables */
17485+#ifdef CONFIG_PAX_PER_CPU_PGD
17486+ pax_open_kernel();
17487+
17488+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17489+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17490+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17491+ else
17492+#endif
17493+
17494+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17495+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17496+ pax_close_kernel();
17497+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17498+
17499+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17500+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17501+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17502+ u64 descriptor[2];
17503+ descriptor[0] = PCID_USER;
17504+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17505+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17506+ descriptor[0] = PCID_KERNEL;
17507+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17508+ }
17509+ } else {
17510+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17511+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17512+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17513+ else
17514+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17515+ }
17516+ } else
17517+#endif
17518+
17519+ load_cr3(get_cpu_pgd(cpu, kernel));
17520+#else
17521 load_cr3(next->pgd);
17522+#endif
17523 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17524
17525 /* Stop flush ipis for the previous mm */
17526@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17527 */
17528 if (unlikely(prev->context.ldt != next->context.ldt))
17529 load_LDT_nolock(&next->context);
17530+
17531+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17532+ if (!(__supported_pte_mask & _PAGE_NX)) {
17533+ smp_mb__before_atomic();
17534+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17535+ smp_mb__after_atomic();
17536+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17537+ }
17538+#endif
17539+
17540+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17541+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17542+ prev->context.user_cs_limit != next->context.user_cs_limit))
17543+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17544+#ifdef CONFIG_SMP
17545+ else if (unlikely(tlbstate != TLBSTATE_OK))
17546+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17547+#endif
17548+#endif
17549+
17550 }
17551+ else {
17552+
17553+#ifdef CONFIG_PAX_PER_CPU_PGD
17554+ pax_open_kernel();
17555+
17556+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17557+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17558+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17559+ else
17560+#endif
17561+
17562+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17563+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17564+ pax_close_kernel();
17565+ 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));
17566+
17567+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17568+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17569+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17570+ u64 descriptor[2];
17571+ descriptor[0] = PCID_USER;
17572+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17573+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17574+ descriptor[0] = PCID_KERNEL;
17575+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17576+ }
17577+ } else {
17578+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17579+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17580+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17581+ else
17582+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17583+ }
17584+ } else
17585+#endif
17586+
17587+ load_cr3(get_cpu_pgd(cpu, kernel));
17588+#endif
17589+
17590 #ifdef CONFIG_SMP
17591- else {
17592 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17593 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17594
17595@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17596 * tlb flush IPI delivery. We must reload CR3
17597 * to make sure to use no freed page tables.
17598 */
17599+
17600+#ifndef CONFIG_PAX_PER_CPU_PGD
17601 load_cr3(next->pgd);
17602 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17603+#endif
17604+
17605 load_mm_cr4(next);
17606 load_LDT_nolock(&next->context);
17607+
17608+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17609+ if (!(__supported_pte_mask & _PAGE_NX))
17610+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17611+#endif
17612+
17613+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17614+#ifdef CONFIG_PAX_PAGEEXEC
17615+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17616+#endif
17617+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17618+#endif
17619+
17620 }
17621+#endif
17622 }
17623-#endif
17624 }
17625
17626 #define activate_mm(prev, next) \
17627diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17628index e3b7819..b257c64 100644
17629--- a/arch/x86/include/asm/module.h
17630+++ b/arch/x86/include/asm/module.h
17631@@ -5,6 +5,7 @@
17632
17633 #ifdef CONFIG_X86_64
17634 /* X86_64 does not define MODULE_PROC_FAMILY */
17635+#define MODULE_PROC_FAMILY ""
17636 #elif defined CONFIG_M486
17637 #define MODULE_PROC_FAMILY "486 "
17638 #elif defined CONFIG_M586
17639@@ -57,8 +58,20 @@
17640 #error unknown processor family
17641 #endif
17642
17643-#ifdef CONFIG_X86_32
17644-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17645+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17646+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17647+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17648+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17649+#else
17650+#define MODULE_PAX_KERNEXEC ""
17651 #endif
17652
17653+#ifdef CONFIG_PAX_MEMORY_UDEREF
17654+#define MODULE_PAX_UDEREF "UDEREF "
17655+#else
17656+#define MODULE_PAX_UDEREF ""
17657+#endif
17658+
17659+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17660+
17661 #endif /* _ASM_X86_MODULE_H */
17662diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17663index 5f2fc44..106caa6 100644
17664--- a/arch/x86/include/asm/nmi.h
17665+++ b/arch/x86/include/asm/nmi.h
17666@@ -36,26 +36,35 @@ enum {
17667
17668 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17669
17670+struct nmiaction;
17671+
17672+struct nmiwork {
17673+ const struct nmiaction *action;
17674+ u64 max_duration;
17675+ struct irq_work irq_work;
17676+};
17677+
17678 struct nmiaction {
17679 struct list_head list;
17680 nmi_handler_t handler;
17681- u64 max_duration;
17682- struct irq_work irq_work;
17683 unsigned long flags;
17684 const char *name;
17685-};
17686+ struct nmiwork *work;
17687+} __do_const;
17688
17689 #define register_nmi_handler(t, fn, fg, n, init...) \
17690 ({ \
17691- static struct nmiaction init fn##_na = { \
17692+ static struct nmiwork fn##_nw; \
17693+ static const struct nmiaction init fn##_na = { \
17694 .handler = (fn), \
17695 .name = (n), \
17696 .flags = (fg), \
17697+ .work = &fn##_nw, \
17698 }; \
17699 __register_nmi_handler((t), &fn##_na); \
17700 })
17701
17702-int __register_nmi_handler(unsigned int, struct nmiaction *);
17703+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17704
17705 void unregister_nmi_handler(unsigned int, const char *);
17706
17707diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17708index 802dde3..9183e68 100644
17709--- a/arch/x86/include/asm/page.h
17710+++ b/arch/x86/include/asm/page.h
17711@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17712 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17713
17714 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17715+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17716
17717 #define __boot_va(x) __va(x)
17718 #define __boot_pa(x) __pa(x)
17719@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17720 * virt_to_page(kaddr) returns a valid pointer if and only if
17721 * virt_addr_valid(kaddr) returns true.
17722 */
17723-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17724 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17725 extern bool __virt_addr_valid(unsigned long kaddr);
17726 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17727
17728+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17729+#define virt_to_page(kaddr) \
17730+ ({ \
17731+ const void *__kaddr = (const void *)(kaddr); \
17732+ BUG_ON(!virt_addr_valid(__kaddr)); \
17733+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17734+ })
17735+#else
17736+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17737+#endif
17738+
17739 #endif /* __ASSEMBLY__ */
17740
17741 #include <asm-generic/memory_model.h>
17742diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17743index b3bebf9..13ac22e 100644
17744--- a/arch/x86/include/asm/page_64.h
17745+++ b/arch/x86/include/asm/page_64.h
17746@@ -7,9 +7,9 @@
17747
17748 /* duplicated to the one in bootmem.h */
17749 extern unsigned long max_pfn;
17750-extern unsigned long phys_base;
17751+extern const unsigned long phys_base;
17752
17753-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17754+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17755 {
17756 unsigned long y = x - __START_KERNEL_map;
17757
17758@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17759 }
17760
17761 #ifdef CONFIG_DEBUG_VIRTUAL
17762-extern unsigned long __phys_addr(unsigned long);
17763-extern unsigned long __phys_addr_symbol(unsigned long);
17764+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17765+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17766 #else
17767 #define __phys_addr(x) __phys_addr_nodebug(x)
17768 #define __phys_addr_symbol(x) \
17769diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17770index 8957810..f34efb4 100644
17771--- a/arch/x86/include/asm/paravirt.h
17772+++ b/arch/x86/include/asm/paravirt.h
17773@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17774 return (pmd_t) { ret };
17775 }
17776
17777-static inline pmdval_t pmd_val(pmd_t pmd)
17778+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17779 {
17780 pmdval_t ret;
17781
17782@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17783 val);
17784 }
17785
17786+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17787+{
17788+ pgdval_t val = native_pgd_val(pgd);
17789+
17790+ if (sizeof(pgdval_t) > sizeof(long))
17791+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17792+ val, (u64)val >> 32);
17793+ else
17794+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17795+ val);
17796+}
17797+
17798 static inline void pgd_clear(pgd_t *pgdp)
17799 {
17800 set_pgd(pgdp, __pgd(0));
17801@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17802 pv_mmu_ops.set_fixmap(idx, phys, flags);
17803 }
17804
17805+#ifdef CONFIG_PAX_KERNEXEC
17806+static inline unsigned long pax_open_kernel(void)
17807+{
17808+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17809+}
17810+
17811+static inline unsigned long pax_close_kernel(void)
17812+{
17813+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17814+}
17815+#else
17816+static inline unsigned long pax_open_kernel(void) { return 0; }
17817+static inline unsigned long pax_close_kernel(void) { return 0; }
17818+#endif
17819+
17820 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17821
17822 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17823@@ -906,7 +933,7 @@ extern void default_banner(void);
17824
17825 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17826 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17827-#define PARA_INDIRECT(addr) *%cs:addr
17828+#define PARA_INDIRECT(addr) *%ss:addr
17829 #endif
17830
17831 #define INTERRUPT_RETURN \
17832@@ -976,6 +1003,21 @@ extern void default_banner(void);
17833 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64), \
17834 CLBR_NONE, \
17835 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
17836+
17837+#define GET_CR0_INTO_RDI \
17838+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17839+ mov %rax,%rdi
17840+
17841+#define SET_RDI_INTO_CR0 \
17842+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17843+
17844+#define GET_CR3_INTO_RDI \
17845+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17846+ mov %rax,%rdi
17847+
17848+#define SET_RDI_INTO_CR3 \
17849+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17850+
17851 #endif /* CONFIG_X86_32 */
17852
17853 #endif /* __ASSEMBLY__ */
17854diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17855index f7b0b5c..cdd33f9 100644
17856--- a/arch/x86/include/asm/paravirt_types.h
17857+++ b/arch/x86/include/asm/paravirt_types.h
17858@@ -84,7 +84,7 @@ struct pv_init_ops {
17859 */
17860 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17861 unsigned long addr, unsigned len);
17862-};
17863+} __no_const __no_randomize_layout;
17864
17865
17866 struct pv_lazy_ops {
17867@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17868 void (*enter)(void);
17869 void (*leave)(void);
17870 void (*flush)(void);
17871-};
17872+} __no_randomize_layout;
17873
17874 struct pv_time_ops {
17875 unsigned long long (*sched_clock)(void);
17876 unsigned long long (*steal_clock)(int cpu);
17877 unsigned long (*get_tsc_khz)(void);
17878-};
17879+} __no_const __no_randomize_layout;
17880
17881 struct pv_cpu_ops {
17882 /* hooks for various privileged instructions */
17883@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17884
17885 void (*start_context_switch)(struct task_struct *prev);
17886 void (*end_context_switch)(struct task_struct *next);
17887-};
17888+} __no_const __no_randomize_layout;
17889
17890 struct pv_irq_ops {
17891 /*
17892@@ -215,7 +215,7 @@ struct pv_irq_ops {
17893 #ifdef CONFIG_X86_64
17894 void (*adjust_exception_frame)(void);
17895 #endif
17896-};
17897+} __no_randomize_layout;
17898
17899 struct pv_apic_ops {
17900 #ifdef CONFIG_X86_LOCAL_APIC
17901@@ -223,7 +223,7 @@ struct pv_apic_ops {
17902 unsigned long start_eip,
17903 unsigned long start_esp);
17904 #endif
17905-};
17906+} __no_const __no_randomize_layout;
17907
17908 struct pv_mmu_ops {
17909 unsigned long (*read_cr2)(void);
17910@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17911 struct paravirt_callee_save make_pud;
17912
17913 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17914+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17915 #endif /* CONFIG_PGTABLE_LEVELS == 4 */
17916 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
17917
17918@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17919 an mfn. We can tell which is which from the index. */
17920 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17921 phys_addr_t phys, pgprot_t flags);
17922-};
17923+
17924+#ifdef CONFIG_PAX_KERNEXEC
17925+ unsigned long (*pax_open_kernel)(void);
17926+ unsigned long (*pax_close_kernel)(void);
17927+#endif
17928+
17929+} __no_randomize_layout;
17930
17931 struct arch_spinlock;
17932 #ifdef CONFIG_SMP
17933@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17934 struct pv_lock_ops {
17935 struct paravirt_callee_save lock_spinning;
17936 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17937-};
17938+} __no_randomize_layout;
17939
17940 /* This contains all the paravirt structures: we get a convenient
17941 * number for each function using the offset which we use to indicate
17942- * what to patch. */
17943+ * what to patch.
17944+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17945+ */
17946+
17947 struct paravirt_patch_template {
17948 struct pv_init_ops pv_init_ops;
17949 struct pv_time_ops pv_time_ops;
17950@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17951 struct pv_apic_ops pv_apic_ops;
17952 struct pv_mmu_ops pv_mmu_ops;
17953 struct pv_lock_ops pv_lock_ops;
17954-};
17955+} __no_randomize_layout;
17956
17957 extern struct pv_info pv_info;
17958 extern struct pv_init_ops pv_init_ops;
17959diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17960index bf7f8b5..ca5799d 100644
17961--- a/arch/x86/include/asm/pgalloc.h
17962+++ b/arch/x86/include/asm/pgalloc.h
17963@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17964 pmd_t *pmd, pte_t *pte)
17965 {
17966 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17967+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17968+}
17969+
17970+static inline void pmd_populate_user(struct mm_struct *mm,
17971+ pmd_t *pmd, pte_t *pte)
17972+{
17973+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17974 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17975 }
17976
17977@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17978
17979 #ifdef CONFIG_X86_PAE
17980 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17981+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17982+{
17983+ pud_populate(mm, pudp, pmd);
17984+}
17985 #else /* !CONFIG_X86_PAE */
17986 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17987 {
17988 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17989 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17990 }
17991+
17992+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17993+{
17994+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17995+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17996+}
17997 #endif /* CONFIG_X86_PAE */
17998
17999 #if CONFIG_PGTABLE_LEVELS > 3
18000@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
18001 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
18002 }
18003
18004+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
18005+{
18006+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
18007+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
18008+}
18009+
18010 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
18011 {
18012 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
18013diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
18014index fd74a11..35fd5af 100644
18015--- a/arch/x86/include/asm/pgtable-2level.h
18016+++ b/arch/x86/include/asm/pgtable-2level.h
18017@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
18018
18019 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18020 {
18021+ pax_open_kernel();
18022 *pmdp = pmd;
18023+ pax_close_kernel();
18024 }
18025
18026 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18027diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
18028index cdaa58c..e61122b 100644
18029--- a/arch/x86/include/asm/pgtable-3level.h
18030+++ b/arch/x86/include/asm/pgtable-3level.h
18031@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18032
18033 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18034 {
18035+ pax_open_kernel();
18036 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
18037+ pax_close_kernel();
18038 }
18039
18040 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18041 {
18042+ pax_open_kernel();
18043 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
18044+ pax_close_kernel();
18045 }
18046
18047 /*
18048diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
18049index fe57e7a..0573d42 100644
18050--- a/arch/x86/include/asm/pgtable.h
18051+++ b/arch/x86/include/asm/pgtable.h
18052@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18053
18054 #ifndef __PAGETABLE_PUD_FOLDED
18055 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18056+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18057 #define pgd_clear(pgd) native_pgd_clear(pgd)
18058 #endif
18059
18060@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18061
18062 #define arch_end_context_switch(prev) do {} while(0)
18063
18064+#define pax_open_kernel() native_pax_open_kernel()
18065+#define pax_close_kernel() native_pax_close_kernel()
18066 #endif /* CONFIG_PARAVIRT */
18067
18068+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18069+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18070+
18071+#ifdef CONFIG_PAX_KERNEXEC
18072+static inline unsigned long native_pax_open_kernel(void)
18073+{
18074+ unsigned long cr0;
18075+
18076+ preempt_disable();
18077+ barrier();
18078+ cr0 = read_cr0() ^ X86_CR0_WP;
18079+ BUG_ON(cr0 & X86_CR0_WP);
18080+ write_cr0(cr0);
18081+ barrier();
18082+ return cr0 ^ X86_CR0_WP;
18083+}
18084+
18085+static inline unsigned long native_pax_close_kernel(void)
18086+{
18087+ unsigned long cr0;
18088+
18089+ barrier();
18090+ cr0 = read_cr0() ^ X86_CR0_WP;
18091+ BUG_ON(!(cr0 & X86_CR0_WP));
18092+ write_cr0(cr0);
18093+ barrier();
18094+ preempt_enable_no_resched();
18095+ return cr0 ^ X86_CR0_WP;
18096+}
18097+#else
18098+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18099+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18100+#endif
18101+
18102 /*
18103 * The following only work if pte_present() is true.
18104 * Undefined behaviour if not..
18105 */
18106+static inline int pte_user(pte_t pte)
18107+{
18108+ return pte_val(pte) & _PAGE_USER;
18109+}
18110+
18111 static inline int pte_dirty(pte_t pte)
18112 {
18113 return pte_flags(pte) & _PAGE_DIRTY;
18114@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18115 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18116 }
18117
18118+static inline unsigned long pgd_pfn(pgd_t pgd)
18119+{
18120+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18121+}
18122+
18123 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18124
18125 static inline int pmd_large(pmd_t pte)
18126@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18127 return pte_clear_flags(pte, _PAGE_RW);
18128 }
18129
18130+static inline pte_t pte_mkread(pte_t pte)
18131+{
18132+ return __pte(pte_val(pte) | _PAGE_USER);
18133+}
18134+
18135 static inline pte_t pte_mkexec(pte_t pte)
18136 {
18137- return pte_clear_flags(pte, _PAGE_NX);
18138+#ifdef CONFIG_X86_PAE
18139+ if (__supported_pte_mask & _PAGE_NX)
18140+ return pte_clear_flags(pte, _PAGE_NX);
18141+ else
18142+#endif
18143+ return pte_set_flags(pte, _PAGE_USER);
18144+}
18145+
18146+static inline pte_t pte_exprotect(pte_t pte)
18147+{
18148+#ifdef CONFIG_X86_PAE
18149+ if (__supported_pte_mask & _PAGE_NX)
18150+ return pte_set_flags(pte, _PAGE_NX);
18151+ else
18152+#endif
18153+ return pte_clear_flags(pte, _PAGE_USER);
18154 }
18155
18156 static inline pte_t pte_mkdirty(pte_t pte)
18157@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18158 #endif
18159
18160 #ifndef __ASSEMBLY__
18161+
18162+#ifdef CONFIG_PAX_PER_CPU_PGD
18163+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18164+enum cpu_pgd_type {kernel = 0, user = 1};
18165+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18166+{
18167+ return cpu_pgd[cpu][type];
18168+}
18169+#endif
18170+
18171 #include <linux/mm_types.h>
18172 #include <linux/mmdebug.h>
18173 #include <linux/log2.h>
18174@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18175 * Currently stuck as a macro due to indirect forward reference to
18176 * linux/mmzone.h's __section_mem_map_addr() definition:
18177 */
18178-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18179+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18180
18181 /* Find an entry in the second-level page table.. */
18182 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18183@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18184 * Currently stuck as a macro due to indirect forward reference to
18185 * linux/mmzone.h's __section_mem_map_addr() definition:
18186 */
18187-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18188+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18189
18190 /* to find an entry in a page-table-directory. */
18191 static inline unsigned long pud_index(unsigned long address)
18192@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18193
18194 static inline int pgd_bad(pgd_t pgd)
18195 {
18196- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18197+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18198 }
18199
18200 static inline int pgd_none(pgd_t pgd)
18201@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18202 * pgd_offset() returns a (pgd_t *)
18203 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18204 */
18205-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18206+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18207+
18208+#ifdef CONFIG_PAX_PER_CPU_PGD
18209+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18210+#endif
18211+
18212 /*
18213 * a shortcut which implies the use of the kernel's pgd, instead
18214 * of a process's
18215@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18216 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18217 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18218
18219+#ifdef CONFIG_X86_32
18220+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18221+#else
18222+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18223+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18224+
18225+#ifdef CONFIG_PAX_MEMORY_UDEREF
18226+#ifdef __ASSEMBLY__
18227+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18228+#else
18229+extern unsigned long pax_user_shadow_base;
18230+extern pgdval_t clone_pgd_mask;
18231+#endif
18232+#else
18233+#define pax_user_shadow_base (0UL)
18234+#endif
18235+
18236+#endif
18237+
18238 #ifndef __ASSEMBLY__
18239
18240 extern int direct_gbpages;
18241@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18242 * dst and src can be on the same page, but the range must not overlap,
18243 * and must not cross a page boundary.
18244 */
18245-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18246+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18247 {
18248- memcpy(dst, src, count * sizeof(pgd_t));
18249+ pax_open_kernel();
18250+ while (count--)
18251+ *dst++ = *src++;
18252+ pax_close_kernel();
18253 }
18254
18255+#ifdef CONFIG_PAX_PER_CPU_PGD
18256+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18257+#endif
18258+
18259+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18260+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18261+#else
18262+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18263+#endif
18264+
18265 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18266 static inline int page_level_shift(enum pg_level level)
18267 {
18268diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18269index b6c0b40..3535d47 100644
18270--- a/arch/x86/include/asm/pgtable_32.h
18271+++ b/arch/x86/include/asm/pgtable_32.h
18272@@ -25,9 +25,6 @@
18273 struct mm_struct;
18274 struct vm_area_struct;
18275
18276-extern pgd_t swapper_pg_dir[1024];
18277-extern pgd_t initial_page_table[1024];
18278-
18279 static inline void pgtable_cache_init(void) { }
18280 static inline void check_pgt_cache(void) { }
18281 void paging_init(void);
18282@@ -45,6 +42,12 @@ void paging_init(void);
18283 # include <asm/pgtable-2level.h>
18284 #endif
18285
18286+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18287+extern pgd_t initial_page_table[PTRS_PER_PGD];
18288+#ifdef CONFIG_X86_PAE
18289+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18290+#endif
18291+
18292 #if defined(CONFIG_HIGHPTE)
18293 #define pte_offset_map(dir, address) \
18294 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18295@@ -59,12 +62,17 @@ void paging_init(void);
18296 /* Clear a kernel PTE and flush it from the TLB */
18297 #define kpte_clear_flush(ptep, vaddr) \
18298 do { \
18299+ pax_open_kernel(); \
18300 pte_clear(&init_mm, (vaddr), (ptep)); \
18301+ pax_close_kernel(); \
18302 __flush_tlb_one((vaddr)); \
18303 } while (0)
18304
18305 #endif /* !__ASSEMBLY__ */
18306
18307+#define HAVE_ARCH_UNMAPPED_AREA
18308+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18309+
18310 /*
18311 * kern_addr_valid() is (1) for FLATMEM and (0) for
18312 * SPARSEMEM and DISCONTIGMEM
18313diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18314index 9fb2f2b..b04b4bf 100644
18315--- a/arch/x86/include/asm/pgtable_32_types.h
18316+++ b/arch/x86/include/asm/pgtable_32_types.h
18317@@ -8,7 +8,7 @@
18318 */
18319 #ifdef CONFIG_X86_PAE
18320 # include <asm/pgtable-3level_types.h>
18321-# define PMD_SIZE (1UL << PMD_SHIFT)
18322+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18323 # define PMD_MASK (~(PMD_SIZE - 1))
18324 #else
18325 # include <asm/pgtable-2level_types.h>
18326@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18327 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18328 #endif
18329
18330+#ifdef CONFIG_PAX_KERNEXEC
18331+#ifndef __ASSEMBLY__
18332+extern unsigned char MODULES_EXEC_VADDR[];
18333+extern unsigned char MODULES_EXEC_END[];
18334+#endif
18335+#include <asm/boot.h>
18336+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18337+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18338+#else
18339+#define ktla_ktva(addr) (addr)
18340+#define ktva_ktla(addr) (addr)
18341+#endif
18342+
18343 #define MODULES_VADDR VMALLOC_START
18344 #define MODULES_END VMALLOC_END
18345 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18346diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18347index 2ee7811..55aca24 100644
18348--- a/arch/x86/include/asm/pgtable_64.h
18349+++ b/arch/x86/include/asm/pgtable_64.h
18350@@ -16,11 +16,16 @@
18351
18352 extern pud_t level3_kernel_pgt[512];
18353 extern pud_t level3_ident_pgt[512];
18354+extern pud_t level3_vmalloc_start_pgt[512];
18355+extern pud_t level3_vmalloc_end_pgt[512];
18356+extern pud_t level3_vmemmap_pgt[512];
18357+extern pud_t level2_vmemmap_pgt[512];
18358 extern pmd_t level2_kernel_pgt[512];
18359 extern pmd_t level2_fixmap_pgt[512];
18360-extern pmd_t level2_ident_pgt[512];
18361-extern pte_t level1_fixmap_pgt[512];
18362-extern pgd_t init_level4_pgt[];
18363+extern pmd_t level2_ident_pgt[2][512];
18364+extern pte_t level1_fixmap_pgt[3][512];
18365+extern pte_t level1_vsyscall_pgt[512];
18366+extern pgd_t init_level4_pgt[512];
18367
18368 #define swapper_pg_dir init_level4_pgt
18369
18370@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18371
18372 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18373 {
18374+ pax_open_kernel();
18375 *pmdp = pmd;
18376+ pax_close_kernel();
18377 }
18378
18379 static inline void native_pmd_clear(pmd_t *pmd)
18380@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18381
18382 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18383 {
18384+ pax_open_kernel();
18385 *pudp = pud;
18386+ pax_close_kernel();
18387 }
18388
18389 static inline void native_pud_clear(pud_t *pud)
18390@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18391
18392 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18393 {
18394+ pax_open_kernel();
18395+ *pgdp = pgd;
18396+ pax_close_kernel();
18397+}
18398+
18399+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18400+{
18401 *pgdp = pgd;
18402 }
18403
18404diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18405index e6844df..432b56e 100644
18406--- a/arch/x86/include/asm/pgtable_64_types.h
18407+++ b/arch/x86/include/asm/pgtable_64_types.h
18408@@ -60,11 +60,16 @@ typedef struct { pteval_t pte; } pte_t;
18409 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18410 #define MODULES_END _AC(0xffffffffff000000, UL)
18411 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18412+#define MODULES_EXEC_VADDR MODULES_VADDR
18413+#define MODULES_EXEC_END MODULES_END
18414 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18415 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18416 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18417 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18418
18419+#define ktla_ktva(addr) (addr)
18420+#define ktva_ktla(addr) (addr)
18421+
18422 #define EARLY_DYNAMIC_PAGE_TABLES 64
18423
18424 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18425diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18426index 78f0c8c..4424bb0 100644
18427--- a/arch/x86/include/asm/pgtable_types.h
18428+++ b/arch/x86/include/asm/pgtable_types.h
18429@@ -85,8 +85,10 @@
18430
18431 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18432 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18433-#else
18434+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18435 #define _PAGE_NX (_AT(pteval_t, 0))
18436+#else
18437+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18438 #endif
18439
18440 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18441@@ -141,6 +143,9 @@ enum page_cache_mode {
18442 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18443 _PAGE_ACCESSED)
18444
18445+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18446+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18447+
18448 #define __PAGE_KERNEL_EXEC \
18449 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18450 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18451@@ -148,7 +153,7 @@ enum page_cache_mode {
18452 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18453 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18454 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18455-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18456+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18457 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18458 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18459 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18460@@ -194,7 +199,7 @@ enum page_cache_mode {
18461 #ifdef CONFIG_X86_64
18462 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18463 #else
18464-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18465+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18466 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18467 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18468 #endif
18469@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18470 {
18471 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18472 }
18473+#endif
18474
18475+#if CONFIG_PGTABLE_LEVELS == 3
18476+#include <asm-generic/pgtable-nopud.h>
18477+#endif
18478+
18479+#if CONFIG_PGTABLE_LEVELS == 2
18480+#include <asm-generic/pgtable-nopmd.h>
18481+#endif
18482+
18483+#ifndef __ASSEMBLY__
18484 #if CONFIG_PGTABLE_LEVELS > 3
18485 typedef struct { pudval_t pud; } pud_t;
18486
18487@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18488 return pud.pud;
18489 }
18490 #else
18491-#include <asm-generic/pgtable-nopud.h>
18492-
18493 static inline pudval_t native_pud_val(pud_t pud)
18494 {
18495 return native_pgd_val(pud.pgd);
18496@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18497 return pmd.pmd;
18498 }
18499 #else
18500-#include <asm-generic/pgtable-nopmd.h>
18501-
18502 static inline pmdval_t native_pmd_val(pmd_t pmd)
18503 {
18504 return native_pgd_val(pmd.pud.pgd);
18505@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18506
18507 extern pteval_t __supported_pte_mask;
18508 extern void set_nx(void);
18509-extern int nx_enabled;
18510
18511 #define pgprot_writecombine pgprot_writecombine
18512 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18513diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18514index 8f327184..368fb29 100644
18515--- a/arch/x86/include/asm/preempt.h
18516+++ b/arch/x86/include/asm/preempt.h
18517@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18518 */
18519 static __always_inline bool __preempt_count_dec_and_test(void)
18520 {
18521- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18522+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18523 }
18524
18525 /*
18526diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18527index 23ba676..6584489 100644
18528--- a/arch/x86/include/asm/processor.h
18529+++ b/arch/x86/include/asm/processor.h
18530@@ -130,7 +130,7 @@ struct cpuinfo_x86 {
18531 /* Index into per_cpu list: */
18532 u16 cpu_index;
18533 u32 microcode;
18534-};
18535+} __randomize_layout;
18536
18537 #define X86_VENDOR_INTEL 0
18538 #define X86_VENDOR_CYRIX 1
18539@@ -201,9 +201,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18540 : "memory");
18541 }
18542
18543+/* invpcid (%rdx),%rax */
18544+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18545+
18546+#define INVPCID_SINGLE_ADDRESS 0UL
18547+#define INVPCID_SINGLE_CONTEXT 1UL
18548+#define INVPCID_ALL_GLOBAL 2UL
18549+#define INVPCID_ALL_NONGLOBAL 3UL
18550+
18551+#define PCID_KERNEL 0UL
18552+#define PCID_USER 1UL
18553+#define PCID_NOFLUSH (1UL << 63)
18554+
18555 static inline void load_cr3(pgd_t *pgdir)
18556 {
18557- write_cr3(__pa(pgdir));
18558+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18559 }
18560
18561 #ifdef CONFIG_X86_32
18562@@ -300,7 +312,7 @@ struct tss_struct {
18563
18564 } ____cacheline_aligned;
18565
18566-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);
18567+extern struct tss_struct cpu_tss[NR_CPUS];
18568
18569 #ifdef CONFIG_X86_32
18570 DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);
18571@@ -500,6 +512,7 @@ struct thread_struct {
18572 unsigned short ds;
18573 unsigned short fsindex;
18574 unsigned short gsindex;
18575+ unsigned short ss;
18576 #endif
18577 #ifdef CONFIG_X86_32
18578 unsigned long ip;
18579@@ -585,10 +598,10 @@ static inline void native_swapgs(void)
18580 #endif
18581 }
18582
18583-static inline unsigned long current_top_of_stack(void)
18584+static inline unsigned long current_top_of_stack(unsigned int cpu)
18585 {
18586 #ifdef CONFIG_X86_64
18587- return this_cpu_read_stable(cpu_tss.x86_tss.sp0);
18588+ return cpu_tss[cpu].x86_tss.sp0;
18589 #else
18590 /* sp0 on x86_32 is special in and around vm86 mode. */
18591 return this_cpu_read_stable(cpu_current_top_of_stack);
18592@@ -837,8 +850,15 @@ static inline void spin_lock_prefetch(const void *x)
18593 */
18594 #define TASK_SIZE PAGE_OFFSET
18595 #define TASK_SIZE_MAX TASK_SIZE
18596+
18597+#ifdef CONFIG_PAX_SEGMEXEC
18598+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18599+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18600+#else
18601 #define STACK_TOP TASK_SIZE
18602-#define STACK_TOP_MAX STACK_TOP
18603+#endif
18604+
18605+#define STACK_TOP_MAX TASK_SIZE
18606
18607 #define INIT_THREAD { \
18608 .sp0 = TOP_OF_INIT_STACK, \
18609@@ -859,12 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18610 * "struct pt_regs" is possible, but they may contain the
18611 * completely wrong values.
18612 */
18613-#define task_pt_regs(task) \
18614-({ \
18615- unsigned long __ptr = (unsigned long)task_stack_page(task); \
18616- __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \
18617- ((struct pt_regs *)__ptr) - 1; \
18618-})
18619+#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
18620
18621 #define KSTK_ESP(task) (task_pt_regs(task)->sp)
18622
18623@@ -878,13 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18624 * particular problem by preventing anything from being mapped
18625 * at the maximum canonical address.
18626 */
18627-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18628+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18629
18630 /* This decides where the kernel will search for a free chunk of vm
18631 * space during mmap's.
18632 */
18633 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18634- 0xc0000000 : 0xFFFFe000)
18635+ 0xc0000000 : 0xFFFFf000)
18636
18637 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18638 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18639@@ -918,6 +933,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18640 */
18641 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18642
18643+#ifdef CONFIG_PAX_SEGMEXEC
18644+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18645+#endif
18646+
18647 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18648
18649 /* Get/set a process' ability to use the timestamp counter instruction */
18650@@ -962,7 +981,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18651 return 0;
18652 }
18653
18654-extern unsigned long arch_align_stack(unsigned long sp);
18655+#define arch_align_stack(x) ((x) & ~0xfUL)
18656 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18657
18658 void default_idle(void);
18659@@ -972,6 +991,6 @@ bool xen_set_default_idle(void);
18660 #define xen_set_default_idle 0
18661 #endif
18662
18663-void stop_this_cpu(void *dummy);
18664+void stop_this_cpu(void *dummy) __noreturn;
18665 void df_debug(struct pt_regs *regs, long error_code);
18666 #endif /* _ASM_X86_PROCESSOR_H */
18667diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18668index 5fabf13..7388158 100644
18669--- a/arch/x86/include/asm/ptrace.h
18670+++ b/arch/x86/include/asm/ptrace.h
18671@@ -125,15 +125,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18672 #ifdef CONFIG_X86_64
18673 static inline bool user_64bit_mode(struct pt_regs *regs)
18674 {
18675+ unsigned long cs = regs->cs & 0xffff;
18676 #ifndef CONFIG_PARAVIRT
18677 /*
18678 * On non-paravirt systems, this is the only long mode CPL 3
18679 * selector. We do not allow long mode selectors in the LDT.
18680 */
18681- return regs->cs == __USER_CS;
18682+ return cs == __USER_CS;
18683 #else
18684 /* Headers are too twisted for this to go in paravirt.h. */
18685- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18686+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18687 #endif
18688 }
18689
18690@@ -180,9 +181,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18691 * Traps from the kernel do not save sp and ss.
18692 * Use the helper function to retrieve sp.
18693 */
18694- if (offset == offsetof(struct pt_regs, sp) &&
18695- regs->cs == __KERNEL_CS)
18696- return kernel_stack_pointer(regs);
18697+ if (offset == offsetof(struct pt_regs, sp)) {
18698+ unsigned long cs = regs->cs & 0xffff;
18699+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18700+ return kernel_stack_pointer(regs);
18701+ }
18702 #endif
18703 return *(unsigned long *)((unsigned long)regs + offset);
18704 }
18705diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18706index ae0e241..e80b10b 100644
18707--- a/arch/x86/include/asm/qrwlock.h
18708+++ b/arch/x86/include/asm/qrwlock.h
18709@@ -7,8 +7,8 @@
18710 #define queue_write_unlock queue_write_unlock
18711 static inline void queue_write_unlock(struct qrwlock *lock)
18712 {
18713- barrier();
18714- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18715+ barrier();
18716+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18717 }
18718 #endif
18719
18720diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18721index 9c6b890..5305f53 100644
18722--- a/arch/x86/include/asm/realmode.h
18723+++ b/arch/x86/include/asm/realmode.h
18724@@ -22,16 +22,14 @@ struct real_mode_header {
18725 #endif
18726 /* APM/BIOS reboot */
18727 u32 machine_real_restart_asm;
18728-#ifdef CONFIG_X86_64
18729 u32 machine_real_restart_seg;
18730-#endif
18731 };
18732
18733 /* This must match data at trampoline_32/64.S */
18734 struct trampoline_header {
18735 #ifdef CONFIG_X86_32
18736 u32 start;
18737- u16 gdt_pad;
18738+ u16 boot_cs;
18739 u16 gdt_limit;
18740 u32 gdt_base;
18741 #else
18742diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18743index a82c4f1..ac45053 100644
18744--- a/arch/x86/include/asm/reboot.h
18745+++ b/arch/x86/include/asm/reboot.h
18746@@ -6,13 +6,13 @@
18747 struct pt_regs;
18748
18749 struct machine_ops {
18750- void (*restart)(char *cmd);
18751- void (*halt)(void);
18752- void (*power_off)(void);
18753+ void (* __noreturn restart)(char *cmd);
18754+ void (* __noreturn halt)(void);
18755+ void (* __noreturn power_off)(void);
18756 void (*shutdown)(void);
18757 void (*crash_shutdown)(struct pt_regs *);
18758- void (*emergency_restart)(void);
18759-};
18760+ void (* __noreturn emergency_restart)(void);
18761+} __no_const;
18762
18763 extern struct machine_ops machine_ops;
18764
18765diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18766index 8f7866a..e442f20 100644
18767--- a/arch/x86/include/asm/rmwcc.h
18768+++ b/arch/x86/include/asm/rmwcc.h
18769@@ -3,7 +3,34 @@
18770
18771 #ifdef CC_HAVE_ASM_GOTO
18772
18773-#define __GEN_RMWcc(fullop, var, cc, ...) \
18774+#ifdef CONFIG_PAX_REFCOUNT
18775+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18776+do { \
18777+ asm_volatile_goto (fullop \
18778+ ";jno 0f\n" \
18779+ fullantiop \
18780+ ";int $4\n0:\n" \
18781+ _ASM_EXTABLE(0b, 0b) \
18782+ ";j" cc " %l[cc_label]" \
18783+ : : "m" (var), ## __VA_ARGS__ \
18784+ : "memory" : cc_label); \
18785+ return 0; \
18786+cc_label: \
18787+ return 1; \
18788+} while (0)
18789+#else
18790+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18791+do { \
18792+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18793+ : : "m" (var), ## __VA_ARGS__ \
18794+ : "memory" : cc_label); \
18795+ return 0; \
18796+cc_label: \
18797+ return 1; \
18798+} while (0)
18799+#endif
18800+
18801+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18802 do { \
18803 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18804 : : "m" (var), ## __VA_ARGS__ \
18805@@ -13,15 +40,46 @@ cc_label: \
18806 return 1; \
18807 } while (0)
18808
18809-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18810- __GEN_RMWcc(op " " arg0, var, cc)
18811+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18812+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18813
18814-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18815- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18816+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18817+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18818+
18819+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18820+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18821+
18822+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18823+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18824
18825 #else /* !CC_HAVE_ASM_GOTO */
18826
18827-#define __GEN_RMWcc(fullop, var, cc, ...) \
18828+#ifdef CONFIG_PAX_REFCOUNT
18829+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18830+do { \
18831+ char c; \
18832+ asm volatile (fullop \
18833+ ";jno 0f\n" \
18834+ fullantiop \
18835+ ";int $4\n0:\n" \
18836+ _ASM_EXTABLE(0b, 0b) \
18837+ "; set" cc " %1" \
18838+ : "+m" (var), "=qm" (c) \
18839+ : __VA_ARGS__ : "memory"); \
18840+ return c != 0; \
18841+} while (0)
18842+#else
18843+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18844+do { \
18845+ char c; \
18846+ asm volatile (fullop "; set" cc " %1" \
18847+ : "+m" (var), "=qm" (c) \
18848+ : __VA_ARGS__ : "memory"); \
18849+ return c != 0; \
18850+} while (0)
18851+#endif
18852+
18853+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18854 do { \
18855 char c; \
18856 asm volatile (fullop "; set" cc " %1" \
18857@@ -30,11 +88,17 @@ do { \
18858 return c != 0; \
18859 } while (0)
18860
18861-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18862- __GEN_RMWcc(op " " arg0, var, cc)
18863+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18864+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18865+
18866+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18867+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18868+
18869+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18870+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18871
18872-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18873- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18874+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18875+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18876
18877 #endif /* CC_HAVE_ASM_GOTO */
18878
18879diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18880index cad82c9..2e5c5c1 100644
18881--- a/arch/x86/include/asm/rwsem.h
18882+++ b/arch/x86/include/asm/rwsem.h
18883@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18884 {
18885 asm volatile("# beginning down_read\n\t"
18886 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18887+
18888+#ifdef CONFIG_PAX_REFCOUNT
18889+ "jno 0f\n"
18890+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18891+ "int $4\n0:\n"
18892+ _ASM_EXTABLE(0b, 0b)
18893+#endif
18894+
18895 /* adds 0x00000001 */
18896 " jns 1f\n"
18897 " call call_rwsem_down_read_failed\n"
18898@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18899 "1:\n\t"
18900 " mov %1,%2\n\t"
18901 " add %3,%2\n\t"
18902+
18903+#ifdef CONFIG_PAX_REFCOUNT
18904+ "jno 0f\n"
18905+ "sub %3,%2\n"
18906+ "int $4\n0:\n"
18907+ _ASM_EXTABLE(0b, 0b)
18908+#endif
18909+
18910 " jle 2f\n\t"
18911 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18912 " jnz 1b\n\t"
18913@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18914 long tmp;
18915 asm volatile("# beginning down_write\n\t"
18916 LOCK_PREFIX " xadd %1,(%2)\n\t"
18917+
18918+#ifdef CONFIG_PAX_REFCOUNT
18919+ "jno 0f\n"
18920+ "mov %1,(%2)\n"
18921+ "int $4\n0:\n"
18922+ _ASM_EXTABLE(0b, 0b)
18923+#endif
18924+
18925 /* adds 0xffff0001, returns the old value */
18926 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18927 /* was the active mask 0 before? */
18928@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18929 long tmp;
18930 asm volatile("# beginning __up_read\n\t"
18931 LOCK_PREFIX " xadd %1,(%2)\n\t"
18932+
18933+#ifdef CONFIG_PAX_REFCOUNT
18934+ "jno 0f\n"
18935+ "mov %1,(%2)\n"
18936+ "int $4\n0:\n"
18937+ _ASM_EXTABLE(0b, 0b)
18938+#endif
18939+
18940 /* subtracts 1, returns the old value */
18941 " jns 1f\n\t"
18942 " call call_rwsem_wake\n" /* expects old value in %edx */
18943@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18944 long tmp;
18945 asm volatile("# beginning __up_write\n\t"
18946 LOCK_PREFIX " xadd %1,(%2)\n\t"
18947+
18948+#ifdef CONFIG_PAX_REFCOUNT
18949+ "jno 0f\n"
18950+ "mov %1,(%2)\n"
18951+ "int $4\n0:\n"
18952+ _ASM_EXTABLE(0b, 0b)
18953+#endif
18954+
18955 /* subtracts 0xffff0001, returns the old value */
18956 " jns 1f\n\t"
18957 " call call_rwsem_wake\n" /* expects old value in %edx */
18958@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18959 {
18960 asm volatile("# beginning __downgrade_write\n\t"
18961 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18962+
18963+#ifdef CONFIG_PAX_REFCOUNT
18964+ "jno 0f\n"
18965+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18966+ "int $4\n0:\n"
18967+ _ASM_EXTABLE(0b, 0b)
18968+#endif
18969+
18970 /*
18971 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18972 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18973@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18974 */
18975 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18976 {
18977- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18978+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18979+
18980+#ifdef CONFIG_PAX_REFCOUNT
18981+ "jno 0f\n"
18982+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18983+ "int $4\n0:\n"
18984+ _ASM_EXTABLE(0b, 0b)
18985+#endif
18986+
18987 : "+m" (sem->count)
18988 : "er" (delta));
18989 }
18990@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18991 */
18992 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18993 {
18994- return delta + xadd(&sem->count, delta);
18995+ return delta + xadd_check_overflow(&sem->count, delta);
18996 }
18997
18998 #endif /* __KERNEL__ */
18999diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19000index 7d5a192..23ef1aa 100644
19001--- a/arch/x86/include/asm/segment.h
19002+++ b/arch/x86/include/asm/segment.h
19003@@ -82,14 +82,20 @@
19004 * 26 - ESPFIX small SS
19005 * 27 - per-cpu [ offset to per-cpu data area ]
19006 * 28 - stack_canary-20 [ for stack protector ] <=== cacheline #8
19007- * 29 - unused
19008- * 30 - unused
19009+ * 29 - PCI BIOS CS
19010+ * 30 - PCI BIOS DS
19011 * 31 - TSS for double fault handler
19012 */
19013+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19014+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19015+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19016+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19017+
19018 #define GDT_ENTRY_TLS_MIN 6
19019 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19020
19021 #define GDT_ENTRY_KERNEL_CS 12
19022+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 4
19023 #define GDT_ENTRY_KERNEL_DS 13
19024 #define GDT_ENTRY_DEFAULT_USER_CS 14
19025 #define GDT_ENTRY_DEFAULT_USER_DS 15
19026@@ -106,6 +112,12 @@
19027 #define GDT_ENTRY_PERCPU 27
19028 #define GDT_ENTRY_STACK_CANARY 28
19029
19030+#define GDT_ENTRY_PCIBIOS_CS 29
19031+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19032+
19033+#define GDT_ENTRY_PCIBIOS_DS 30
19034+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19035+
19036 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19037
19038 /*
19039@@ -118,6 +130,7 @@
19040 */
19041
19042 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19043+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19044 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19045 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19046 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)
19047@@ -129,7 +142,7 @@
19048 #define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16*8)
19049
19050 /* "Is this PNP code selector (PNP_CS32 or PNP_CS16)?" */
19051-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == PNP_CS32)
19052+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19053
19054 /* data segment for BIOS: */
19055 #define PNP_DS (GDT_ENTRY_PNPBIOS_DS*8)
19056@@ -176,6 +189,8 @@
19057 #define GDT_ENTRY_DEFAULT_USER_DS 5
19058 #define GDT_ENTRY_DEFAULT_USER_CS 6
19059
19060+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19061+
19062 /* Needs two entries */
19063 #define GDT_ENTRY_TSS 8
19064 /* Needs two entries */
19065@@ -187,10 +202,12 @@
19066 /* Abused to load per CPU data from limit */
19067 #define GDT_ENTRY_PER_CPU 15
19068
19069+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19070+
19071 /*
19072 * Number of entries in the GDT table:
19073 */
19074-#define GDT_ENTRIES 16
19075+#define GDT_ENTRIES 17
19076
19077 /*
19078 * Segment selector values corresponding to the above entries:
19079@@ -200,7 +217,9 @@
19080 */
19081 #define __KERNEL32_CS (GDT_ENTRY_KERNEL32_CS*8)
19082 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19083+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19084 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19085+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19086 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)
19087 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19088 #define __USER32_DS __USER_DS
19089diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19090index ba665eb..0f72938 100644
19091--- a/arch/x86/include/asm/smap.h
19092+++ b/arch/x86/include/asm/smap.h
19093@@ -25,6 +25,18 @@
19094
19095 #include <asm/alternative-asm.h>
19096
19097+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19098+#define ASM_PAX_OPEN_USERLAND \
19099+ ALTERNATIVE "", "call __pax_open_userland", X86_FEATURE_STRONGUDEREF
19100+
19101+#define ASM_PAX_CLOSE_USERLAND \
19102+ ALTERNATIVE "", "call __pax_close_userland", X86_FEATURE_STRONGUDEREF
19103+
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@@ -44,6 +56,37 @@
19113
19114 #include <asm/alternative.h>
19115
19116+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19117+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19118+
19119+extern void __pax_open_userland(void);
19120+static __always_inline unsigned long pax_open_userland(void)
19121+{
19122+
19123+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19124+ asm volatile(ALTERNATIVE("", "call %P[open]", X86_FEATURE_STRONGUDEREF)
19125+ :
19126+ : [open] "i" (__pax_open_userland)
19127+ : "memory", "rax");
19128+#endif
19129+
19130+ return 0;
19131+}
19132+
19133+extern void __pax_close_userland(void);
19134+static __always_inline unsigned long pax_close_userland(void)
19135+{
19136+
19137+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19138+ asm volatile(ALTERNATIVE("", "call %P[close]", X86_FEATURE_STRONGUDEREF)
19139+ :
19140+ : [close] "i" (__pax_close_userland)
19141+ : "memory", "rax");
19142+#endif
19143+
19144+ return 0;
19145+}
19146+
19147 #ifdef CONFIG_X86_SMAP
19148
19149 static __always_inline void clac(void)
19150diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19151index 17a8dce..79f7280 100644
19152--- a/arch/x86/include/asm/smp.h
19153+++ b/arch/x86/include/asm/smp.h
19154@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19155 /* cpus sharing the last level cache: */
19156 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19157 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19158-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19159+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19160
19161 static inline struct cpumask *cpu_sibling_mask(int cpu)
19162 {
19163@@ -78,7 +78,7 @@ struct smp_ops {
19164
19165 void (*send_call_func_ipi)(const struct cpumask *mask);
19166 void (*send_call_func_single_ipi)(int cpu);
19167-};
19168+} __no_const;
19169
19170 /* Globals due to paravirt */
19171 extern void set_cpu_sibling_map(int cpu);
19172@@ -192,14 +192,8 @@ extern unsigned disabled_cpus;
19173 extern int safe_smp_processor_id(void);
19174
19175 #elif defined(CONFIG_X86_64_SMP)
19176-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19177-
19178-#define stack_smp_processor_id() \
19179-({ \
19180- struct thread_info *ti; \
19181- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19182- ti->cpu; \
19183-})
19184+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19185+#define stack_smp_processor_id() raw_smp_processor_id()
19186 #define safe_smp_processor_id() smp_processor_id()
19187
19188 #endif
19189diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19190index 6a99859..03cb807 100644
19191--- a/arch/x86/include/asm/stackprotector.h
19192+++ b/arch/x86/include/asm/stackprotector.h
19193@@ -47,7 +47,7 @@
19194 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19195 */
19196 #define GDT_STACK_CANARY_INIT \
19197- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19198+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19199
19200 /*
19201 * Initialize the stackprotector canary value.
19202@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19203
19204 static inline void load_stack_canary_segment(void)
19205 {
19206-#ifdef CONFIG_X86_32
19207+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19208 asm volatile ("mov %0, %%gs" : : "r" (0));
19209 #endif
19210 }
19211diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19212index 70bbe39..4ae2bd4 100644
19213--- a/arch/x86/include/asm/stacktrace.h
19214+++ b/arch/x86/include/asm/stacktrace.h
19215@@ -11,28 +11,20 @@
19216
19217 extern int kstack_depth_to_print;
19218
19219-struct thread_info;
19220+struct task_struct;
19221 struct stacktrace_ops;
19222
19223-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19224- unsigned long *stack,
19225- unsigned long bp,
19226- const struct stacktrace_ops *ops,
19227- void *data,
19228- unsigned long *end,
19229- int *graph);
19230+typedef unsigned long walk_stack_t(struct task_struct *task,
19231+ void *stack_start,
19232+ unsigned long *stack,
19233+ unsigned long bp,
19234+ const struct stacktrace_ops *ops,
19235+ void *data,
19236+ unsigned long *end,
19237+ int *graph);
19238
19239-extern unsigned long
19240-print_context_stack(struct thread_info *tinfo,
19241- unsigned long *stack, unsigned long bp,
19242- const struct stacktrace_ops *ops, void *data,
19243- unsigned long *end, int *graph);
19244-
19245-extern unsigned long
19246-print_context_stack_bp(struct thread_info *tinfo,
19247- unsigned long *stack, unsigned long bp,
19248- const struct stacktrace_ops *ops, void *data,
19249- unsigned long *end, int *graph);
19250+extern walk_stack_t print_context_stack;
19251+extern walk_stack_t print_context_stack_bp;
19252
19253 /* Generic stack tracer with callbacks */
19254
19255@@ -40,7 +32,7 @@ struct stacktrace_ops {
19256 void (*address)(void *data, unsigned long address, int reliable);
19257 /* On negative return stop dumping */
19258 int (*stack)(void *data, char *name);
19259- walk_stack_t walk_stack;
19260+ walk_stack_t *walk_stack;
19261 };
19262
19263 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19264diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19265index 751bf4b..a1278b5 100644
19266--- a/arch/x86/include/asm/switch_to.h
19267+++ b/arch/x86/include/asm/switch_to.h
19268@@ -112,7 +112,7 @@ do { \
19269 "call __switch_to\n\t" \
19270 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19271 __switch_canary \
19272- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19273+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19274 "movq %%rax,%%rdi\n\t" \
19275 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19276 "jnz ret_from_fork\n\t" \
19277@@ -123,7 +123,7 @@ do { \
19278 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19279 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19280 [_tif_fork] "i" (_TIF_FORK), \
19281- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19282+ [thread_info] "m" (current_tinfo), \
19283 [current_task] "m" (current_task) \
19284 __switch_canary_iparam \
19285 : "memory", "cc" __EXTRA_CLOBBER)
19286diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19287index b4bdec3..e8af9bc 100644
19288--- a/arch/x86/include/asm/thread_info.h
19289+++ b/arch/x86/include/asm/thread_info.h
19290@@ -36,7 +36,7 @@
19291 #ifdef CONFIG_X86_32
19292 # define TOP_OF_KERNEL_STACK_PADDING 8
19293 #else
19294-# define TOP_OF_KERNEL_STACK_PADDING 0
19295+# define TOP_OF_KERNEL_STACK_PADDING 16
19296 #endif
19297
19298 /*
19299@@ -50,27 +50,26 @@ struct task_struct;
19300 #include <linux/atomic.h>
19301
19302 struct thread_info {
19303- struct task_struct *task; /* main task structure */
19304 __u32 flags; /* low level flags */
19305 __u32 status; /* thread synchronous flags */
19306 __u32 cpu; /* current CPU */
19307 int saved_preempt_count;
19308 mm_segment_t addr_limit;
19309 void __user *sysenter_return;
19310+ unsigned long lowest_stack;
19311 unsigned int sig_on_uaccess_error:1;
19312 unsigned int uaccess_err:1; /* uaccess failed */
19313 };
19314
19315-#define INIT_THREAD_INFO(tsk) \
19316+#define INIT_THREAD_INFO \
19317 { \
19318- .task = &tsk, \
19319 .flags = 0, \
19320 .cpu = 0, \
19321 .saved_preempt_count = INIT_PREEMPT_COUNT, \
19322 .addr_limit = KERNEL_DS, \
19323 }
19324
19325-#define init_thread_info (init_thread_union.thread_info)
19326+#define init_thread_info (init_thread_union.stack)
19327 #define init_stack (init_thread_union.stack)
19328
19329 #else /* !__ASSEMBLY__ */
19330@@ -110,6 +109,7 @@ struct thread_info {
19331 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19332 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19333 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19334+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19335
19336 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19337 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19338@@ -133,17 +133,18 @@ struct thread_info {
19339 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19340 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19341 #define _TIF_X32 (1 << TIF_X32)
19342+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19343
19344 /* work to do in syscall_trace_enter() */
19345 #define _TIF_WORK_SYSCALL_ENTRY \
19346 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19347 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19348- _TIF_NOHZ)
19349+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19350
19351 /* work to do in syscall_trace_leave() */
19352 #define _TIF_WORK_SYSCALL_EXIT \
19353 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19354- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19355+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19356
19357 /* work to do on interrupt/exception return */
19358 #define _TIF_WORK_MASK \
19359@@ -154,7 +155,7 @@ struct thread_info {
19360 /* work to do on any return to user space */
19361 #define _TIF_ALLWORK_MASK \
19362 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19363- _TIF_NOHZ)
19364+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19365
19366 /* Only used for 64 bit */
19367 #define _TIF_DO_NOTIFY_MASK \
19368@@ -179,9 +180,11 @@ struct thread_info {
19369
19370 DECLARE_PER_CPU(unsigned long, kernel_stack);
19371
19372+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19373+
19374 static inline struct thread_info *current_thread_info(void)
19375 {
19376- return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
19377+ return this_cpu_read_stable(current_tinfo);
19378 }
19379
19380 static inline unsigned long current_stack_pointer(void)
19381@@ -199,8 +202,7 @@ static inline unsigned long current_stack_pointer(void)
19382
19383 /* Load thread_info address into "reg" */
19384 #define GET_THREAD_INFO(reg) \
19385- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19386- _ASM_SUB $(THREAD_SIZE),reg ;
19387+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19388
19389 /*
19390 * ASM operand which evaluates to a 'thread_info' address of
19391@@ -293,5 +295,12 @@ static inline bool is_ia32_task(void)
19392 extern void arch_task_cache_init(void);
19393 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19394 extern void arch_release_task_struct(struct task_struct *tsk);
19395+
19396+#define __HAVE_THREAD_FUNCTIONS
19397+#define task_thread_info(task) (&(task)->tinfo)
19398+#define task_stack_page(task) ((task)->stack)
19399+#define setup_thread_stack(p, org) do {} while (0)
19400+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19401+
19402 #endif
19403 #endif /* _ASM_X86_THREAD_INFO_H */
19404diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19405index cd79194..6a9956f 100644
19406--- a/arch/x86/include/asm/tlbflush.h
19407+++ b/arch/x86/include/asm/tlbflush.h
19408@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19409
19410 static inline void __native_flush_tlb(void)
19411 {
19412+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19413+ u64 descriptor[2];
19414+
19415+ descriptor[0] = PCID_KERNEL;
19416+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19417+ return;
19418+ }
19419+
19420+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19421+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19422+ unsigned int cpu = raw_get_cpu();
19423+
19424+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19425+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19426+ raw_put_cpu_no_resched();
19427+ return;
19428+ }
19429+#endif
19430+
19431 native_write_cr3(native_read_cr3());
19432 }
19433
19434 static inline void __native_flush_tlb_global_irq_disabled(void)
19435 {
19436- unsigned long cr4;
19437+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19438+ u64 descriptor[2];
19439
19440- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19441- /* clear PGE */
19442- native_write_cr4(cr4 & ~X86_CR4_PGE);
19443- /* write old PGE again and flush TLBs */
19444- native_write_cr4(cr4);
19445+ descriptor[0] = PCID_KERNEL;
19446+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19447+ } else {
19448+ unsigned long cr4;
19449+
19450+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19451+ /* clear PGE */
19452+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19453+ /* write old PGE again and flush TLBs */
19454+ native_write_cr4(cr4);
19455+ }
19456 }
19457
19458 static inline void __native_flush_tlb_global(void)
19459@@ -118,6 +144,43 @@ static inline void __native_flush_tlb_global(void)
19460
19461 static inline void __native_flush_tlb_single(unsigned long addr)
19462 {
19463+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19464+ u64 descriptor[2];
19465+
19466+ descriptor[0] = PCID_KERNEL;
19467+ descriptor[1] = addr;
19468+
19469+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19470+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19471+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19472+ if (addr < TASK_SIZE_MAX)
19473+ descriptor[1] += pax_user_shadow_base;
19474+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19475+ }
19476+
19477+ descriptor[0] = PCID_USER;
19478+ descriptor[1] = addr;
19479+ }
19480+#endif
19481+
19482+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19483+ return;
19484+ }
19485+
19486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19487+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19488+ unsigned int cpu = raw_get_cpu();
19489+
19490+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19491+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19492+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19493+ raw_put_cpu_no_resched();
19494+
19495+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19496+ addr += pax_user_shadow_base;
19497+ }
19498+#endif
19499+
19500 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19501 }
19502
19503diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19504index ace9dec..3f9e253 100644
19505--- a/arch/x86/include/asm/uaccess.h
19506+++ b/arch/x86/include/asm/uaccess.h
19507@@ -7,6 +7,7 @@
19508 #include <linux/compiler.h>
19509 #include <linux/thread_info.h>
19510 #include <linux/string.h>
19511+#include <linux/spinlock.h>
19512 #include <asm/asm.h>
19513 #include <asm/page.h>
19514 #include <asm/smap.h>
19515@@ -29,7 +30,12 @@
19516
19517 #define get_ds() (KERNEL_DS)
19518 #define get_fs() (current_thread_info()->addr_limit)
19519+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19520+void __set_fs(mm_segment_t x);
19521+void set_fs(mm_segment_t x);
19522+#else
19523 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19524+#endif
19525
19526 #define segment_eq(a, b) ((a).seg == (b).seg)
19527
19528@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19529 * checks that the pointer is in the user space range - after calling
19530 * this function, memory access functions may still return -EFAULT.
19531 */
19532-#define access_ok(type, addr, size) \
19533- likely(!__range_not_ok(addr, size, user_addr_max()))
19534+extern int _cond_resched(void);
19535+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19536+#define access_ok(type, addr, size) \
19537+({ \
19538+ unsigned long __size = size; \
19539+ unsigned long __addr = (unsigned long)addr; \
19540+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19541+ if (__ret_ao && __size) { \
19542+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19543+ unsigned long __end_ao = __addr + __size - 1; \
19544+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19545+ while (__addr_ao <= __end_ao) { \
19546+ char __c_ao; \
19547+ __addr_ao += PAGE_SIZE; \
19548+ if (__size > PAGE_SIZE) \
19549+ _cond_resched(); \
19550+ if (__get_user(__c_ao, (char __user *)__addr)) \
19551+ break; \
19552+ if (type != VERIFY_WRITE) { \
19553+ __addr = __addr_ao; \
19554+ continue; \
19555+ } \
19556+ if (__put_user(__c_ao, (char __user *)__addr)) \
19557+ break; \
19558+ __addr = __addr_ao; \
19559+ } \
19560+ } \
19561+ } \
19562+ __ret_ao; \
19563+})
19564
19565 /*
19566 * The exception table consists of pairs of addresses relative to the
19567@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19568 extern int __get_user_bad(void);
19569
19570 /*
19571- * This is a type: either unsigned long, if the argument fits into
19572- * that type, or otherwise unsigned long long.
19573+ * This is a type: either (un)signed int, if the argument fits into
19574+ * that type, or otherwise (un)signed long long.
19575 */
19576 #define __inttype(x) \
19577-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19578+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19579+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19580+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19581
19582 /**
19583 * get_user: - Get a simple variable from user space.
19584@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19585 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19586 __chk_user_ptr(ptr); \
19587 might_fault(); \
19588+ pax_open_userland(); \
19589 asm volatile("call __get_user_%P3" \
19590 : "=a" (__ret_gu), "=r" (__val_gu) \
19591 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19592 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19593+ pax_close_userland(); \
19594 __ret_gu; \
19595 })
19596
19597@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19598 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19599 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19600
19601-
19602+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19603+#define __copyuser_seg "gs;"
19604+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19605+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19606+#else
19607+#define __copyuser_seg
19608+#define __COPYUSER_SET_ES
19609+#define __COPYUSER_RESTORE_ES
19610+#endif
19611
19612 #ifdef CONFIG_X86_32
19613 #define __put_user_asm_u64(x, addr, err, errret) \
19614 asm volatile(ASM_STAC "\n" \
19615- "1: movl %%eax,0(%2)\n" \
19616- "2: movl %%edx,4(%2)\n" \
19617+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19618+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19619 "3: " ASM_CLAC "\n" \
19620 ".section .fixup,\"ax\"\n" \
19621 "4: movl %3,%0\n" \
19622@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19623
19624 #define __put_user_asm_ex_u64(x, addr) \
19625 asm volatile(ASM_STAC "\n" \
19626- "1: movl %%eax,0(%1)\n" \
19627- "2: movl %%edx,4(%1)\n" \
19628+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19629+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19630 "3: " ASM_CLAC "\n" \
19631 _ASM_EXTABLE_EX(1b, 2b) \
19632 _ASM_EXTABLE_EX(2b, 3b) \
19633@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19634 __typeof__(*(ptr)) __pu_val; \
19635 __chk_user_ptr(ptr); \
19636 might_fault(); \
19637- __pu_val = x; \
19638+ __pu_val = (x); \
19639+ pax_open_userland(); \
19640 switch (sizeof(*(ptr))) { \
19641 case 1: \
19642 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19643@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19644 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19645 break; \
19646 } \
19647+ pax_close_userland(); \
19648 __ret_pu; \
19649 })
19650
19651@@ -355,8 +403,10 @@ do { \
19652 } while (0)
19653
19654 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19655+do { \
19656+ pax_open_userland(); \
19657 asm volatile(ASM_STAC "\n" \
19658- "1: mov"itype" %2,%"rtype"1\n" \
19659+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19660 "2: " ASM_CLAC "\n" \
19661 ".section .fixup,\"ax\"\n" \
19662 "3: mov %3,%0\n" \
19663@@ -364,8 +414,10 @@ do { \
19664 " jmp 2b\n" \
19665 ".previous\n" \
19666 _ASM_EXTABLE(1b, 3b) \
19667- : "=r" (err), ltype(x) \
19668- : "m" (__m(addr)), "i" (errret), "0" (err))
19669+ : "=r" (err), ltype (x) \
19670+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19671+ pax_close_userland(); \
19672+} while (0)
19673
19674 #define __get_user_size_ex(x, ptr, size) \
19675 do { \
19676@@ -389,7 +441,7 @@ do { \
19677 } while (0)
19678
19679 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19680- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19681+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19682 "2:\n" \
19683 _ASM_EXTABLE_EX(1b, 2b) \
19684 : ltype(x) : "m" (__m(addr)))
19685@@ -406,13 +458,24 @@ do { \
19686 int __gu_err; \
19687 unsigned long __gu_val; \
19688 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19689- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19690+ (x) = (__typeof__(*(ptr)))__gu_val; \
19691 __gu_err; \
19692 })
19693
19694 /* FIXME: this hack is definitely wrong -AK */
19695 struct __large_struct { unsigned long buf[100]; };
19696-#define __m(x) (*(struct __large_struct __user *)(x))
19697+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19698+#define ____m(x) \
19699+({ \
19700+ unsigned long ____x = (unsigned long)(x); \
19701+ if (____x < pax_user_shadow_base) \
19702+ ____x += pax_user_shadow_base; \
19703+ (typeof(x))____x; \
19704+})
19705+#else
19706+#define ____m(x) (x)
19707+#endif
19708+#define __m(x) (*(struct __large_struct __user *)____m(x))
19709
19710 /*
19711 * Tell gcc we read from memory instead of writing: this is because
19712@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19713 * aliasing issues.
19714 */
19715 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19716+do { \
19717+ pax_open_userland(); \
19718 asm volatile(ASM_STAC "\n" \
19719- "1: mov"itype" %"rtype"1,%2\n" \
19720+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19721 "2: " ASM_CLAC "\n" \
19722 ".section .fixup,\"ax\"\n" \
19723 "3: mov %3,%0\n" \
19724@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19725 ".previous\n" \
19726 _ASM_EXTABLE(1b, 3b) \
19727 : "=r"(err) \
19728- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19729+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19730+ pax_close_userland(); \
19731+} while (0)
19732
19733 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19734- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19735+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19736 "2:\n" \
19737 _ASM_EXTABLE_EX(1b, 2b) \
19738 : : ltype(x), "m" (__m(addr)))
19739@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19740 */
19741 #define uaccess_try do { \
19742 current_thread_info()->uaccess_err = 0; \
19743+ pax_open_userland(); \
19744 stac(); \
19745 barrier();
19746
19747 #define uaccess_catch(err) \
19748 clac(); \
19749+ pax_close_userland(); \
19750 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19751 } while (0)
19752
19753@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19754 * On error, the variable @x is set to zero.
19755 */
19756
19757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758+#define __get_user(x, ptr) get_user((x), (ptr))
19759+#else
19760 #define __get_user(x, ptr) \
19761 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19762+#endif
19763
19764 /**
19765 * __put_user: - Write a simple value into user space, with less checking.
19766@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19767 * Returns zero on success, or -EFAULT on error.
19768 */
19769
19770+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19771+#define __put_user(x, ptr) put_user((x), (ptr))
19772+#else
19773 #define __put_user(x, ptr) \
19774 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19775+#endif
19776
19777 #define __get_user_unaligned __get_user
19778 #define __put_user_unaligned __put_user
19779@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19780 #define get_user_ex(x, ptr) do { \
19781 unsigned long __gue_val; \
19782 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19783- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19784+ (x) = (__typeof__(*(ptr)))__gue_val; \
19785 } while (0)
19786
19787 #define put_user_try uaccess_try
19788@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19789 extern __must_check long strnlen_user(const char __user *str, long n);
19790
19791 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19792-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19793+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19794
19795 extern void __cmpxchg_wrong_size(void)
19796 __compiletime_error("Bad argument size for cmpxchg");
19797@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19798 __typeof__(ptr) __uval = (uval); \
19799 __typeof__(*(ptr)) __old = (old); \
19800 __typeof__(*(ptr)) __new = (new); \
19801+ pax_open_userland(); \
19802 switch (size) { \
19803 case 1: \
19804 { \
19805 asm volatile("\t" ASM_STAC "\n" \
19806- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19807+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19808 "2:\t" ASM_CLAC "\n" \
19809 "\t.section .fixup, \"ax\"\n" \
19810 "3:\tmov %3, %0\n" \
19811 "\tjmp 2b\n" \
19812 "\t.previous\n" \
19813 _ASM_EXTABLE(1b, 3b) \
19814- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19815+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19816 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19817 : "memory" \
19818 ); \
19819@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19820 case 2: \
19821 { \
19822 asm volatile("\t" ASM_STAC "\n" \
19823- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19824+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19825 "2:\t" ASM_CLAC "\n" \
19826 "\t.section .fixup, \"ax\"\n" \
19827 "3:\tmov %3, %0\n" \
19828 "\tjmp 2b\n" \
19829 "\t.previous\n" \
19830 _ASM_EXTABLE(1b, 3b) \
19831- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19832+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19833 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19834 : "memory" \
19835 ); \
19836@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19837 case 4: \
19838 { \
19839 asm volatile("\t" ASM_STAC "\n" \
19840- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19841+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19842 "2:\t" ASM_CLAC "\n" \
19843 "\t.section .fixup, \"ax\"\n" \
19844 "3:\tmov %3, %0\n" \
19845 "\tjmp 2b\n" \
19846 "\t.previous\n" \
19847 _ASM_EXTABLE(1b, 3b) \
19848- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19849+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19850 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19851 : "memory" \
19852 ); \
19853@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19854 __cmpxchg_wrong_size(); \
19855 \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19871 default: \
19872 __cmpxchg_wrong_size(); \
19873 } \
19874+ pax_close_userland(); \
19875 *__uval = __old; \
19876 __ret; \
19877 })
19878@@ -636,17 +715,6 @@ extern struct movsl_mask {
19879
19880 #define ARCH_HAS_NOCACHE_UACCESS 1
19881
19882-#ifdef CONFIG_X86_32
19883-# include <asm/uaccess_32.h>
19884-#else
19885-# include <asm/uaccess_64.h>
19886-#endif
19887-
19888-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19889- unsigned n);
19890-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19891- unsigned n);
19892-
19893 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19894 # define copy_user_diag __compiletime_error
19895 #else
19896@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19897 extern void copy_user_diag("copy_from_user() buffer size is too small")
19898 copy_from_user_overflow(void);
19899 extern void copy_user_diag("copy_to_user() buffer size is too small")
19900-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19901+copy_to_user_overflow(void);
19902
19903 #undef copy_user_diag
19904
19905@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19906
19907 extern void
19908 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19909-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19910+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19911 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19912
19913 #else
19914@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19915
19916 #endif
19917
19918+#ifdef CONFIG_X86_32
19919+# include <asm/uaccess_32.h>
19920+#else
19921+# include <asm/uaccess_64.h>
19922+#endif
19923+
19924 static inline unsigned long __must_check
19925 copy_from_user(void *to, const void __user *from, unsigned long n)
19926 {
19927- int sz = __compiletime_object_size(to);
19928+ size_t sz = __compiletime_object_size(to);
19929
19930 might_fault();
19931
19932@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19933 * case, and do only runtime checking for non-constant sizes.
19934 */
19935
19936- if (likely(sz < 0 || sz >= n))
19937- n = _copy_from_user(to, from, n);
19938- else if(__builtin_constant_p(n))
19939- copy_from_user_overflow();
19940- else
19941- __copy_from_user_overflow(sz, n);
19942+ if (likely(sz != (size_t)-1 && sz < n)) {
19943+ if(__builtin_constant_p(n))
19944+ copy_from_user_overflow();
19945+ else
19946+ __copy_from_user_overflow(sz, n);
19947+ } else if (access_ok(VERIFY_READ, from, n))
19948+ n = __copy_from_user(to, from, n);
19949+ else if ((long)n > 0)
19950+ memset(to, 0, n);
19951
19952 return n;
19953 }
19954@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19955 static inline unsigned long __must_check
19956 copy_to_user(void __user *to, const void *from, unsigned long n)
19957 {
19958- int sz = __compiletime_object_size(from);
19959+ size_t sz = __compiletime_object_size(from);
19960
19961 might_fault();
19962
19963 /* See the comment in copy_from_user() above. */
19964- if (likely(sz < 0 || sz >= n))
19965- n = _copy_to_user(to, from, n);
19966- else if(__builtin_constant_p(n))
19967- copy_to_user_overflow();
19968- else
19969- __copy_to_user_overflow(sz, n);
19970+ if (likely(sz != (size_t)-1 && sz < n)) {
19971+ if(__builtin_constant_p(n))
19972+ copy_to_user_overflow();
19973+ else
19974+ __copy_to_user_overflow(sz, n);
19975+ } else if (access_ok(VERIFY_WRITE, to, n))
19976+ n = __copy_to_user(to, from, n);
19977
19978 return n;
19979 }
19980diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19981index 3c03a5d..edb68ae 100644
19982--- a/arch/x86/include/asm/uaccess_32.h
19983+++ b/arch/x86/include/asm/uaccess_32.h
19984@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19985 * anything, so this is accurate.
19986 */
19987
19988-static __always_inline unsigned long __must_check
19989+static __always_inline __size_overflow(3) unsigned long __must_check
19990 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19991 {
19992+ if ((long)n < 0)
19993+ return n;
19994+
19995+ check_object_size(from, n, true);
19996+
19997 if (__builtin_constant_p(n)) {
19998 unsigned long ret;
19999
20000@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20001 __copy_to_user(void __user *to, const void *from, unsigned long n)
20002 {
20003 might_fault();
20004+
20005 return __copy_to_user_inatomic(to, from, n);
20006 }
20007
20008-static __always_inline unsigned long
20009+static __always_inline __size_overflow(3) unsigned long
20010 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20011 {
20012+ if ((long)n < 0)
20013+ return n;
20014+
20015 /* Avoid zeroing the tail if the copy fails..
20016 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20017 * but as the zeroing behaviour is only significant when n is not
20018@@ -137,6 +146,12 @@ static __always_inline unsigned long
20019 __copy_from_user(void *to, const void __user *from, unsigned long n)
20020 {
20021 might_fault();
20022+
20023+ if ((long)n < 0)
20024+ return n;
20025+
20026+ check_object_size(to, n, false);
20027+
20028 if (__builtin_constant_p(n)) {
20029 unsigned long ret;
20030
20031@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20032 const void __user *from, unsigned long n)
20033 {
20034 might_fault();
20035+
20036+ if ((long)n < 0)
20037+ return n;
20038+
20039 if (__builtin_constant_p(n)) {
20040 unsigned long ret;
20041
20042@@ -181,7 +200,10 @@ static __always_inline unsigned long
20043 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20044 unsigned long n)
20045 {
20046- return __copy_from_user_ll_nocache_nozero(to, from, n);
20047+ if ((long)n < 0)
20048+ return n;
20049+
20050+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20051 }
20052
20053 #endif /* _ASM_X86_UACCESS_32_H */
20054diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20055index f2f9b39..2ae1bf8 100644
20056--- a/arch/x86/include/asm/uaccess_64.h
20057+++ b/arch/x86/include/asm/uaccess_64.h
20058@@ -10,6 +10,9 @@
20059 #include <asm/alternative.h>
20060 #include <asm/cpufeature.h>
20061 #include <asm/page.h>
20062+#include <asm/pgtable.h>
20063+
20064+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20065
20066 /*
20067 * Copy To/From Userspace
20068@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20069 __must_check unsigned long
20070 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20071
20072-static __always_inline __must_check unsigned long
20073-copy_user_generic(void *to, const void *from, unsigned len)
20074+static __always_inline __must_check __size_overflow(3) unsigned long
20075+copy_user_generic(void *to, const void *from, unsigned long len)
20076 {
20077 unsigned ret;
20078
20079@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20080 }
20081
20082 __must_check unsigned long
20083-copy_in_user(void __user *to, const void __user *from, unsigned len);
20084+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20085
20086 static __always_inline __must_check
20087-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20088+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20089 {
20090- int ret = 0;
20091+ size_t sz = __compiletime_object_size(dst);
20092+ unsigned ret = 0;
20093+
20094+ if (size > INT_MAX)
20095+ return size;
20096+
20097+ check_object_size(dst, size, false);
20098+
20099+#ifdef CONFIG_PAX_MEMORY_UDEREF
20100+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20101+ return size;
20102+#endif
20103+
20104+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20105+ if(__builtin_constant_p(size))
20106+ copy_from_user_overflow();
20107+ else
20108+ __copy_from_user_overflow(sz, size);
20109+ return size;
20110+ }
20111
20112 if (!__builtin_constant_p(size))
20113- return copy_user_generic(dst, (__force void *)src, size);
20114+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20115 switch (size) {
20116- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20117+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20118 ret, "b", "b", "=q", 1);
20119 return ret;
20120- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20121+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20122 ret, "w", "w", "=r", 2);
20123 return ret;
20124- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20125+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20126 ret, "l", "k", "=r", 4);
20127 return ret;
20128- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20129+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20130 ret, "q", "", "=r", 8);
20131 return ret;
20132 case 10:
20133- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20134+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20135 ret, "q", "", "=r", 10);
20136 if (unlikely(ret))
20137 return ret;
20138 __get_user_asm(*(u16 *)(8 + (char *)dst),
20139- (u16 __user *)(8 + (char __user *)src),
20140+ (const u16 __user *)(8 + (const char __user *)src),
20141 ret, "w", "w", "=r", 2);
20142 return ret;
20143 case 16:
20144- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20145+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20146 ret, "q", "", "=r", 16);
20147 if (unlikely(ret))
20148 return ret;
20149 __get_user_asm(*(u64 *)(8 + (char *)dst),
20150- (u64 __user *)(8 + (char __user *)src),
20151+ (const u64 __user *)(8 + (const char __user *)src),
20152 ret, "q", "", "=r", 8);
20153 return ret;
20154 default:
20155- return copy_user_generic(dst, (__force void *)src, size);
20156+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20157 }
20158 }
20159
20160 static __always_inline __must_check
20161-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20162+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20163 {
20164 might_fault();
20165 return __copy_from_user_nocheck(dst, src, size);
20166 }
20167
20168 static __always_inline __must_check
20169-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20170+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20171 {
20172- int ret = 0;
20173+ size_t sz = __compiletime_object_size(src);
20174+ unsigned ret = 0;
20175+
20176+ if (size > INT_MAX)
20177+ return size;
20178+
20179+ check_object_size(src, size, true);
20180+
20181+#ifdef CONFIG_PAX_MEMORY_UDEREF
20182+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20183+ return size;
20184+#endif
20185+
20186+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20187+ if(__builtin_constant_p(size))
20188+ copy_to_user_overflow();
20189+ else
20190+ __copy_to_user_overflow(sz, size);
20191+ return size;
20192+ }
20193
20194 if (!__builtin_constant_p(size))
20195- return copy_user_generic((__force void *)dst, src, size);
20196+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20197 switch (size) {
20198- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20199+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20200 ret, "b", "b", "iq", 1);
20201 return ret;
20202- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20203+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20204 ret, "w", "w", "ir", 2);
20205 return ret;
20206- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20207+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20208 ret, "l", "k", "ir", 4);
20209 return ret;
20210- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20211+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20212 ret, "q", "", "er", 8);
20213 return ret;
20214 case 10:
20215- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20216+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20217 ret, "q", "", "er", 10);
20218 if (unlikely(ret))
20219 return ret;
20220 asm("":::"memory");
20221- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20222+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20223 ret, "w", "w", "ir", 2);
20224 return ret;
20225 case 16:
20226- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20227+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20228 ret, "q", "", "er", 16);
20229 if (unlikely(ret))
20230 return ret;
20231 asm("":::"memory");
20232- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20233+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20234 ret, "q", "", "er", 8);
20235 return ret;
20236 default:
20237- return copy_user_generic((__force void *)dst, src, size);
20238+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20239 }
20240 }
20241
20242 static __always_inline __must_check
20243-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20244+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20245 {
20246 might_fault();
20247 return __copy_to_user_nocheck(dst, src, size);
20248 }
20249
20250 static __always_inline __must_check
20251-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20252+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20253 {
20254- int ret = 0;
20255+ unsigned ret = 0;
20256
20257 might_fault();
20258+
20259+ if (size > INT_MAX)
20260+ return size;
20261+
20262+#ifdef CONFIG_PAX_MEMORY_UDEREF
20263+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20264+ return size;
20265+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20266+ return size;
20267+#endif
20268+
20269 if (!__builtin_constant_p(size))
20270- return copy_user_generic((__force void *)dst,
20271- (__force void *)src, size);
20272+ return copy_user_generic((__force_kernel void *)____m(dst),
20273+ (__force_kernel const void *)____m(src), size);
20274 switch (size) {
20275 case 1: {
20276 u8 tmp;
20277- __get_user_asm(tmp, (u8 __user *)src,
20278+ __get_user_asm(tmp, (const u8 __user *)src,
20279 ret, "b", "b", "=q", 1);
20280 if (likely(!ret))
20281 __put_user_asm(tmp, (u8 __user *)dst,
20282@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20283 }
20284 case 2: {
20285 u16 tmp;
20286- __get_user_asm(tmp, (u16 __user *)src,
20287+ __get_user_asm(tmp, (const u16 __user *)src,
20288 ret, "w", "w", "=r", 2);
20289 if (likely(!ret))
20290 __put_user_asm(tmp, (u16 __user *)dst,
20291@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20292
20293 case 4: {
20294 u32 tmp;
20295- __get_user_asm(tmp, (u32 __user *)src,
20296+ __get_user_asm(tmp, (const u32 __user *)src,
20297 ret, "l", "k", "=r", 4);
20298 if (likely(!ret))
20299 __put_user_asm(tmp, (u32 __user *)dst,
20300@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20301 }
20302 case 8: {
20303 u64 tmp;
20304- __get_user_asm(tmp, (u64 __user *)src,
20305+ __get_user_asm(tmp, (const u64 __user *)src,
20306 ret, "q", "", "=r", 8);
20307 if (likely(!ret))
20308 __put_user_asm(tmp, (u64 __user *)dst,
20309@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20310 return ret;
20311 }
20312 default:
20313- return copy_user_generic((__force void *)dst,
20314- (__force void *)src, size);
20315+ return copy_user_generic((__force_kernel void *)____m(dst),
20316+ (__force_kernel const void *)____m(src), size);
20317 }
20318 }
20319
20320-static __must_check __always_inline int
20321-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20322+static __must_check __always_inline unsigned long
20323+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20324 {
20325 return __copy_from_user_nocheck(dst, src, size);
20326 }
20327
20328-static __must_check __always_inline int
20329-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20330+static __must_check __always_inline unsigned long
20331+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20332 {
20333 return __copy_to_user_nocheck(dst, src, size);
20334 }
20335
20336-extern long __copy_user_nocache(void *dst, const void __user *src,
20337- unsigned size, int zerorest);
20338+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20339+ unsigned long size, int zerorest);
20340
20341-static inline int
20342-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20343+static inline unsigned long
20344+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20345 {
20346 might_fault();
20347+
20348+ if (size > INT_MAX)
20349+ return size;
20350+
20351+#ifdef CONFIG_PAX_MEMORY_UDEREF
20352+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20353+ return size;
20354+#endif
20355+
20356 return __copy_user_nocache(dst, src, size, 1);
20357 }
20358
20359-static inline int
20360+static inline unsigned long
20361 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20362- unsigned size)
20363+ unsigned long size)
20364 {
20365+ if (size > INT_MAX)
20366+ return size;
20367+
20368+#ifdef CONFIG_PAX_MEMORY_UDEREF
20369+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20370+ return size;
20371+#endif
20372+
20373 return __copy_user_nocache(dst, src, size, 0);
20374 }
20375
20376 unsigned long
20377-copy_user_handle_tail(char *to, char *from, unsigned len);
20378+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20379
20380 #endif /* _ASM_X86_UACCESS_64_H */
20381diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20382index 5b238981..77fdd78 100644
20383--- a/arch/x86/include/asm/word-at-a-time.h
20384+++ b/arch/x86/include/asm/word-at-a-time.h
20385@@ -11,7 +11,7 @@
20386 * and shift, for example.
20387 */
20388 struct word_at_a_time {
20389- const unsigned long one_bits, high_bits;
20390+ unsigned long one_bits, high_bits;
20391 };
20392
20393 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20394diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20395index f58a9c7..dc378042a 100644
20396--- a/arch/x86/include/asm/x86_init.h
20397+++ b/arch/x86/include/asm/x86_init.h
20398@@ -129,7 +129,7 @@ struct x86_init_ops {
20399 struct x86_init_timers timers;
20400 struct x86_init_iommu iommu;
20401 struct x86_init_pci pci;
20402-};
20403+} __no_const;
20404
20405 /**
20406 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20407@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20408 void (*setup_percpu_clockev)(void);
20409 void (*early_percpu_clock_init)(void);
20410 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20411-};
20412+} __no_const;
20413
20414 struct timespec;
20415
20416@@ -168,7 +168,7 @@ struct x86_platform_ops {
20417 void (*save_sched_clock_state)(void);
20418 void (*restore_sched_clock_state)(void);
20419 void (*apic_post_init)(void);
20420-};
20421+} __no_const;
20422
20423 struct pci_dev;
20424 struct msi_msg;
20425@@ -182,7 +182,7 @@ struct x86_msi_ops {
20426 void (*teardown_msi_irqs)(struct pci_dev *dev);
20427 void (*restore_msi_irqs)(struct pci_dev *dev);
20428 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20429-};
20430+} __no_const;
20431
20432 struct IO_APIC_route_entry;
20433 struct io_apic_irq_attr;
20434@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20435 unsigned int destination, int vector,
20436 struct io_apic_irq_attr *attr);
20437 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20438-};
20439+} __no_const;
20440
20441 extern struct x86_init_ops x86_init;
20442 extern struct x86_cpuinit_ops x86_cpuinit;
20443diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20444index c44a5d5..7f83cfc 100644
20445--- a/arch/x86/include/asm/xen/page.h
20446+++ b/arch/x86/include/asm/xen/page.h
20447@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20448 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20449 * cases needing an extended handling.
20450 */
20451-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20452+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20453 {
20454 unsigned long mfn;
20455
20456diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20457index c9a6d68..cb57f42 100644
20458--- a/arch/x86/include/asm/xsave.h
20459+++ b/arch/x86/include/asm/xsave.h
20460@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20461 if (unlikely(err))
20462 return -EFAULT;
20463
20464+ pax_open_userland();
20465 __asm__ __volatile__(ASM_STAC "\n"
20466- "1:"XSAVE"\n"
20467+ "1:"
20468+ __copyuser_seg
20469+ XSAVE"\n"
20470 "2: " ASM_CLAC "\n"
20471 xstate_fault
20472 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20473 : "memory");
20474+ pax_close_userland();
20475 return err;
20476 }
20477
20478@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20479 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20480 {
20481 int err = 0;
20482- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20483+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20484 u32 lmask = mask;
20485 u32 hmask = mask >> 32;
20486
20487+ pax_open_userland();
20488 __asm__ __volatile__(ASM_STAC "\n"
20489- "1:"XRSTOR"\n"
20490+ "1:"
20491+ __copyuser_seg
20492+ XRSTOR"\n"
20493 "2: " ASM_CLAC "\n"
20494 xstate_fault
20495 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20496 : "memory"); /* memory required? */
20497+ pax_close_userland();
20498 return err;
20499 }
20500
20501diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20502index 960a8a9..404daf7 100644
20503--- a/arch/x86/include/uapi/asm/e820.h
20504+++ b/arch/x86/include/uapi/asm/e820.h
20505@@ -68,7 +68,7 @@ struct e820map {
20506 #define ISA_START_ADDRESS 0xa0000
20507 #define ISA_END_ADDRESS 0x100000
20508
20509-#define BIOS_BEGIN 0x000a0000
20510+#define BIOS_BEGIN 0x000c0000
20511 #define BIOS_END 0x00100000
20512
20513 #define BIOS_ROM_BASE 0xffe00000
20514diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20515index 9bcd0b5..750f1b7 100644
20516--- a/arch/x86/kernel/Makefile
20517+++ b/arch/x86/kernel/Makefile
20518@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20519 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20520 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20521 obj-y += probe_roms.o
20522-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20523+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20524 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20525 obj-$(CONFIG_X86_64) += mcount_64.o
20526 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20527diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20528index dbe76a1..e2ec334 100644
20529--- a/arch/x86/kernel/acpi/boot.c
20530+++ b/arch/x86/kernel/acpi/boot.c
20531@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20532 * If your system is blacklisted here, but you find that acpi=force
20533 * works for you, please contact linux-acpi@vger.kernel.org
20534 */
20535-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20536+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20537 /*
20538 * Boxes that need ACPI disabled
20539 */
20540@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20541 };
20542
20543 /* second table for DMI checks that should run after early-quirks */
20544-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20545+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20546 /*
20547 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20548 * which includes some code which overrides all temperature
20549diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20550index d1daead..acd77e2 100644
20551--- a/arch/x86/kernel/acpi/sleep.c
20552+++ b/arch/x86/kernel/acpi/sleep.c
20553@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20554 #else /* CONFIG_64BIT */
20555 #ifdef CONFIG_SMP
20556 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20557+
20558+ pax_open_kernel();
20559 early_gdt_descr.address =
20560 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20561+ pax_close_kernel();
20562+
20563 initial_gs = per_cpu_offset(smp_processor_id());
20564 #endif
20565 initial_code = (unsigned long)wakeup_long64;
20566diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20567index 665c6b7..eae4d56 100644
20568--- a/arch/x86/kernel/acpi/wakeup_32.S
20569+++ b/arch/x86/kernel/acpi/wakeup_32.S
20570@@ -29,13 +29,11 @@ wakeup_pmode_return:
20571 # and restore the stack ... but you need gdt for this to work
20572 movl saved_context_esp, %esp
20573
20574- movl %cs:saved_magic, %eax
20575- cmpl $0x12345678, %eax
20576+ cmpl $0x12345678, saved_magic
20577 jne bogus_magic
20578
20579 # jump to place where we left off
20580- movl saved_eip, %eax
20581- jmp *%eax
20582+ jmp *(saved_eip)
20583
20584 bogus_magic:
20585 jmp bogus_magic
20586diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20587index aef6531..2044b66 100644
20588--- a/arch/x86/kernel/alternative.c
20589+++ b/arch/x86/kernel/alternative.c
20590@@ -248,7 +248,9 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
20591 unsigned int noplen = len;
20592 if (noplen > ASM_NOP_MAX)
20593 noplen = ASM_NOP_MAX;
20594+ pax_open_kernel();
20595 memcpy(insns, ideal_nops[noplen], noplen);
20596+ pax_close_kernel();
20597 insns += noplen;
20598 len -= noplen;
20599 }
20600@@ -276,6 +278,11 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf)
20601 if (a->replacementlen != 5)
20602 return;
20603
20604+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20605+ if (orig_insn < (u8 *)_text || (u8 *)_einittext <= orig_insn)
20606+ orig_insn = ktva_ktla(orig_insn);
20607+#endif
20608+
20609 o_dspl = *(s32 *)(insnbuf + 1);
20610
20611 /* next_rip of the replacement JMP */
20612@@ -362,7 +369,23 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20613 int insnbuf_sz = 0;
20614
20615 instr = (u8 *)&a->instr_offset + a->instr_offset;
20616+
20617+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20618+ if ((u8 *)_text <= instr && instr < (u8 *)_einittext) {
20619+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20620+ instr = ktla_ktva(instr);
20621+ }
20622+#endif
20623+
20624 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20625+
20626+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20627+ if ((u8 *)_text <= replacement && replacement < (u8 *)_einittext) {
20628+ replacement += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20629+ replacement = ktla_ktva(replacement);
20630+ }
20631+#endif
20632+
20633 BUG_ON(a->instrlen > sizeof(insnbuf));
20634 BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
20635 if (!boot_cpu_has(a->cpuid)) {
20636@@ -402,6 +425,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20637 }
20638 DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
20639
20640+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20641+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20642+ instr = ktva_ktla(instr);
20643+#endif
20644+
20645 text_poke_early(instr, insnbuf, insnbuf_sz);
20646 }
20647 }
20648@@ -416,10 +444,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20649 for (poff = start; poff < end; poff++) {
20650 u8 *ptr = (u8 *)poff + *poff;
20651
20652+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20653+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20654+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20655+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20656+#endif
20657+
20658 if (!*poff || ptr < text || ptr >= text_end)
20659 continue;
20660 /* turn DS segment override prefix into lock prefix */
20661- if (*ptr == 0x3e)
20662+ if (*ktla_ktva(ptr) == 0x3e)
20663 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20664 }
20665 mutex_unlock(&text_mutex);
20666@@ -434,10 +468,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20667 for (poff = start; poff < end; poff++) {
20668 u8 *ptr = (u8 *)poff + *poff;
20669
20670+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20671+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20672+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20673+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20674+#endif
20675+
20676 if (!*poff || ptr < text || ptr >= text_end)
20677 continue;
20678 /* turn lock prefix into DS segment override prefix */
20679- if (*ptr == 0xf0)
20680+ if (*ktla_ktva(ptr) == 0xf0)
20681 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20682 }
20683 mutex_unlock(&text_mutex);
20684@@ -574,7 +614,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20685
20686 BUG_ON(p->len > MAX_PATCH_LEN);
20687 /* prep the buffer with the original instructions */
20688- memcpy(insnbuf, p->instr, p->len);
20689+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20690 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20691 (unsigned long)p->instr, p->len);
20692
20693@@ -621,7 +661,7 @@ void __init alternative_instructions(void)
20694 if (!uniproc_patched || num_possible_cpus() == 1)
20695 free_init_pages("SMP alternatives",
20696 (unsigned long)__smp_locks,
20697- (unsigned long)__smp_locks_end);
20698+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20699 #endif
20700
20701 apply_paravirt(__parainstructions, __parainstructions_end);
20702@@ -641,13 +681,17 @@ void __init alternative_instructions(void)
20703 * instructions. And on the local CPU you need to be protected again NMI or MCE
20704 * handlers seeing an inconsistent instruction while you patch.
20705 */
20706-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20707+void *__kprobes text_poke_early(void *addr, const void *opcode,
20708 size_t len)
20709 {
20710 unsigned long flags;
20711 local_irq_save(flags);
20712- memcpy(addr, opcode, len);
20713+
20714+ pax_open_kernel();
20715+ memcpy(ktla_ktva(addr), opcode, len);
20716 sync_core();
20717+ pax_close_kernel();
20718+
20719 local_irq_restore(flags);
20720 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20721 that causes hangs on some VIA CPUs. */
20722@@ -669,36 +713,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20723 */
20724 void *text_poke(void *addr, const void *opcode, size_t len)
20725 {
20726- unsigned long flags;
20727- char *vaddr;
20728+ unsigned char *vaddr = ktla_ktva(addr);
20729 struct page *pages[2];
20730- int i;
20731+ size_t i;
20732
20733 if (!core_kernel_text((unsigned long)addr)) {
20734- pages[0] = vmalloc_to_page(addr);
20735- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20736+ pages[0] = vmalloc_to_page(vaddr);
20737+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20738 } else {
20739- pages[0] = virt_to_page(addr);
20740+ pages[0] = virt_to_page(vaddr);
20741 WARN_ON(!PageReserved(pages[0]));
20742- pages[1] = virt_to_page(addr + PAGE_SIZE);
20743+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20744 }
20745 BUG_ON(!pages[0]);
20746- local_irq_save(flags);
20747- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20748- if (pages[1])
20749- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20750- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20751- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20752- clear_fixmap(FIX_TEXT_POKE0);
20753- if (pages[1])
20754- clear_fixmap(FIX_TEXT_POKE1);
20755- local_flush_tlb();
20756- sync_core();
20757- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20758- that causes hangs on some VIA CPUs. */
20759+ text_poke_early(addr, opcode, len);
20760 for (i = 0; i < len; i++)
20761- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20762- local_irq_restore(flags);
20763+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20764 return addr;
20765 }
20766
20767@@ -752,7 +782,7 @@ int poke_int3_handler(struct pt_regs *regs)
20768 */
20769 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20770 {
20771- unsigned char int3 = 0xcc;
20772+ const unsigned char int3 = 0xcc;
20773
20774 bp_int3_handler = handler;
20775 bp_int3_addr = (u8 *)addr + sizeof(int3);
20776diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20777index dcb5285..cc79e9d 100644
20778--- a/arch/x86/kernel/apic/apic.c
20779+++ b/arch/x86/kernel/apic/apic.c
20780@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20781 /*
20782 * Debug level, exported for io_apic.c
20783 */
20784-unsigned int apic_verbosity;
20785+int apic_verbosity;
20786
20787 int pic_mode;
20788
20789@@ -1857,7 +1857,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20790 apic_write(APIC_ESR, 0);
20791 v = apic_read(APIC_ESR);
20792 ack_APIC_irq();
20793- atomic_inc(&irq_err_count);
20794+ atomic_inc_unchecked(&irq_err_count);
20795
20796 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20797 smp_processor_id(), v);
20798diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20799index de918c4..32eed23 100644
20800--- a/arch/x86/kernel/apic/apic_flat_64.c
20801+++ b/arch/x86/kernel/apic/apic_flat_64.c
20802@@ -154,7 +154,7 @@ static int flat_probe(void)
20803 return 1;
20804 }
20805
20806-static struct apic apic_flat = {
20807+static struct apic apic_flat __read_only = {
20808 .name = "flat",
20809 .probe = flat_probe,
20810 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20811@@ -260,7 +260,7 @@ static int physflat_probe(void)
20812 return 0;
20813 }
20814
20815-static struct apic apic_physflat = {
20816+static struct apic apic_physflat __read_only = {
20817
20818 .name = "physical flat",
20819 .probe = physflat_probe,
20820diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20821index b205cdb..d8503ff 100644
20822--- a/arch/x86/kernel/apic/apic_noop.c
20823+++ b/arch/x86/kernel/apic/apic_noop.c
20824@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20825 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20826 }
20827
20828-struct apic apic_noop = {
20829+struct apic apic_noop __read_only = {
20830 .name = "noop",
20831 .probe = noop_probe,
20832 .acpi_madt_oem_check = NULL,
20833diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20834index c4a8d63..fe893ac 100644
20835--- a/arch/x86/kernel/apic/bigsmp_32.c
20836+++ b/arch/x86/kernel/apic/bigsmp_32.c
20837@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20838 return dmi_bigsmp;
20839 }
20840
20841-static struct apic apic_bigsmp = {
20842+static struct apic apic_bigsmp __read_only = {
20843
20844 .name = "bigsmp",
20845 .probe = probe_bigsmp,
20846diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20847index f4dc246..fbab133 100644
20848--- a/arch/x86/kernel/apic/io_apic.c
20849+++ b/arch/x86/kernel/apic/io_apic.c
20850@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20851 return ret;
20852 }
20853
20854-atomic_t irq_mis_count;
20855+atomic_unchecked_t irq_mis_count;
20856
20857 #ifdef CONFIG_GENERIC_PENDING_IRQ
20858 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20859@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20860 * at the cpu.
20861 */
20862 if (!(v & (1 << (i & 0x1f)))) {
20863- atomic_inc(&irq_mis_count);
20864+ atomic_inc_unchecked(&irq_mis_count);
20865
20866 eoi_ioapic_irq(irq, cfg);
20867 }
20868@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20869 ioapic_irqd_unmask(data, cfg, masked);
20870 }
20871
20872-static struct irq_chip ioapic_chip __read_mostly = {
20873+static struct irq_chip ioapic_chip = {
20874 .name = "IO-APIC",
20875 .irq_startup = startup_ioapic_irq,
20876 .irq_mask = mask_ioapic_irq,
20877@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20878 ack_APIC_irq();
20879 }
20880
20881-static struct irq_chip lapic_chip __read_mostly = {
20882+static struct irq_chip lapic_chip = {
20883 .name = "local-APIC",
20884 .irq_mask = mask_lapic_irq,
20885 .irq_unmask = unmask_lapic_irq,
20886diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20887index bda4886..f9c7195 100644
20888--- a/arch/x86/kernel/apic/probe_32.c
20889+++ b/arch/x86/kernel/apic/probe_32.c
20890@@ -72,7 +72,7 @@ static int probe_default(void)
20891 return 1;
20892 }
20893
20894-static struct apic apic_default = {
20895+static struct apic apic_default __read_only = {
20896
20897 .name = "default",
20898 .probe = probe_default,
20899diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20900index 6cedd79..023ff8e 100644
20901--- a/arch/x86/kernel/apic/vector.c
20902+++ b/arch/x86/kernel/apic/vector.c
20903@@ -21,7 +21,7 @@
20904
20905 static DEFINE_RAW_SPINLOCK(vector_lock);
20906
20907-void lock_vector_lock(void)
20908+void lock_vector_lock(void) __acquires(vector_lock)
20909 {
20910 /* Used to the online set of cpus does not change
20911 * during assign_irq_vector.
20912@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20913 raw_spin_lock(&vector_lock);
20914 }
20915
20916-void unlock_vector_lock(void)
20917+void unlock_vector_lock(void) __releases(vector_lock)
20918 {
20919 raw_spin_unlock(&vector_lock);
20920 }
20921diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20922index ab3219b..e8033eb 100644
20923--- a/arch/x86/kernel/apic/x2apic_cluster.c
20924+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20925@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20926 return notifier_from_errno(err);
20927 }
20928
20929-static struct notifier_block __refdata x2apic_cpu_notifier = {
20930+static struct notifier_block x2apic_cpu_notifier = {
20931 .notifier_call = update_clusterinfo,
20932 };
20933
20934@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20935 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20936 }
20937
20938-static struct apic apic_x2apic_cluster = {
20939+static struct apic apic_x2apic_cluster __read_only = {
20940
20941 .name = "cluster x2apic",
20942 .probe = x2apic_cluster_probe,
20943diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20944index 6fae733..5ca17af 100644
20945--- a/arch/x86/kernel/apic/x2apic_phys.c
20946+++ b/arch/x86/kernel/apic/x2apic_phys.c
20947@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20948 return apic == &apic_x2apic_phys;
20949 }
20950
20951-static struct apic apic_x2apic_phys = {
20952+static struct apic apic_x2apic_phys __read_only = {
20953
20954 .name = "physical x2apic",
20955 .probe = x2apic_phys_probe,
20956diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20957index c8d9295..9af2d03 100644
20958--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20959+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20960@@ -375,7 +375,7 @@ static int uv_probe(void)
20961 return apic == &apic_x2apic_uv_x;
20962 }
20963
20964-static struct apic __refdata apic_x2apic_uv_x = {
20965+static struct apic apic_x2apic_uv_x __read_only = {
20966
20967 .name = "UV large system",
20968 .probe = uv_probe,
20969diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20970index 927ec92..de68f32 100644
20971--- a/arch/x86/kernel/apm_32.c
20972+++ b/arch/x86/kernel/apm_32.c
20973@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20974 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20975 * even though they are called in protected mode.
20976 */
20977-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20978+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20979 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20980
20981 static const char driver_version[] = "1.16ac"; /* no spaces */
20982@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
20983 BUG_ON(cpu != 0);
20984 gdt = get_cpu_gdt_table(cpu);
20985 save_desc_40 = gdt[0x40 / 8];
20986+
20987+ pax_open_kernel();
20988 gdt[0x40 / 8] = bad_bios_desc;
20989+ pax_close_kernel();
20990
20991 apm_irq_save(flags);
20992 APM_DO_SAVE_SEGS;
20993@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
20994 &call->esi);
20995 APM_DO_RESTORE_SEGS;
20996 apm_irq_restore(flags);
20997+
20998+ pax_open_kernel();
20999 gdt[0x40 / 8] = save_desc_40;
21000+ pax_close_kernel();
21001+
21002 put_cpu();
21003
21004 return call->eax & 0xff;
21005@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21006 BUG_ON(cpu != 0);
21007 gdt = get_cpu_gdt_table(cpu);
21008 save_desc_40 = gdt[0x40 / 8];
21009+
21010+ pax_open_kernel();
21011 gdt[0x40 / 8] = bad_bios_desc;
21012+ pax_close_kernel();
21013
21014 apm_irq_save(flags);
21015 APM_DO_SAVE_SEGS;
21016@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21017 &call->eax);
21018 APM_DO_RESTORE_SEGS;
21019 apm_irq_restore(flags);
21020+
21021+ pax_open_kernel();
21022 gdt[0x40 / 8] = save_desc_40;
21023+ pax_close_kernel();
21024+
21025 put_cpu();
21026 return error;
21027 }
21028@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21029 return 0;
21030 }
21031
21032-static struct dmi_system_id __initdata apm_dmi_table[] = {
21033+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21034 {
21035 print_if_true,
21036 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21037@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21038 * code to that CPU.
21039 */
21040 gdt = get_cpu_gdt_table(0);
21041+
21042+ pax_open_kernel();
21043 set_desc_base(&gdt[APM_CS >> 3],
21044 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21045 set_desc_base(&gdt[APM_CS_16 >> 3],
21046 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21047 set_desc_base(&gdt[APM_DS >> 3],
21048 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21049+ pax_close_kernel();
21050
21051 proc_create("apm", 0, NULL, &apm_file_ops);
21052
21053diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21054index 9f6b934..cf5ffb3 100644
21055--- a/arch/x86/kernel/asm-offsets.c
21056+++ b/arch/x86/kernel/asm-offsets.c
21057@@ -32,6 +32,8 @@ void common(void) {
21058 OFFSET(TI_flags, thread_info, flags);
21059 OFFSET(TI_status, thread_info, status);
21060 OFFSET(TI_addr_limit, thread_info, addr_limit);
21061+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21062+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21063
21064 BLANK();
21065 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21066@@ -52,8 +54,26 @@ void common(void) {
21067 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21068 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21069 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21070+
21071+#ifdef CONFIG_PAX_KERNEXEC
21072+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21073 #endif
21074
21075+#ifdef CONFIG_PAX_MEMORY_UDEREF
21076+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21077+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21078+#ifdef CONFIG_X86_64
21079+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21080+#endif
21081+#endif
21082+
21083+#endif
21084+
21085+ BLANK();
21086+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21087+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21088+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21089+
21090 #ifdef CONFIG_XEN
21091 BLANK();
21092 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21093diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21094index 5ce6f2d..9e738f3 100644
21095--- a/arch/x86/kernel/asm-offsets_64.c
21096+++ b/arch/x86/kernel/asm-offsets_64.c
21097@@ -80,6 +80,7 @@ int main(void)
21098 BLANK();
21099 #undef ENTRY
21100
21101+ DEFINE(TSS_size, sizeof(struct tss_struct));
21102 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21103 OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
21104 BLANK();
21105diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21106index 9bff687..5b899fb 100644
21107--- a/arch/x86/kernel/cpu/Makefile
21108+++ b/arch/x86/kernel/cpu/Makefile
21109@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21110 CFLAGS_REMOVE_perf_event.o = -pg
21111 endif
21112
21113-# Make sure load_percpu_segment has no stackprotector
21114-nostackp := $(call cc-option, -fno-stack-protector)
21115-CFLAGS_common.o := $(nostackp)
21116-
21117 obj-y := intel_cacheinfo.o scattered.o topology.o
21118 obj-y += common.o
21119 obj-y += rdrand.o
21120diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21121index e4cf633..941f450 100644
21122--- a/arch/x86/kernel/cpu/amd.c
21123+++ b/arch/x86/kernel/cpu/amd.c
21124@@ -729,7 +729,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21125 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21126 {
21127 /* AMD errata T13 (order #21922) */
21128- if ((c->x86 == 6)) {
21129+ if (c->x86 == 6) {
21130 /* Duron Rev A0 */
21131 if (c->x86_model == 3 && c->x86_mask == 0)
21132 size = 64;
21133diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21134index a62cf04..56afd65 100644
21135--- a/arch/x86/kernel/cpu/common.c
21136+++ b/arch/x86/kernel/cpu/common.c
21137@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21138
21139 static const struct cpu_dev *this_cpu = &default_cpu;
21140
21141-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21142-#ifdef CONFIG_X86_64
21143- /*
21144- * We need valid kernel segments for data and code in long mode too
21145- * IRET will check the segment types kkeil 2000/10/28
21146- * Also sysret mandates a special GDT layout
21147- *
21148- * TLS descriptors are currently at a different place compared to i386.
21149- * Hopefully nobody expects them at a fixed place (Wine?)
21150- */
21151- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21152- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21153- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21154- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21155- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21156- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21157-#else
21158- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21159- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21160- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21161- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21162- /*
21163- * Segments used for calling PnP BIOS have byte granularity.
21164- * They code segments and data segments have fixed 64k limits,
21165- * the transfer segment sizes are set at run time.
21166- */
21167- /* 32-bit code */
21168- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21169- /* 16-bit code */
21170- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21171- /* 16-bit data */
21172- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21173- /* 16-bit data */
21174- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21175- /* 16-bit data */
21176- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21177- /*
21178- * The APM segments have byte granularity and their bases
21179- * are set at run time. All have 64k limits.
21180- */
21181- /* 32-bit code */
21182- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21183- /* 16-bit code */
21184- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21185- /* data */
21186- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21187-
21188- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21189- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21190- GDT_STACK_CANARY_INIT
21191-#endif
21192-} };
21193-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21194-
21195 static int __init x86_xsave_setup(char *s)
21196 {
21197 if (strlen(s))
21198@@ -306,6 +252,62 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21199 }
21200 }
21201
21202+#ifdef CONFIG_X86_64
21203+static __init int setup_disable_pcid(char *arg)
21204+{
21205+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21206+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21207+
21208+#ifdef CONFIG_PAX_MEMORY_UDEREF
21209+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21210+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21211+#endif
21212+
21213+ return 1;
21214+}
21215+__setup("nopcid", setup_disable_pcid);
21216+
21217+static void setup_pcid(struct cpuinfo_x86 *c)
21218+{
21219+ if (cpu_has(c, X86_FEATURE_PCID)) {
21220+ printk("PAX: PCID detected\n");
21221+ cr4_set_bits(X86_CR4_PCIDE);
21222+ } else
21223+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21224+
21225+ if (cpu_has(c, X86_FEATURE_INVPCID))
21226+ printk("PAX: INVPCID detected\n");
21227+
21228+#ifdef CONFIG_PAX_MEMORY_UDEREF
21229+ if (clone_pgd_mask == ~(pgdval_t)0UL) {
21230+ printk("PAX: UDEREF disabled\n");
21231+ return;
21232+ }
21233+
21234+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21235+ pax_open_kernel();
21236+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21237+ pax_close_kernel();
21238+ printk("PAX: slow and weak UDEREF enabled\n");
21239+ return;
21240+ }
21241+
21242+ set_cpu_cap(c, X86_FEATURE_PCIDUDEREF);
21243+
21244+ pax_open_kernel();
21245+ clone_pgd_mask = ~(pgdval_t)0UL;
21246+ pax_close_kernel();
21247+ if (pax_user_shadow_base)
21248+ printk("PAX: weak UDEREF enabled\n");
21249+ else {
21250+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21251+ printk("PAX: strong UDEREF enabled\n");
21252+ }
21253+#endif
21254+
21255+}
21256+#endif
21257+
21258 /*
21259 * Some CPU features depend on higher CPUID levels, which may not always
21260 * be available due to CPUID level capping or broken virtualization
21261@@ -406,7 +408,7 @@ void switch_to_new_gdt(int cpu)
21262 {
21263 struct desc_ptr gdt_descr;
21264
21265- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21266+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21267 gdt_descr.size = GDT_SIZE - 1;
21268 load_gdt(&gdt_descr);
21269 /* Reload the per-cpu base */
21270@@ -935,6 +937,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21271 setup_smep(c);
21272 setup_smap(c);
21273
21274+#ifdef CONFIG_X86_32
21275+#ifdef CONFIG_PAX_PAGEEXEC
21276+ if (!(__supported_pte_mask & _PAGE_NX))
21277+ clear_cpu_cap(c, X86_FEATURE_PSE);
21278+#endif
21279+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21280+ clear_cpu_cap(c, X86_FEATURE_SEP);
21281+#endif
21282+#endif
21283+
21284+#ifdef CONFIG_X86_64
21285+ setup_pcid(c);
21286+#endif
21287+
21288 /*
21289 * The vendor-specific functions might have changed features.
21290 * Now we do "generic changes."
21291@@ -1009,7 +1025,7 @@ void enable_sep_cpu(void)
21292 int cpu;
21293
21294 cpu = get_cpu();
21295- tss = &per_cpu(cpu_tss, cpu);
21296+ tss = cpu_tss + cpu;
21297
21298 if (!boot_cpu_has(X86_FEATURE_SEP))
21299 goto out;
21300@@ -1155,14 +1171,16 @@ static __init int setup_disablecpuid(char *arg)
21301 }
21302 __setup("clearcpuid=", setup_disablecpuid);
21303
21304+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21305+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21306+
21307 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21308- (unsigned long)&init_thread_union + THREAD_SIZE;
21309+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21310 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21311
21312 #ifdef CONFIG_X86_64
21313-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21314-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21315- (unsigned long) debug_idt_table };
21316+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21317+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21318
21319 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21320 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21321@@ -1367,7 +1385,7 @@ void cpu_init(void)
21322 */
21323 load_ucode_ap();
21324
21325- t = &per_cpu(cpu_tss, cpu);
21326+ t = cpu_tss + cpu;
21327 oist = &per_cpu(orig_ist, cpu);
21328
21329 #ifdef CONFIG_NUMA
21330@@ -1399,7 +1417,6 @@ void cpu_init(void)
21331 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21332 barrier();
21333
21334- x86_configure_nx();
21335 x2apic_setup();
21336
21337 /*
21338@@ -1451,7 +1468,7 @@ void cpu_init(void)
21339 {
21340 int cpu = smp_processor_id();
21341 struct task_struct *curr = current;
21342- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
21343+ struct tss_struct *t = cpu_tss + cpu;
21344 struct thread_struct *thread = &curr->thread;
21345
21346 wait_for_master_cpu(cpu);
21347diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21348index edcb0e2..a138233 100644
21349--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21350+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21351@@ -519,25 +519,23 @@ cache_private_attrs_is_visible(struct kobject *kobj,
21352 return 0;
21353 }
21354
21355+static struct attribute *amd_l3_attrs[4];
21356+
21357 static struct attribute_group cache_private_group = {
21358 .is_visible = cache_private_attrs_is_visible,
21359+ .attrs = amd_l3_attrs,
21360 };
21361
21362 static void init_amd_l3_attrs(void)
21363 {
21364 int n = 1;
21365- static struct attribute **amd_l3_attrs;
21366-
21367- if (amd_l3_attrs) /* already initialized */
21368- return;
21369
21370 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21371 n += 2;
21372 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21373 n += 1;
21374
21375- amd_l3_attrs = kcalloc(n, sizeof(*amd_l3_attrs), GFP_KERNEL);
21376- if (!amd_l3_attrs)
21377+ if (n > 1 && amd_l3_attrs[0]) /* already initialized */
21378 return;
21379
21380 n = 0;
21381@@ -547,8 +545,6 @@ static void init_amd_l3_attrs(void)
21382 }
21383 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21384 amd_l3_attrs[n++] = &dev_attr_subcaches.attr;
21385-
21386- cache_private_group.attrs = amd_l3_attrs;
21387 }
21388
21389 const struct attribute_group *
21390@@ -559,7 +555,7 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
21391 if (this_leaf->level < 3 || !nb)
21392 return NULL;
21393
21394- if (nb && nb->l3_cache.indices)
21395+ if (nb->l3_cache.indices)
21396 init_amd_l3_attrs();
21397
21398 return &cache_private_group;
21399diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21400index 20190bd..cadb2ab 100644
21401--- a/arch/x86/kernel/cpu/mcheck/mce.c
21402+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21403@@ -47,6 +47,7 @@
21404 #include <asm/tlbflush.h>
21405 #include <asm/mce.h>
21406 #include <asm/msr.h>
21407+#include <asm/local.h>
21408
21409 #include "mce-internal.h"
21410
21411@@ -256,7 +257,7 @@ static void print_mce(struct mce *m)
21412 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21413 m->cs, m->ip);
21414
21415- if (m->cs == __KERNEL_CS)
21416+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21417 print_symbol("{%s}", m->ip);
21418 pr_cont("\n");
21419 }
21420@@ -289,10 +290,10 @@ static void print_mce(struct mce *m)
21421
21422 #define PANIC_TIMEOUT 5 /* 5 seconds */
21423
21424-static atomic_t mce_panicked;
21425+static atomic_unchecked_t mce_panicked;
21426
21427 static int fake_panic;
21428-static atomic_t mce_fake_panicked;
21429+static atomic_unchecked_t mce_fake_panicked;
21430
21431 /* Panic in progress. Enable interrupts and wait for final IPI */
21432 static void wait_for_panic(void)
21433@@ -316,7 +317,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21434 /*
21435 * Make sure only one CPU runs in machine check panic
21436 */
21437- if (atomic_inc_return(&mce_panicked) > 1)
21438+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21439 wait_for_panic();
21440 barrier();
21441
21442@@ -324,7 +325,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21443 console_verbose();
21444 } else {
21445 /* Don't log too much for fake panic */
21446- if (atomic_inc_return(&mce_fake_panicked) > 1)
21447+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21448 return;
21449 }
21450 /* First print corrected ones that are still unlogged */
21451@@ -363,7 +364,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21452 if (!fake_panic) {
21453 if (panic_timeout == 0)
21454 panic_timeout = mca_cfg.panic_timeout;
21455- panic(msg);
21456+ panic("%s", msg);
21457 } else
21458 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21459 }
21460@@ -749,7 +750,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21461 * might have been modified by someone else.
21462 */
21463 rmb();
21464- if (atomic_read(&mce_panicked))
21465+ if (atomic_read_unchecked(&mce_panicked))
21466 wait_for_panic();
21467 if (!mca_cfg.monarch_timeout)
21468 goto out;
21469@@ -1679,7 +1680,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21470 }
21471
21472 /* Call the installed machine check handler for this CPU setup. */
21473-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21474+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21475 unexpected_machine_check;
21476
21477 /*
21478@@ -1702,7 +1703,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21479 return;
21480 }
21481
21482+ pax_open_kernel();
21483 machine_check_vector = do_machine_check;
21484+ pax_close_kernel();
21485
21486 __mcheck_cpu_init_generic();
21487 __mcheck_cpu_init_vendor(c);
21488@@ -1716,7 +1719,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21489 */
21490
21491 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21492-static int mce_chrdev_open_count; /* #times opened */
21493+static local_t mce_chrdev_open_count; /* #times opened */
21494 static int mce_chrdev_open_exclu; /* already open exclusive? */
21495
21496 static int mce_chrdev_open(struct inode *inode, struct file *file)
21497@@ -1724,7 +1727,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21498 spin_lock(&mce_chrdev_state_lock);
21499
21500 if (mce_chrdev_open_exclu ||
21501- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21502+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21503 spin_unlock(&mce_chrdev_state_lock);
21504
21505 return -EBUSY;
21506@@ -1732,7 +1735,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21507
21508 if (file->f_flags & O_EXCL)
21509 mce_chrdev_open_exclu = 1;
21510- mce_chrdev_open_count++;
21511+ local_inc(&mce_chrdev_open_count);
21512
21513 spin_unlock(&mce_chrdev_state_lock);
21514
21515@@ -1743,7 +1746,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21516 {
21517 spin_lock(&mce_chrdev_state_lock);
21518
21519- mce_chrdev_open_count--;
21520+ local_dec(&mce_chrdev_open_count);
21521 mce_chrdev_open_exclu = 0;
21522
21523 spin_unlock(&mce_chrdev_state_lock);
21524@@ -2419,7 +2422,7 @@ static __init void mce_init_banks(void)
21525
21526 for (i = 0; i < mca_cfg.banks; i++) {
21527 struct mce_bank *b = &mce_banks[i];
21528- struct device_attribute *a = &b->attr;
21529+ device_attribute_no_const *a = &b->attr;
21530
21531 sysfs_attr_init(&a->attr);
21532 a->attr.name = b->attrname;
21533@@ -2526,7 +2529,7 @@ struct dentry *mce_get_debugfs_dir(void)
21534 static void mce_reset(void)
21535 {
21536 cpu_missing = 0;
21537- atomic_set(&mce_fake_panicked, 0);
21538+ atomic_set_unchecked(&mce_fake_panicked, 0);
21539 atomic_set(&mce_executing, 0);
21540 atomic_set(&mce_callin, 0);
21541 atomic_set(&global_nwo, 0);
21542diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21543index 737b0ad..09ec66e 100644
21544--- a/arch/x86/kernel/cpu/mcheck/p5.c
21545+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21546@@ -12,6 +12,7 @@
21547 #include <asm/tlbflush.h>
21548 #include <asm/mce.h>
21549 #include <asm/msr.h>
21550+#include <asm/pgtable.h>
21551
21552 /* By default disabled */
21553 int mce_p5_enabled __read_mostly;
21554@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21555 if (!cpu_has(c, X86_FEATURE_MCE))
21556 return;
21557
21558+ pax_open_kernel();
21559 machine_check_vector = pentium_machine_check;
21560+ pax_close_kernel();
21561 /* Make sure the vector pointer is visible before we enable MCEs: */
21562 wmb();
21563
21564diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21565index 44f1382..315b292 100644
21566--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21567+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21568@@ -11,6 +11,7 @@
21569 #include <asm/tlbflush.h>
21570 #include <asm/mce.h>
21571 #include <asm/msr.h>
21572+#include <asm/pgtable.h>
21573
21574 /* Machine check handler for WinChip C6: */
21575 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21576@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21577 {
21578 u32 lo, hi;
21579
21580+ pax_open_kernel();
21581 machine_check_vector = winchip_machine_check;
21582+ pax_close_kernel();
21583 /* Make sure the vector pointer is visible before we enable MCEs: */
21584 wmb();
21585
21586diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21587index 36a8361..e7058c2 100644
21588--- a/arch/x86/kernel/cpu/microcode/core.c
21589+++ b/arch/x86/kernel/cpu/microcode/core.c
21590@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21591 return NOTIFY_OK;
21592 }
21593
21594-static struct notifier_block __refdata mc_cpu_notifier = {
21595+static struct notifier_block mc_cpu_notifier = {
21596 .notifier_call = mc_cpu_callback,
21597 };
21598
21599diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21600index a41bead..4e3685b 100644
21601--- a/arch/x86/kernel/cpu/microcode/intel.c
21602+++ b/arch/x86/kernel/cpu/microcode/intel.c
21603@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21604
21605 static int get_ucode_user(void *to, const void *from, size_t n)
21606 {
21607- return copy_from_user(to, from, n);
21608+ return copy_from_user(to, (const void __force_user *)from, n);
21609 }
21610
21611 static enum ucode_state
21612 request_microcode_user(int cpu, const void __user *buf, size_t size)
21613 {
21614- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21615+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21616 }
21617
21618 static void microcode_fini_cpu(int cpu)
21619diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21620index ea5f363..cb0e905 100644
21621--- a/arch/x86/kernel/cpu/mtrr/main.c
21622+++ b/arch/x86/kernel/cpu/mtrr/main.c
21623@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21624 u64 size_or_mask, size_and_mask;
21625 static bool mtrr_aps_delayed_init;
21626
21627-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21628+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21629
21630 const struct mtrr_ops *mtrr_if;
21631
21632diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21633index df5e41f..816c719 100644
21634--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21635+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21636@@ -25,7 +25,7 @@ struct mtrr_ops {
21637 int (*validate_add_page)(unsigned long base, unsigned long size,
21638 unsigned int type);
21639 int (*have_wrcomb)(void);
21640-};
21641+} __do_const;
21642
21643 extern int generic_get_free_region(unsigned long base, unsigned long size,
21644 int replace_reg);
21645diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21646index aa4e3a7..469370f 100644
21647--- a/arch/x86/kernel/cpu/perf_event.c
21648+++ b/arch/x86/kernel/cpu/perf_event.c
21649@@ -1509,7 +1509,7 @@ static void __init pmu_check_apic(void)
21650
21651 }
21652
21653-static struct attribute_group x86_pmu_format_group = {
21654+static attribute_group_no_const x86_pmu_format_group = {
21655 .name = "format",
21656 .attrs = NULL,
21657 };
21658@@ -1608,7 +1608,7 @@ static struct attribute *events_attr[] = {
21659 NULL,
21660 };
21661
21662-static struct attribute_group x86_pmu_events_group = {
21663+static attribute_group_no_const x86_pmu_events_group = {
21664 .name = "events",
21665 .attrs = events_attr,
21666 };
21667@@ -2181,7 +2181,7 @@ static unsigned long get_segment_base(unsigned int segment)
21668 if (idx > GDT_ENTRIES)
21669 return 0;
21670
21671- desc = raw_cpu_ptr(gdt_page.gdt);
21672+ desc = get_cpu_gdt_table(smp_processor_id());
21673 }
21674
21675 return get_desc_base(desc + idx);
21676@@ -2271,7 +2271,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21677 break;
21678
21679 perf_callchain_store(entry, frame.return_address);
21680- fp = frame.next_frame;
21681+ fp = (const void __force_user *)frame.next_frame;
21682 }
21683 }
21684
21685diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21686index 97242a9..cf9c30e 100644
21687--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21688+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21689@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21690 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21691 {
21692 struct attribute **attrs;
21693- struct attribute_group *attr_group;
21694+ attribute_group_no_const *attr_group;
21695 int i = 0, j;
21696
21697 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21698diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21699index 2813ea0..3ef5969c8 100644
21700--- a/arch/x86/kernel/cpu/perf_event_intel.c
21701+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21702@@ -3033,10 +3033,10 @@ __init int intel_pmu_init(void)
21703 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21704
21705 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21706- u64 capabilities;
21707+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21708
21709- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21710- x86_pmu.intel_cap.capabilities = capabilities;
21711+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21712+ x86_pmu.intel_cap.capabilities = capabilities;
21713 }
21714
21715 intel_ds_init();
21716diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21717index 7795f3f..3535b76 100644
21718--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
21719+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21720@@ -252,7 +252,7 @@ static void bts_event_start(struct perf_event *event, int flags)
21721 __bts_event_start(event);
21722
21723 /* PMI handler: this counter is running and likely generating PMIs */
21724- ACCESS_ONCE(bts->started) = 1;
21725+ ACCESS_ONCE_RW(bts->started) = 1;
21726 }
21727
21728 static void __bts_event_stop(struct perf_event *event)
21729@@ -266,7 +266,7 @@ static void __bts_event_stop(struct perf_event *event)
21730 if (event->hw.state & PERF_HES_STOPPED)
21731 return;
21732
21733- ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED;
21734+ ACCESS_ONCE_RW(event->hw.state) |= PERF_HES_STOPPED;
21735 }
21736
21737 static void bts_event_stop(struct perf_event *event, int flags)
21738@@ -274,7 +274,7 @@ static void bts_event_stop(struct perf_event *event, int flags)
21739 struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
21740
21741 /* PMI handler: don't restart this counter */
21742- ACCESS_ONCE(bts->started) = 0;
21743+ ACCESS_ONCE_RW(bts->started) = 0;
21744
21745 __bts_event_stop(event);
21746
21747diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21748index e4d1b8b..2c6ffa0 100644
21749--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21750+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21751@@ -1352,7 +1352,9 @@ static int __init intel_cqm_init(void)
21752 goto out;
21753 }
21754
21755- event_attr_intel_cqm_llc_scale.event_str = str;
21756+ pax_open_kernel();
21757+ *(const char **)&event_attr_intel_cqm_llc_scale.event_str = str;
21758+ pax_close_kernel();
21759
21760 ret = intel_cqm_setup_rmid_cache();
21761 if (ret)
21762diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21763index 123ff1b..d53e500 100644
21764--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
21765+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21766@@ -116,16 +116,12 @@ static const struct attribute_group *pt_attr_groups[] = {
21767
21768 static int __init pt_pmu_hw_init(void)
21769 {
21770- struct dev_ext_attribute *de_attrs;
21771- struct attribute **attrs;
21772- size_t size;
21773- int ret;
21774+ static struct dev_ext_attribute de_attrs[ARRAY_SIZE(pt_caps)];
21775+ static struct attribute *attrs[ARRAY_SIZE(pt_caps)];
21776 long i;
21777
21778- attrs = NULL;
21779- ret = -ENODEV;
21780 if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))
21781- goto fail;
21782+ return -ENODEV;
21783
21784 for (i = 0; i < PT_CPUID_LEAVES; i++) {
21785 cpuid_count(20, i,
21786@@ -135,39 +131,25 @@ static int __init pt_pmu_hw_init(void)
21787 &pt_pmu.caps[CR_EDX + i*4]);
21788 }
21789
21790- ret = -ENOMEM;
21791- size = sizeof(struct attribute *) * (ARRAY_SIZE(pt_caps)+1);
21792- attrs = kzalloc(size, GFP_KERNEL);
21793- if (!attrs)
21794- goto fail;
21795-
21796- size = sizeof(struct dev_ext_attribute) * (ARRAY_SIZE(pt_caps)+1);
21797- de_attrs = kzalloc(size, GFP_KERNEL);
21798- if (!de_attrs)
21799- goto fail;
21800-
21801+ pax_open_kernel();
21802 for (i = 0; i < ARRAY_SIZE(pt_caps); i++) {
21803- struct dev_ext_attribute *de_attr = de_attrs + i;
21804+ struct dev_ext_attribute *de_attr = &de_attrs[i];
21805
21806- de_attr->attr.attr.name = pt_caps[i].name;
21807+ *(const char **)&de_attr->attr.attr.name = pt_caps[i].name;
21808
21809 sysfs_attr_init(&de_attr->attr.attr);
21810
21811- de_attr->attr.attr.mode = S_IRUGO;
21812- de_attr->attr.show = pt_cap_show;
21813- de_attr->var = (void *)i;
21814+ *(umode_t *)&de_attr->attr.attr.mode = S_IRUGO;
21815+ *(void **)&de_attr->attr.show = pt_cap_show;
21816+ *(void **)&de_attr->var = (void *)i;
21817
21818 attrs[i] = &de_attr->attr.attr;
21819 }
21820
21821- pt_cap_group.attrs = attrs;
21822+ *(struct attribute ***)&pt_cap_group.attrs = attrs;
21823+ pax_close_kernel();
21824
21825 return 0;
21826-
21827-fail:
21828- kfree(attrs);
21829-
21830- return ret;
21831 }
21832
21833 #define PT_CONFIG_MASK (RTIT_CTL_TSC_EN | RTIT_CTL_DISRETC)
21834@@ -928,7 +910,7 @@ static void pt_event_start(struct perf_event *event, int mode)
21835 return;
21836 }
21837
21838- ACCESS_ONCE(pt->handle_nmi) = 1;
21839+ ACCESS_ONCE_RW(pt->handle_nmi) = 1;
21840 event->hw.state = 0;
21841
21842 pt_config_buffer(buf->cur->table, buf->cur_idx,
21843@@ -945,7 +927,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
21844 * Protect against the PMI racing with disabling wrmsr,
21845 * see comment in intel_pt_interrupt().
21846 */
21847- ACCESS_ONCE(pt->handle_nmi) = 0;
21848+ ACCESS_ONCE_RW(pt->handle_nmi) = 0;
21849 pt_config_start(false);
21850
21851 if (event->hw.state == PERF_HES_STOPPED)
21852diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21853index 358c54a..f068235 100644
21854--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21855+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21856@@ -487,7 +487,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21857 NULL,
21858 };
21859
21860-static struct attribute_group rapl_pmu_events_group = {
21861+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21862 .name = "events",
21863 .attrs = NULL, /* patched at runtime */
21864 };
21865diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21866index 90b7c50..7863ae3 100644
21867--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21868+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21869@@ -732,7 +732,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21870 static int __init uncore_type_init(struct intel_uncore_type *type)
21871 {
21872 struct intel_uncore_pmu *pmus;
21873- struct attribute_group *attr_group;
21874+ attribute_group_no_const *attr_group;
21875 struct attribute **attrs;
21876 int i, j;
21877
21878diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21879index ceac8f5..a562de7 100644
21880--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21881+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21882@@ -115,7 +115,7 @@ struct intel_uncore_box {
21883 struct uncore_event_desc {
21884 struct kobj_attribute attr;
21885 const char *config;
21886-};
21887+} __do_const;
21888
21889 ssize_t uncore_event_show(struct kobject *kobj,
21890 struct kobj_attribute *attr, char *buf);
21891diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21892index 83741a7..bd3507d 100644
21893--- a/arch/x86/kernel/cpuid.c
21894+++ b/arch/x86/kernel/cpuid.c
21895@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21896 return notifier_from_errno(err);
21897 }
21898
21899-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21900+static struct notifier_block cpuid_class_cpu_notifier =
21901 {
21902 .notifier_call = cpuid_class_cpu_callback,
21903 };
21904diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21905index afa64ad..dce67dd 100644
21906--- a/arch/x86/kernel/crash_dump_64.c
21907+++ b/arch/x86/kernel/crash_dump_64.c
21908@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21909 return -ENOMEM;
21910
21911 if (userbuf) {
21912- if (copy_to_user(buf, vaddr + offset, csize)) {
21913+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21914 iounmap(vaddr);
21915 return -EFAULT;
21916 }
21917diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21918index f6dfd93..892ade4 100644
21919--- a/arch/x86/kernel/doublefault.c
21920+++ b/arch/x86/kernel/doublefault.c
21921@@ -12,7 +12,7 @@
21922
21923 #define DOUBLEFAULT_STACKSIZE (1024)
21924 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21925-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21926+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21927
21928 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21929
21930@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21931 unsigned long gdt, tss;
21932
21933 native_store_gdt(&gdt_desc);
21934- gdt = gdt_desc.address;
21935+ gdt = (unsigned long)gdt_desc.address;
21936
21937 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21938
21939@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21940 /* 0x2 bit is always set */
21941 .flags = X86_EFLAGS_SF | 0x2,
21942 .sp = STACK_START,
21943- .es = __USER_DS,
21944+ .es = __KERNEL_DS,
21945 .cs = __KERNEL_CS,
21946 .ss = __KERNEL_DS,
21947- .ds = __USER_DS,
21948+ .ds = __KERNEL_DS,
21949 .fs = __KERNEL_PERCPU,
21950
21951 .__cr3 = __pa_nodebug(swapper_pg_dir),
21952diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21953index 9c30acf..8cf2411 100644
21954--- a/arch/x86/kernel/dumpstack.c
21955+++ b/arch/x86/kernel/dumpstack.c
21956@@ -2,6 +2,9 @@
21957 * Copyright (C) 1991, 1992 Linus Torvalds
21958 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21959 */
21960+#ifdef CONFIG_GRKERNSEC_HIDESYM
21961+#define __INCLUDED_BY_HIDESYM 1
21962+#endif
21963 #include <linux/kallsyms.h>
21964 #include <linux/kprobes.h>
21965 #include <linux/uaccess.h>
21966@@ -35,23 +38,21 @@ static void printk_stack_address(unsigned long address, int reliable,
21967
21968 void printk_address(unsigned long address)
21969 {
21970- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21971+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21972 }
21973
21974 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21975 static void
21976 print_ftrace_graph_addr(unsigned long addr, void *data,
21977 const struct stacktrace_ops *ops,
21978- struct thread_info *tinfo, int *graph)
21979+ struct task_struct *task, int *graph)
21980 {
21981- struct task_struct *task;
21982 unsigned long ret_addr;
21983 int index;
21984
21985 if (addr != (unsigned long)return_to_handler)
21986 return;
21987
21988- task = tinfo->task;
21989 index = task->curr_ret_stack;
21990
21991 if (!task->ret_stack || index < *graph)
21992@@ -68,7 +69,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21993 static inline void
21994 print_ftrace_graph_addr(unsigned long addr, void *data,
21995 const struct stacktrace_ops *ops,
21996- struct thread_info *tinfo, int *graph)
21997+ struct task_struct *task, int *graph)
21998 { }
21999 #endif
22000
22001@@ -79,10 +80,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22002 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
22003 */
22004
22005-static inline int valid_stack_ptr(struct thread_info *tinfo,
22006- void *p, unsigned int size, void *end)
22007+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
22008 {
22009- void *t = tinfo;
22010 if (end) {
22011 if (p < end && p >= (end-THREAD_SIZE))
22012 return 1;
22013@@ -93,14 +92,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
22014 }
22015
22016 unsigned long
22017-print_context_stack(struct thread_info *tinfo,
22018+print_context_stack(struct task_struct *task, void *stack_start,
22019 unsigned long *stack, unsigned long bp,
22020 const struct stacktrace_ops *ops, void *data,
22021 unsigned long *end, int *graph)
22022 {
22023 struct stack_frame *frame = (struct stack_frame *)bp;
22024
22025- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
22026+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
22027 unsigned long addr;
22028
22029 addr = *stack;
22030@@ -112,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
22031 } else {
22032 ops->address(data, addr, 0);
22033 }
22034- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22035+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22036 }
22037 stack++;
22038 }
22039@@ -121,7 +120,7 @@ print_context_stack(struct thread_info *tinfo,
22040 EXPORT_SYMBOL_GPL(print_context_stack);
22041
22042 unsigned long
22043-print_context_stack_bp(struct thread_info *tinfo,
22044+print_context_stack_bp(struct task_struct *task, void *stack_start,
22045 unsigned long *stack, unsigned long bp,
22046 const struct stacktrace_ops *ops, void *data,
22047 unsigned long *end, int *graph)
22048@@ -129,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22049 struct stack_frame *frame = (struct stack_frame *)bp;
22050 unsigned long *ret_addr = &frame->return_address;
22051
22052- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22053+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22054 unsigned long addr = *ret_addr;
22055
22056 if (!__kernel_text_address(addr))
22057@@ -138,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22058 ops->address(data, addr, 1);
22059 frame = frame->next_frame;
22060 ret_addr = &frame->return_address;
22061- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22062+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22063 }
22064
22065 return (unsigned long)frame;
22066@@ -226,6 +225,8 @@ unsigned long oops_begin(void)
22067 EXPORT_SYMBOL_GPL(oops_begin);
22068 NOKPROBE_SYMBOL(oops_begin);
22069
22070+extern void gr_handle_kernel_exploit(void);
22071+
22072 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22073 {
22074 if (regs && kexec_should_crash(current))
22075@@ -247,7 +248,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22076 panic("Fatal exception in interrupt");
22077 if (panic_on_oops)
22078 panic("Fatal exception");
22079- do_exit(signr);
22080+
22081+ gr_handle_kernel_exploit();
22082+
22083+ do_group_exit(signr);
22084 }
22085 NOKPROBE_SYMBOL(oops_end);
22086
22087diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22088index 464ffd6..01f2cda 100644
22089--- a/arch/x86/kernel/dumpstack_32.c
22090+++ b/arch/x86/kernel/dumpstack_32.c
22091@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22092 bp = stack_frame(task, regs);
22093
22094 for (;;) {
22095- struct thread_info *context;
22096+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22097 void *end_stack;
22098
22099 end_stack = is_hardirq_stack(stack, cpu);
22100 if (!end_stack)
22101 end_stack = is_softirq_stack(stack, cpu);
22102
22103- context = task_thread_info(task);
22104- bp = ops->walk_stack(context, stack, bp, ops, data,
22105+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22106 end_stack, &graph);
22107
22108 /* Stop if not on irq stack */
22109@@ -137,16 +136,17 @@ void show_regs(struct pt_regs *regs)
22110 unsigned int code_len = code_bytes;
22111 unsigned char c;
22112 u8 *ip;
22113+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22114
22115 pr_emerg("Stack:\n");
22116 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22117
22118 pr_emerg("Code:");
22119
22120- ip = (u8 *)regs->ip - code_prologue;
22121+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22122 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22123 /* try starting at IP */
22124- ip = (u8 *)regs->ip;
22125+ ip = (u8 *)regs->ip + cs_base;
22126 code_len = code_len - code_prologue + 1;
22127 }
22128 for (i = 0; i < code_len; i++, ip++) {
22129@@ -155,7 +155,7 @@ void show_regs(struct pt_regs *regs)
22130 pr_cont(" Bad EIP value.");
22131 break;
22132 }
22133- if (ip == (u8 *)regs->ip)
22134+ if (ip == (u8 *)regs->ip + cs_base)
22135 pr_cont(" <%02x>", c);
22136 else
22137 pr_cont(" %02x", c);
22138@@ -168,6 +168,7 @@ int is_valid_bugaddr(unsigned long ip)
22139 {
22140 unsigned short ud2;
22141
22142+ ip = ktla_ktva(ip);
22143 if (ip < PAGE_OFFSET)
22144 return 0;
22145 if (probe_kernel_address((unsigned short *)ip, ud2))
22146@@ -175,3 +176,15 @@ int is_valid_bugaddr(unsigned long ip)
22147
22148 return ud2 == 0x0b0f;
22149 }
22150+
22151+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22152+void __used pax_check_alloca(unsigned long size)
22153+{
22154+ unsigned long sp = (unsigned long)&sp, stack_left;
22155+
22156+ /* all kernel stacks are of the same size */
22157+ stack_left = sp & (THREAD_SIZE - 1);
22158+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22159+}
22160+EXPORT_SYMBOL(pax_check_alloca);
22161+#endif
22162diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22163index 5f1c626..1cba97e 100644
22164--- a/arch/x86/kernel/dumpstack_64.c
22165+++ b/arch/x86/kernel/dumpstack_64.c
22166@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22167 const struct stacktrace_ops *ops, void *data)
22168 {
22169 const unsigned cpu = get_cpu();
22170- struct thread_info *tinfo;
22171 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22172 unsigned long dummy;
22173 unsigned used = 0;
22174 int graph = 0;
22175 int done = 0;
22176+ void *stack_start;
22177
22178 if (!task)
22179 task = current;
22180@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22181 * current stack address. If the stacks consist of nested
22182 * exceptions
22183 */
22184- tinfo = task_thread_info(task);
22185 while (!done) {
22186 unsigned long *stack_end;
22187 enum stack_type stype;
22188@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22189 if (ops->stack(data, id) < 0)
22190 break;
22191
22192- bp = ops->walk_stack(tinfo, stack, bp, ops,
22193+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22194 data, stack_end, &graph);
22195 ops->stack(data, "<EOE>");
22196 /*
22197@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22198 * second-to-last pointer (index -2 to end) in the
22199 * exception stack:
22200 */
22201+ if ((u16)stack_end[-1] != __KERNEL_DS)
22202+ goto out;
22203 stack = (unsigned long *) stack_end[-2];
22204 done = 0;
22205 break;
22206@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22207
22208 if (ops->stack(data, "IRQ") < 0)
22209 break;
22210- bp = ops->walk_stack(tinfo, stack, bp,
22211+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22212 ops, data, stack_end, &graph);
22213 /*
22214 * We link to the next stack (which would be
22215@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22216 /*
22217 * This handles the process stack:
22218 */
22219- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22220+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22221+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22222+out:
22223 put_cpu();
22224 }
22225 EXPORT_SYMBOL(dump_trace);
22226@@ -347,8 +350,55 @@ int is_valid_bugaddr(unsigned long ip)
22227 {
22228 unsigned short ud2;
22229
22230- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22231+ if (probe_kernel_address((unsigned short *)ip, ud2))
22232 return 0;
22233
22234 return ud2 == 0x0b0f;
22235 }
22236+
22237+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22238+void __used pax_check_alloca(unsigned long size)
22239+{
22240+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22241+ unsigned cpu, used;
22242+ char *id;
22243+
22244+ /* check the process stack first */
22245+ stack_start = (unsigned long)task_stack_page(current);
22246+ stack_end = stack_start + THREAD_SIZE;
22247+ if (likely(stack_start <= sp && sp < stack_end)) {
22248+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22249+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22250+ return;
22251+ }
22252+
22253+ cpu = get_cpu();
22254+
22255+ /* check the irq stacks */
22256+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22257+ stack_start = stack_end - IRQ_STACK_SIZE;
22258+ if (stack_start <= sp && sp < stack_end) {
22259+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22260+ put_cpu();
22261+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22262+ return;
22263+ }
22264+
22265+ /* check the exception stacks */
22266+ used = 0;
22267+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22268+ stack_start = stack_end - EXCEPTION_STKSZ;
22269+ if (stack_end && stack_start <= sp && sp < stack_end) {
22270+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22271+ put_cpu();
22272+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22273+ return;
22274+ }
22275+
22276+ put_cpu();
22277+
22278+ /* unknown stack */
22279+ BUG();
22280+}
22281+EXPORT_SYMBOL(pax_check_alloca);
22282+#endif
22283diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22284index e2ce85d..00ccad0 100644
22285--- a/arch/x86/kernel/e820.c
22286+++ b/arch/x86/kernel/e820.c
22287@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22288
22289 static void early_panic(char *msg)
22290 {
22291- early_printk(msg);
22292- panic(msg);
22293+ early_printk("%s", msg);
22294+ panic("%s", msg);
22295 }
22296
22297 static int userdef __initdata;
22298diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22299index 89427d8..00c0d52 100644
22300--- a/arch/x86/kernel/early_printk.c
22301+++ b/arch/x86/kernel/early_printk.c
22302@@ -7,6 +7,7 @@
22303 #include <linux/pci_regs.h>
22304 #include <linux/pci_ids.h>
22305 #include <linux/errno.h>
22306+#include <linux/sched.h>
22307 #include <asm/io.h>
22308 #include <asm/processor.h>
22309 #include <asm/fcntl.h>
22310diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22311index 1c30976..71b41b9 100644
22312--- a/arch/x86/kernel/entry_32.S
22313+++ b/arch/x86/kernel/entry_32.S
22314@@ -177,13 +177,154 @@
22315 /*CFI_REL_OFFSET gs, PT_GS*/
22316 .endm
22317 .macro SET_KERNEL_GS reg
22318+
22319+#ifdef CONFIG_CC_STACKPROTECTOR
22320 movl $(__KERNEL_STACK_CANARY), \reg
22321+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22322+ movl $(__USER_DS), \reg
22323+#else
22324+ xorl \reg, \reg
22325+#endif
22326+
22327 movl \reg, %gs
22328 .endm
22329
22330 #endif /* CONFIG_X86_32_LAZY_GS */
22331
22332-.macro SAVE_ALL
22333+.macro pax_enter_kernel
22334+#ifdef CONFIG_PAX_KERNEXEC
22335+ call pax_enter_kernel
22336+#endif
22337+.endm
22338+
22339+.macro pax_exit_kernel
22340+#ifdef CONFIG_PAX_KERNEXEC
22341+ call pax_exit_kernel
22342+#endif
22343+.endm
22344+
22345+#ifdef CONFIG_PAX_KERNEXEC
22346+ENTRY(pax_enter_kernel)
22347+#ifdef CONFIG_PARAVIRT
22348+ pushl %eax
22349+ pushl %ecx
22350+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22351+ mov %eax, %esi
22352+#else
22353+ mov %cr0, %esi
22354+#endif
22355+ bts $X86_CR0_WP_BIT, %esi
22356+ jnc 1f
22357+ mov %cs, %esi
22358+ cmp $__KERNEL_CS, %esi
22359+ jz 3f
22360+ ljmp $__KERNEL_CS, $3f
22361+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22362+2:
22363+#ifdef CONFIG_PARAVIRT
22364+ mov %esi, %eax
22365+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22366+#else
22367+ mov %esi, %cr0
22368+#endif
22369+3:
22370+#ifdef CONFIG_PARAVIRT
22371+ popl %ecx
22372+ popl %eax
22373+#endif
22374+ ret
22375+ENDPROC(pax_enter_kernel)
22376+
22377+ENTRY(pax_exit_kernel)
22378+#ifdef CONFIG_PARAVIRT
22379+ pushl %eax
22380+ pushl %ecx
22381+#endif
22382+ mov %cs, %esi
22383+ cmp $__KERNEXEC_KERNEL_CS, %esi
22384+ jnz 2f
22385+#ifdef CONFIG_PARAVIRT
22386+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22387+ mov %eax, %esi
22388+#else
22389+ mov %cr0, %esi
22390+#endif
22391+ btr $X86_CR0_WP_BIT, %esi
22392+ ljmp $__KERNEL_CS, $1f
22393+1:
22394+#ifdef CONFIG_PARAVIRT
22395+ mov %esi, %eax
22396+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22397+#else
22398+ mov %esi, %cr0
22399+#endif
22400+2:
22401+#ifdef CONFIG_PARAVIRT
22402+ popl %ecx
22403+ popl %eax
22404+#endif
22405+ ret
22406+ENDPROC(pax_exit_kernel)
22407+#endif
22408+
22409+ .macro pax_erase_kstack
22410+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22411+ call pax_erase_kstack
22412+#endif
22413+ .endm
22414+
22415+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22416+/*
22417+ * ebp: thread_info
22418+ */
22419+ENTRY(pax_erase_kstack)
22420+ pushl %edi
22421+ pushl %ecx
22422+ pushl %eax
22423+
22424+ mov TI_lowest_stack(%ebp), %edi
22425+ mov $-0xBEEF, %eax
22426+ std
22427+
22428+1: mov %edi, %ecx
22429+ and $THREAD_SIZE_asm - 1, %ecx
22430+ shr $2, %ecx
22431+ repne scasl
22432+ jecxz 2f
22433+
22434+ cmp $2*16, %ecx
22435+ jc 2f
22436+
22437+ mov $2*16, %ecx
22438+ repe scasl
22439+ jecxz 2f
22440+ jne 1b
22441+
22442+2: cld
22443+ or $2*4, %edi
22444+ mov %esp, %ecx
22445+ sub %edi, %ecx
22446+
22447+ cmp $THREAD_SIZE_asm, %ecx
22448+ jb 3f
22449+ ud2
22450+3:
22451+
22452+ shr $2, %ecx
22453+ rep stosl
22454+
22455+ mov TI_task_thread_sp0(%ebp), %edi
22456+ sub $128, %edi
22457+ mov %edi, TI_lowest_stack(%ebp)
22458+
22459+ popl %eax
22460+ popl %ecx
22461+ popl %edi
22462+ ret
22463+ENDPROC(pax_erase_kstack)
22464+#endif
22465+
22466+.macro __SAVE_ALL _DS
22467 cld
22468 PUSH_GS
22469 pushl_cfi %fs
22470@@ -206,7 +347,7 @@
22471 CFI_REL_OFFSET ecx, 0
22472 pushl_cfi %ebx
22473 CFI_REL_OFFSET ebx, 0
22474- movl $(__USER_DS), %edx
22475+ movl $\_DS, %edx
22476 movl %edx, %ds
22477 movl %edx, %es
22478 movl $(__KERNEL_PERCPU), %edx
22479@@ -214,6 +355,15 @@
22480 SET_KERNEL_GS %edx
22481 .endm
22482
22483+.macro SAVE_ALL
22484+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22485+ __SAVE_ALL __KERNEL_DS
22486+ pax_enter_kernel
22487+#else
22488+ __SAVE_ALL __USER_DS
22489+#endif
22490+.endm
22491+
22492 .macro RESTORE_INT_REGS
22493 popl_cfi %ebx
22494 CFI_RESTORE ebx
22495@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22496 popfl_cfi
22497 jmp syscall_exit
22498 CFI_ENDPROC
22499-END(ret_from_fork)
22500+ENDPROC(ret_from_fork)
22501
22502 ENTRY(ret_from_kernel_thread)
22503 CFI_STARTPROC
22504@@ -340,7 +490,15 @@ ret_from_intr:
22505 andl $SEGMENT_RPL_MASK, %eax
22506 #endif
22507 cmpl $USER_RPL, %eax
22508+
22509+#ifdef CONFIG_PAX_KERNEXEC
22510+ jae resume_userspace
22511+
22512+ pax_exit_kernel
22513+ jmp resume_kernel
22514+#else
22515 jb resume_kernel # not returning to v8086 or userspace
22516+#endif
22517
22518 ENTRY(resume_userspace)
22519 LOCKDEP_SYS_EXIT
22520@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22521 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22522 # int/exception return?
22523 jne work_pending
22524- jmp restore_all
22525-END(ret_from_exception)
22526+ jmp restore_all_pax
22527+ENDPROC(ret_from_exception)
22528
22529 #ifdef CONFIG_PREEMPT
22530 ENTRY(resume_kernel)
22531@@ -365,7 +523,7 @@ need_resched:
22532 jz restore_all
22533 call preempt_schedule_irq
22534 jmp need_resched
22535-END(resume_kernel)
22536+ENDPROC(resume_kernel)
22537 #endif
22538 CFI_ENDPROC
22539
22540@@ -395,33 +553,45 @@ sysenter_past_esp:
22541 /*CFI_REL_OFFSET cs, 0*/
22542 /*
22543 * Push current_thread_info()->sysenter_return to the stack.
22544- * A tiny bit of offset fixup is necessary: TI_sysenter_return
22545- * is relative to thread_info, which is at the bottom of the
22546- * kernel stack page. 4*4 means the 4 words pushed above;
22547- * TOP_OF_KERNEL_STACK_PADDING takes us to the top of the stack;
22548- * and THREAD_SIZE takes us to the bottom.
22549 */
22550- pushl_cfi ((TI_sysenter_return) - THREAD_SIZE + TOP_OF_KERNEL_STACK_PADDING + 4*4)(%esp)
22551+ pushl_cfi $0
22552 CFI_REL_OFFSET eip, 0
22553
22554 pushl_cfi %eax
22555 SAVE_ALL
22556+ GET_THREAD_INFO(%ebp)
22557+ movl TI_sysenter_return(%ebp),%ebp
22558+ movl %ebp,PT_EIP(%esp)
22559 ENABLE_INTERRUPTS(CLBR_NONE)
22560
22561 /*
22562 * Load the potential sixth argument from user stack.
22563 * Careful about security.
22564 */
22565+ movl PT_OLDESP(%esp),%ebp
22566+
22567+#ifdef CONFIG_PAX_MEMORY_UDEREF
22568+ mov PT_OLDSS(%esp),%ds
22569+1: movl %ds:(%ebp),%ebp
22570+ push %ss
22571+ pop %ds
22572+#else
22573 cmpl $__PAGE_OFFSET-3,%ebp
22574 jae syscall_fault
22575 ASM_STAC
22576 1: movl (%ebp),%ebp
22577 ASM_CLAC
22578+#endif
22579+
22580 movl %ebp,PT_EBP(%esp)
22581 _ASM_EXTABLE(1b,syscall_fault)
22582
22583 GET_THREAD_INFO(%ebp)
22584
22585+#ifdef CONFIG_PAX_RANDKSTACK
22586+ pax_erase_kstack
22587+#endif
22588+
22589 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22590 jnz sysenter_audit
22591 sysenter_do_call:
22592@@ -437,12 +607,24 @@ sysenter_after_call:
22593 testl $_TIF_ALLWORK_MASK, %ecx
22594 jnz sysexit_audit
22595 sysenter_exit:
22596+
22597+#ifdef CONFIG_PAX_RANDKSTACK
22598+ pushl_cfi %eax
22599+ movl %esp, %eax
22600+ call pax_randomize_kstack
22601+ popl_cfi %eax
22602+#endif
22603+
22604+ pax_erase_kstack
22605+
22606 /* if something modifies registers it must also disable sysexit */
22607 movl PT_EIP(%esp), %edx
22608 movl PT_OLDESP(%esp), %ecx
22609 xorl %ebp,%ebp
22610 TRACE_IRQS_ON
22611 1: mov PT_FS(%esp), %fs
22612+2: mov PT_DS(%esp), %ds
22613+3: mov PT_ES(%esp), %es
22614 PTGS_TO_GS
22615 ENABLE_INTERRUPTS_SYSEXIT
22616
22617@@ -456,6 +638,9 @@ sysenter_audit:
22618 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22619 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22620 call __audit_syscall_entry
22621+
22622+ pax_erase_kstack
22623+
22624 popl_cfi %ecx /* get that remapped edx off the stack */
22625 popl_cfi %ecx /* get that remapped esi off the stack */
22626 movl PT_EAX(%esp),%eax /* reload syscall number */
22627@@ -482,10 +667,16 @@ sysexit_audit:
22628
22629 CFI_ENDPROC
22630 .pushsection .fixup,"ax"
22631-2: movl $0,PT_FS(%esp)
22632+4: movl $0,PT_FS(%esp)
22633+ jmp 1b
22634+5: movl $0,PT_DS(%esp)
22635+ jmp 1b
22636+6: movl $0,PT_ES(%esp)
22637 jmp 1b
22638 .popsection
22639- _ASM_EXTABLE(1b,2b)
22640+ _ASM_EXTABLE(1b,4b)
22641+ _ASM_EXTABLE(2b,5b)
22642+ _ASM_EXTABLE(3b,6b)
22643 PTGS_TO_GS_EX
22644 ENDPROC(ia32_sysenter_target)
22645
22646@@ -496,6 +687,11 @@ ENTRY(system_call)
22647 pushl_cfi %eax # save orig_eax
22648 SAVE_ALL
22649 GET_THREAD_INFO(%ebp)
22650+
22651+#ifdef CONFIG_PAX_RANDKSTACK
22652+ pax_erase_kstack
22653+#endif
22654+
22655 # system call tracing in operation / emulation
22656 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22657 jnz syscall_trace_entry
22658@@ -515,6 +711,15 @@ syscall_exit:
22659 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22660 jnz syscall_exit_work
22661
22662+restore_all_pax:
22663+
22664+#ifdef CONFIG_PAX_RANDKSTACK
22665+ movl %esp, %eax
22666+ call pax_randomize_kstack
22667+#endif
22668+
22669+ pax_erase_kstack
22670+
22671 restore_all:
22672 TRACE_IRQS_IRET
22673 restore_all_notrace:
22674@@ -569,14 +774,34 @@ ldt_ss:
22675 * compensating for the offset by changing to the ESPFIX segment with
22676 * a base address that matches for the difference.
22677 */
22678-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22679+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22680 mov %esp, %edx /* load kernel esp */
22681 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22682 mov %dx, %ax /* eax: new kernel esp */
22683 sub %eax, %edx /* offset (low word is 0) */
22684+#ifdef CONFIG_SMP
22685+ movl PER_CPU_VAR(cpu_number), %ebx
22686+ shll $PAGE_SHIFT_asm, %ebx
22687+ addl $cpu_gdt_table, %ebx
22688+#else
22689+ movl $cpu_gdt_table, %ebx
22690+#endif
22691 shr $16, %edx
22692- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22693- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22694+
22695+#ifdef CONFIG_PAX_KERNEXEC
22696+ mov %cr0, %esi
22697+ btr $X86_CR0_WP_BIT, %esi
22698+ mov %esi, %cr0
22699+#endif
22700+
22701+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22702+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22703+
22704+#ifdef CONFIG_PAX_KERNEXEC
22705+ bts $X86_CR0_WP_BIT, %esi
22706+ mov %esi, %cr0
22707+#endif
22708+
22709 pushl_cfi $__ESPFIX_SS
22710 pushl_cfi %eax /* new kernel esp */
22711 /* Disable interrupts, but do not irqtrace this section: we
22712@@ -606,20 +831,18 @@ work_resched:
22713 movl TI_flags(%ebp), %ecx
22714 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22715 # than syscall tracing?
22716- jz restore_all
22717+ jz restore_all_pax
22718 testb $_TIF_NEED_RESCHED, %cl
22719 jnz work_resched
22720
22721 work_notifysig: # deal with pending signals and
22722 # notify-resume requests
22723+ movl %esp, %eax
22724 #ifdef CONFIG_VM86
22725 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22726- movl %esp, %eax
22727 jnz work_notifysig_v86 # returning to kernel-space or
22728 # vm86-space
22729 1:
22730-#else
22731- movl %esp, %eax
22732 #endif
22733 TRACE_IRQS_ON
22734 ENABLE_INTERRUPTS(CLBR_NONE)
22735@@ -640,7 +863,7 @@ work_notifysig_v86:
22736 movl %eax, %esp
22737 jmp 1b
22738 #endif
22739-END(work_pending)
22740+ENDPROC(work_pending)
22741
22742 # perform syscall exit tracing
22743 ALIGN
22744@@ -648,11 +871,14 @@ syscall_trace_entry:
22745 movl $-ENOSYS,PT_EAX(%esp)
22746 movl %esp, %eax
22747 call syscall_trace_enter
22748+
22749+ pax_erase_kstack
22750+
22751 /* What it returned is what we'll actually use. */
22752 cmpl $(NR_syscalls), %eax
22753 jnae syscall_call
22754 jmp syscall_exit
22755-END(syscall_trace_entry)
22756+ENDPROC(syscall_trace_entry)
22757
22758 # perform syscall exit tracing
22759 ALIGN
22760@@ -665,26 +891,30 @@ syscall_exit_work:
22761 movl %esp, %eax
22762 call syscall_trace_leave
22763 jmp resume_userspace
22764-END(syscall_exit_work)
22765+ENDPROC(syscall_exit_work)
22766 CFI_ENDPROC
22767
22768 RING0_INT_FRAME # can't unwind into user space anyway
22769 syscall_fault:
22770+#ifdef CONFIG_PAX_MEMORY_UDEREF
22771+ push %ss
22772+ pop %ds
22773+#endif
22774 ASM_CLAC
22775 GET_THREAD_INFO(%ebp)
22776 movl $-EFAULT,PT_EAX(%esp)
22777 jmp resume_userspace
22778-END(syscall_fault)
22779+ENDPROC(syscall_fault)
22780
22781 syscall_badsys:
22782 movl $-ENOSYS,%eax
22783 jmp syscall_after_call
22784-END(syscall_badsys)
22785+ENDPROC(syscall_badsys)
22786
22787 sysenter_badsys:
22788 movl $-ENOSYS,%eax
22789 jmp sysenter_after_call
22790-END(sysenter_badsys)
22791+ENDPROC(sysenter_badsys)
22792 CFI_ENDPROC
22793
22794 .macro FIXUP_ESPFIX_STACK
22795@@ -697,8 +927,15 @@ END(sysenter_badsys)
22796 */
22797 #ifdef CONFIG_X86_ESPFIX32
22798 /* fixup the stack */
22799- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22800- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22801+#ifdef CONFIG_SMP
22802+ movl PER_CPU_VAR(cpu_number), %ebx
22803+ shll $PAGE_SHIFT_asm, %ebx
22804+ addl $cpu_gdt_table, %ebx
22805+#else
22806+ movl $cpu_gdt_table, %ebx
22807+#endif
22808+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22809+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22810 shl $16, %eax
22811 addl %esp, %eax /* the adjusted stack pointer */
22812 pushl_cfi $__KERNEL_DS
22813@@ -737,7 +974,7 @@ ENTRY(irq_entries_start)
22814 CFI_ADJUST_CFA_OFFSET -4
22815 .align 8
22816 .endr
22817-END(irq_entries_start)
22818+ENDPROC(irq_entries_start)
22819
22820 /*
22821 * the CPU automatically disables interrupts when executing an IRQ vector,
22822@@ -790,7 +1027,7 @@ ENTRY(coprocessor_error)
22823 pushl_cfi $do_coprocessor_error
22824 jmp error_code
22825 CFI_ENDPROC
22826-END(coprocessor_error)
22827+ENDPROC(coprocessor_error)
22828
22829 ENTRY(simd_coprocessor_error)
22830 RING0_INT_FRAME
22831@@ -806,7 +1043,7 @@ ENTRY(simd_coprocessor_error)
22832 #endif
22833 jmp error_code
22834 CFI_ENDPROC
22835-END(simd_coprocessor_error)
22836+ENDPROC(simd_coprocessor_error)
22837
22838 ENTRY(device_not_available)
22839 RING0_INT_FRAME
22840@@ -815,18 +1052,18 @@ ENTRY(device_not_available)
22841 pushl_cfi $do_device_not_available
22842 jmp error_code
22843 CFI_ENDPROC
22844-END(device_not_available)
22845+ENDPROC(device_not_available)
22846
22847 #ifdef CONFIG_PARAVIRT
22848 ENTRY(native_iret)
22849 iret
22850 _ASM_EXTABLE(native_iret, iret_exc)
22851-END(native_iret)
22852+ENDPROC(native_iret)
22853
22854 ENTRY(native_irq_enable_sysexit)
22855 sti
22856 sysexit
22857-END(native_irq_enable_sysexit)
22858+ENDPROC(native_irq_enable_sysexit)
22859 #endif
22860
22861 ENTRY(overflow)
22862@@ -836,7 +1073,7 @@ ENTRY(overflow)
22863 pushl_cfi $do_overflow
22864 jmp error_code
22865 CFI_ENDPROC
22866-END(overflow)
22867+ENDPROC(overflow)
22868
22869 ENTRY(bounds)
22870 RING0_INT_FRAME
22871@@ -845,7 +1082,7 @@ ENTRY(bounds)
22872 pushl_cfi $do_bounds
22873 jmp error_code
22874 CFI_ENDPROC
22875-END(bounds)
22876+ENDPROC(bounds)
22877
22878 ENTRY(invalid_op)
22879 RING0_INT_FRAME
22880@@ -854,7 +1091,7 @@ ENTRY(invalid_op)
22881 pushl_cfi $do_invalid_op
22882 jmp error_code
22883 CFI_ENDPROC
22884-END(invalid_op)
22885+ENDPROC(invalid_op)
22886
22887 ENTRY(coprocessor_segment_overrun)
22888 RING0_INT_FRAME
22889@@ -863,7 +1100,7 @@ ENTRY(coprocessor_segment_overrun)
22890 pushl_cfi $do_coprocessor_segment_overrun
22891 jmp error_code
22892 CFI_ENDPROC
22893-END(coprocessor_segment_overrun)
22894+ENDPROC(coprocessor_segment_overrun)
22895
22896 ENTRY(invalid_TSS)
22897 RING0_EC_FRAME
22898@@ -871,7 +1108,7 @@ ENTRY(invalid_TSS)
22899 pushl_cfi $do_invalid_TSS
22900 jmp error_code
22901 CFI_ENDPROC
22902-END(invalid_TSS)
22903+ENDPROC(invalid_TSS)
22904
22905 ENTRY(segment_not_present)
22906 RING0_EC_FRAME
22907@@ -879,7 +1116,7 @@ ENTRY(segment_not_present)
22908 pushl_cfi $do_segment_not_present
22909 jmp error_code
22910 CFI_ENDPROC
22911-END(segment_not_present)
22912+ENDPROC(segment_not_present)
22913
22914 ENTRY(stack_segment)
22915 RING0_EC_FRAME
22916@@ -887,7 +1124,7 @@ ENTRY(stack_segment)
22917 pushl_cfi $do_stack_segment
22918 jmp error_code
22919 CFI_ENDPROC
22920-END(stack_segment)
22921+ENDPROC(stack_segment)
22922
22923 ENTRY(alignment_check)
22924 RING0_EC_FRAME
22925@@ -895,7 +1132,7 @@ ENTRY(alignment_check)
22926 pushl_cfi $do_alignment_check
22927 jmp error_code
22928 CFI_ENDPROC
22929-END(alignment_check)
22930+ENDPROC(alignment_check)
22931
22932 ENTRY(divide_error)
22933 RING0_INT_FRAME
22934@@ -904,7 +1141,7 @@ ENTRY(divide_error)
22935 pushl_cfi $do_divide_error
22936 jmp error_code
22937 CFI_ENDPROC
22938-END(divide_error)
22939+ENDPROC(divide_error)
22940
22941 #ifdef CONFIG_X86_MCE
22942 ENTRY(machine_check)
22943@@ -914,7 +1151,7 @@ ENTRY(machine_check)
22944 pushl_cfi machine_check_vector
22945 jmp error_code
22946 CFI_ENDPROC
22947-END(machine_check)
22948+ENDPROC(machine_check)
22949 #endif
22950
22951 ENTRY(spurious_interrupt_bug)
22952@@ -924,7 +1161,7 @@ ENTRY(spurious_interrupt_bug)
22953 pushl_cfi $do_spurious_interrupt_bug
22954 jmp error_code
22955 CFI_ENDPROC
22956-END(spurious_interrupt_bug)
22957+ENDPROC(spurious_interrupt_bug)
22958
22959 #ifdef CONFIG_XEN
22960 /* Xen doesn't set %esp to be precisely what the normal sysenter
22961@@ -1033,7 +1270,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22962
22963 ENTRY(mcount)
22964 ret
22965-END(mcount)
22966+ENDPROC(mcount)
22967
22968 ENTRY(ftrace_caller)
22969 pushl %eax
22970@@ -1063,7 +1300,7 @@ ftrace_graph_call:
22971 .globl ftrace_stub
22972 ftrace_stub:
22973 ret
22974-END(ftrace_caller)
22975+ENDPROC(ftrace_caller)
22976
22977 ENTRY(ftrace_regs_caller)
22978 pushf /* push flags before compare (in cs location) */
22979@@ -1161,7 +1398,7 @@ trace:
22980 popl %ecx
22981 popl %eax
22982 jmp ftrace_stub
22983-END(mcount)
22984+ENDPROC(mcount)
22985 #endif /* CONFIG_DYNAMIC_FTRACE */
22986 #endif /* CONFIG_FUNCTION_TRACER */
22987
22988@@ -1179,7 +1416,7 @@ ENTRY(ftrace_graph_caller)
22989 popl %ecx
22990 popl %eax
22991 ret
22992-END(ftrace_graph_caller)
22993+ENDPROC(ftrace_graph_caller)
22994
22995 .globl return_to_handler
22996 return_to_handler:
22997@@ -1233,15 +1470,18 @@ error_code:
22998 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22999 REG_TO_PTGS %ecx
23000 SET_KERNEL_GS %ecx
23001- movl $(__USER_DS), %ecx
23002+ movl $(__KERNEL_DS), %ecx
23003 movl %ecx, %ds
23004 movl %ecx, %es
23005+
23006+ pax_enter_kernel
23007+
23008 TRACE_IRQS_OFF
23009 movl %esp,%eax # pt_regs pointer
23010 call *%edi
23011 jmp ret_from_exception
23012 CFI_ENDPROC
23013-END(page_fault)
23014+ENDPROC(page_fault)
23015
23016 /*
23017 * Debug traps and NMI can happen at the one SYSENTER instruction
23018@@ -1284,7 +1524,7 @@ debug_stack_correct:
23019 call do_debug
23020 jmp ret_from_exception
23021 CFI_ENDPROC
23022-END(debug)
23023+ENDPROC(debug)
23024
23025 /*
23026 * NMI is doubly nasty. It can happen _while_ we're handling
23027@@ -1324,6 +1564,9 @@ nmi_stack_correct:
23028 xorl %edx,%edx # zero error code
23029 movl %esp,%eax # pt_regs pointer
23030 call do_nmi
23031+
23032+ pax_exit_kernel
23033+
23034 jmp restore_all_notrace
23035 CFI_ENDPROC
23036
23037@@ -1361,13 +1604,16 @@ nmi_espfix_stack:
23038 FIXUP_ESPFIX_STACK # %eax == %esp
23039 xorl %edx,%edx # zero error code
23040 call do_nmi
23041+
23042+ pax_exit_kernel
23043+
23044 RESTORE_REGS
23045 lss 12+4(%esp), %esp # back to espfix stack
23046 CFI_ADJUST_CFA_OFFSET -24
23047 jmp irq_return
23048 #endif
23049 CFI_ENDPROC
23050-END(nmi)
23051+ENDPROC(nmi)
23052
23053 ENTRY(int3)
23054 RING0_INT_FRAME
23055@@ -1380,14 +1626,14 @@ ENTRY(int3)
23056 call do_int3
23057 jmp ret_from_exception
23058 CFI_ENDPROC
23059-END(int3)
23060+ENDPROC(int3)
23061
23062 ENTRY(general_protection)
23063 RING0_EC_FRAME
23064 pushl_cfi $do_general_protection
23065 jmp error_code
23066 CFI_ENDPROC
23067-END(general_protection)
23068+ENDPROC(general_protection)
23069
23070 #ifdef CONFIG_KVM_GUEST
23071 ENTRY(async_page_fault)
23072@@ -1396,6 +1642,6 @@ ENTRY(async_page_fault)
23073 pushl_cfi $do_async_page_fault
23074 jmp error_code
23075 CFI_ENDPROC
23076-END(async_page_fault)
23077+ENDPROC(async_page_fault)
23078 #endif
23079
23080diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23081index 02c2eff..a13739f 100644
23082--- a/arch/x86/kernel/entry_64.S
23083+++ b/arch/x86/kernel/entry_64.S
23084@@ -46,6 +46,8 @@
23085 #include <asm/smap.h>
23086 #include <asm/pgtable_types.h>
23087 #include <linux/err.h>
23088+#include <asm/pgtable.h>
23089+#include <asm/alternative-asm.h>
23090
23091 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23092 #include <linux/elf-em.h>
23093@@ -64,6 +66,401 @@ ENTRY(native_usergs_sysret64)
23094 ENDPROC(native_usergs_sysret64)
23095 #endif /* CONFIG_PARAVIRT */
23096
23097+ .macro ljmpq sel, off
23098+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23099+ .byte 0x48; ljmp *1234f(%rip)
23100+ .pushsection .rodata
23101+ .align 16
23102+ 1234: .quad \off; .word \sel
23103+ .popsection
23104+#else
23105+ pushq $\sel
23106+ pushq $\off
23107+ lretq
23108+#endif
23109+ .endm
23110+
23111+ .macro pax_enter_kernel
23112+ pax_set_fptr_mask
23113+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23114+ call pax_enter_kernel
23115+#endif
23116+ .endm
23117+
23118+ .macro pax_exit_kernel
23119+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23120+ call pax_exit_kernel
23121+#endif
23122+
23123+ .endm
23124+
23125+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23126+ENTRY(pax_enter_kernel)
23127+ pushq %rdi
23128+
23129+#ifdef CONFIG_PARAVIRT
23130+ PV_SAVE_REGS(CLBR_RDI)
23131+#endif
23132+
23133+#ifdef CONFIG_PAX_KERNEXEC
23134+ GET_CR0_INTO_RDI
23135+ bts $X86_CR0_WP_BIT,%rdi
23136+ jnc 3f
23137+ mov %cs,%edi
23138+ cmp $__KERNEL_CS,%edi
23139+ jnz 2f
23140+1:
23141+#endif
23142+
23143+#ifdef CONFIG_PAX_MEMORY_UDEREF
23144+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23145+ GET_CR3_INTO_RDI
23146+ cmp $0,%dil
23147+ jnz 112f
23148+ mov $__KERNEL_DS,%edi
23149+ mov %edi,%ss
23150+ jmp 111f
23151+112: cmp $1,%dil
23152+ jz 113f
23153+ ud2
23154+113: sub $4097,%rdi
23155+ bts $63,%rdi
23156+ SET_RDI_INTO_CR3
23157+ mov $__UDEREF_KERNEL_DS,%edi
23158+ mov %edi,%ss
23159+111:
23160+#endif
23161+
23162+#ifdef CONFIG_PARAVIRT
23163+ PV_RESTORE_REGS(CLBR_RDI)
23164+#endif
23165+
23166+ popq %rdi
23167+ pax_force_retaddr
23168+ retq
23169+
23170+#ifdef CONFIG_PAX_KERNEXEC
23171+2: ljmpq __KERNEL_CS,1b
23172+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23173+4: SET_RDI_INTO_CR0
23174+ jmp 1b
23175+#endif
23176+ENDPROC(pax_enter_kernel)
23177+
23178+ENTRY(pax_exit_kernel)
23179+ pushq %rdi
23180+
23181+#ifdef CONFIG_PARAVIRT
23182+ PV_SAVE_REGS(CLBR_RDI)
23183+#endif
23184+
23185+#ifdef CONFIG_PAX_KERNEXEC
23186+ mov %cs,%rdi
23187+ cmp $__KERNEXEC_KERNEL_CS,%edi
23188+ jz 2f
23189+ GET_CR0_INTO_RDI
23190+ bts $X86_CR0_WP_BIT,%rdi
23191+ jnc 4f
23192+1:
23193+#endif
23194+
23195+#ifdef CONFIG_PAX_MEMORY_UDEREF
23196+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23197+ mov %ss,%edi
23198+ cmp $__UDEREF_KERNEL_DS,%edi
23199+ jnz 111f
23200+ GET_CR3_INTO_RDI
23201+ cmp $0,%dil
23202+ jz 112f
23203+ ud2
23204+112: add $4097,%rdi
23205+ bts $63,%rdi
23206+ SET_RDI_INTO_CR3
23207+ mov $__KERNEL_DS,%edi
23208+ mov %edi,%ss
23209+111:
23210+#endif
23211+
23212+#ifdef CONFIG_PARAVIRT
23213+ PV_RESTORE_REGS(CLBR_RDI);
23214+#endif
23215+
23216+ popq %rdi
23217+ pax_force_retaddr
23218+ retq
23219+
23220+#ifdef CONFIG_PAX_KERNEXEC
23221+2: GET_CR0_INTO_RDI
23222+ btr $X86_CR0_WP_BIT,%rdi
23223+ jnc 4f
23224+ ljmpq __KERNEL_CS,3f
23225+3: SET_RDI_INTO_CR0
23226+ jmp 1b
23227+4: ud2
23228+ jmp 4b
23229+#endif
23230+ENDPROC(pax_exit_kernel)
23231+#endif
23232+
23233+ .macro pax_enter_kernel_user
23234+ pax_set_fptr_mask
23235+#ifdef CONFIG_PAX_MEMORY_UDEREF
23236+ call pax_enter_kernel_user
23237+#endif
23238+ .endm
23239+
23240+ .macro pax_exit_kernel_user
23241+#ifdef CONFIG_PAX_MEMORY_UDEREF
23242+ call pax_exit_kernel_user
23243+#endif
23244+#ifdef CONFIG_PAX_RANDKSTACK
23245+ pushq %rax
23246+ pushq %r11
23247+ call pax_randomize_kstack
23248+ popq %r11
23249+ popq %rax
23250+#endif
23251+ .endm
23252+
23253+#ifdef CONFIG_PAX_MEMORY_UDEREF
23254+ENTRY(pax_enter_kernel_user)
23255+ pushq %rdi
23256+ pushq %rbx
23257+
23258+#ifdef CONFIG_PARAVIRT
23259+ PV_SAVE_REGS(CLBR_RDI)
23260+#endif
23261+
23262+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23263+ GET_CR3_INTO_RDI
23264+ cmp $1,%dil
23265+ jnz 4f
23266+ sub $4097,%rdi
23267+ bts $63,%rdi
23268+ SET_RDI_INTO_CR3
23269+ jmp 3f
23270+111:
23271+
23272+ GET_CR3_INTO_RDI
23273+ mov %rdi,%rbx
23274+ add $__START_KERNEL_map,%rbx
23275+ sub phys_base(%rip),%rbx
23276+
23277+#ifdef CONFIG_PARAVIRT
23278+ cmpl $0, pv_info+PARAVIRT_enabled
23279+ jz 1f
23280+ pushq %rdi
23281+ i = 0
23282+ .rept USER_PGD_PTRS
23283+ mov i*8(%rbx),%rsi
23284+ mov $0,%sil
23285+ lea i*8(%rbx),%rdi
23286+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23287+ i = i + 1
23288+ .endr
23289+ popq %rdi
23290+ jmp 2f
23291+1:
23292+#endif
23293+
23294+ i = 0
23295+ .rept USER_PGD_PTRS
23296+ movb $0,i*8(%rbx)
23297+ i = i + 1
23298+ .endr
23299+
23300+2: SET_RDI_INTO_CR3
23301+
23302+#ifdef CONFIG_PAX_KERNEXEC
23303+ GET_CR0_INTO_RDI
23304+ bts $X86_CR0_WP_BIT,%rdi
23305+ SET_RDI_INTO_CR0
23306+#endif
23307+
23308+3:
23309+
23310+#ifdef CONFIG_PARAVIRT
23311+ PV_RESTORE_REGS(CLBR_RDI)
23312+#endif
23313+
23314+ popq %rbx
23315+ popq %rdi
23316+ pax_force_retaddr
23317+ retq
23318+4: ud2
23319+ENDPROC(pax_enter_kernel_user)
23320+
23321+ENTRY(pax_exit_kernel_user)
23322+ pushq %rdi
23323+ pushq %rbx
23324+
23325+#ifdef CONFIG_PARAVIRT
23326+ PV_SAVE_REGS(CLBR_RDI)
23327+#endif
23328+
23329+ GET_CR3_INTO_RDI
23330+ ALTERNATIVE "jmp 1f", "", X86_FEATURE_PCID
23331+ cmp $0,%dil
23332+ jnz 3f
23333+ add $4097,%rdi
23334+ bts $63,%rdi
23335+ SET_RDI_INTO_CR3
23336+ jmp 2f
23337+1:
23338+
23339+ mov %rdi,%rbx
23340+
23341+#ifdef CONFIG_PAX_KERNEXEC
23342+ GET_CR0_INTO_RDI
23343+ btr $X86_CR0_WP_BIT,%rdi
23344+ jnc 3f
23345+ SET_RDI_INTO_CR0
23346+#endif
23347+
23348+ add $__START_KERNEL_map,%rbx
23349+ sub phys_base(%rip),%rbx
23350+
23351+#ifdef CONFIG_PARAVIRT
23352+ cmpl $0, pv_info+PARAVIRT_enabled
23353+ jz 1f
23354+ i = 0
23355+ .rept USER_PGD_PTRS
23356+ mov i*8(%rbx),%rsi
23357+ mov $0x67,%sil
23358+ lea i*8(%rbx),%rdi
23359+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23360+ i = i + 1
23361+ .endr
23362+ jmp 2f
23363+1:
23364+#endif
23365+
23366+ i = 0
23367+ .rept USER_PGD_PTRS
23368+ movb $0x67,i*8(%rbx)
23369+ i = i + 1
23370+ .endr
23371+2:
23372+
23373+#ifdef CONFIG_PARAVIRT
23374+ PV_RESTORE_REGS(CLBR_RDI)
23375+#endif
23376+
23377+ popq %rbx
23378+ popq %rdi
23379+ pax_force_retaddr
23380+ retq
23381+3: ud2
23382+ENDPROC(pax_exit_kernel_user)
23383+#endif
23384+
23385+ .macro pax_enter_kernel_nmi
23386+ pax_set_fptr_mask
23387+
23388+#ifdef CONFIG_PAX_KERNEXEC
23389+ GET_CR0_INTO_RDI
23390+ bts $X86_CR0_WP_BIT,%rdi
23391+ jc 110f
23392+ SET_RDI_INTO_CR0
23393+ or $2,%ebx
23394+110:
23395+#endif
23396+
23397+#ifdef CONFIG_PAX_MEMORY_UDEREF
23398+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23399+ GET_CR3_INTO_RDI
23400+ cmp $0,%dil
23401+ jz 111f
23402+ sub $4097,%rdi
23403+ or $4,%ebx
23404+ bts $63,%rdi
23405+ SET_RDI_INTO_CR3
23406+ mov $__UDEREF_KERNEL_DS,%edi
23407+ mov %edi,%ss
23408+111:
23409+#endif
23410+ .endm
23411+
23412+ .macro pax_exit_kernel_nmi
23413+#ifdef CONFIG_PAX_KERNEXEC
23414+ btr $1,%ebx
23415+ jnc 110f
23416+ GET_CR0_INTO_RDI
23417+ btr $X86_CR0_WP_BIT,%rdi
23418+ SET_RDI_INTO_CR0
23419+110:
23420+#endif
23421+
23422+#ifdef CONFIG_PAX_MEMORY_UDEREF
23423+ btr $2,%ebx
23424+ jnc 111f
23425+ GET_CR3_INTO_RDI
23426+ add $4097,%rdi
23427+ bts $63,%rdi
23428+ SET_RDI_INTO_CR3
23429+ mov $__KERNEL_DS,%edi
23430+ mov %edi,%ss
23431+111:
23432+#endif
23433+ .endm
23434+
23435+ .macro pax_erase_kstack
23436+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23437+ call pax_erase_kstack
23438+#endif
23439+ .endm
23440+
23441+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23442+ENTRY(pax_erase_kstack)
23443+ pushq %rdi
23444+ pushq %rcx
23445+ pushq %rax
23446+ pushq %r11
23447+
23448+ GET_THREAD_INFO(%r11)
23449+ mov TI_lowest_stack(%r11), %rdi
23450+ mov $-0xBEEF, %rax
23451+ std
23452+
23453+1: mov %edi, %ecx
23454+ and $THREAD_SIZE_asm - 1, %ecx
23455+ shr $3, %ecx
23456+ repne scasq
23457+ jecxz 2f
23458+
23459+ cmp $2*8, %ecx
23460+ jc 2f
23461+
23462+ mov $2*8, %ecx
23463+ repe scasq
23464+ jecxz 2f
23465+ jne 1b
23466+
23467+2: cld
23468+ or $2*8, %rdi
23469+ mov %esp, %ecx
23470+ sub %edi, %ecx
23471+
23472+ cmp $THREAD_SIZE_asm, %rcx
23473+ jb 3f
23474+ ud2
23475+3:
23476+
23477+ shr $3, %ecx
23478+ rep stosq
23479+
23480+ mov TI_task_thread_sp0(%r11), %rdi
23481+ sub $256, %rdi
23482+ mov %rdi, TI_lowest_stack(%r11)
23483+
23484+ popq %r11
23485+ popq %rax
23486+ popq %rcx
23487+ popq %rdi
23488+ pax_force_retaddr
23489+ ret
23490+ENDPROC(pax_erase_kstack)
23491+#endif
23492
23493 .macro TRACE_IRQS_IRETQ
23494 #ifdef CONFIG_TRACE_IRQFLAGS
23495@@ -100,7 +497,7 @@ ENDPROC(native_usergs_sysret64)
23496 .endm
23497
23498 .macro TRACE_IRQS_IRETQ_DEBUG
23499- bt $9,EFLAGS(%rsp) /* interrupts off? */
23500+ bt $X86_EFLAGS_IF_BIT,EFLAGS(%rsp) /* interrupts off? */
23501 jnc 1f
23502 TRACE_IRQS_ON_DEBUG
23503 1:
23504@@ -221,14 +618,6 @@ GLOBAL(system_call_after_swapgs)
23505 /* Construct struct pt_regs on stack */
23506 pushq_cfi $__USER_DS /* pt_regs->ss */
23507 pushq_cfi PER_CPU_VAR(rsp_scratch) /* pt_regs->sp */
23508- /*
23509- * Re-enable interrupts.
23510- * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23511- * must execute atomically in the face of possible interrupt-driven
23512- * task preemption. We must enable interrupts only after we're done
23513- * with using rsp_scratch:
23514- */
23515- ENABLE_INTERRUPTS(CLBR_NONE)
23516 pushq_cfi %r11 /* pt_regs->flags */
23517 pushq_cfi $__USER_CS /* pt_regs->cs */
23518 pushq_cfi %rcx /* pt_regs->ip */
23519@@ -246,7 +635,27 @@ GLOBAL(system_call_after_swapgs)
23520 sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */
23521 CFI_ADJUST_CFA_OFFSET 6*8
23522
23523- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23524+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
23525+ movq_cfi r12, R12
23526+#endif
23527+
23528+ pax_enter_kernel_user
23529+
23530+#ifdef CONFIG_PAX_RANDKSTACK
23531+ pax_erase_kstack
23532+#endif
23533+
23534+ /*
23535+ * Re-enable interrupts.
23536+ * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23537+ * must execute atomically in the face of possible interrupt-driven
23538+ * task preemption. We must enable interrupts only after we're done
23539+ * with using rsp_scratch:
23540+ */
23541+ ENABLE_INTERRUPTS(CLBR_NONE)
23542+
23543+ GET_THREAD_INFO(%rcx)
23544+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23545 jnz tracesys
23546 system_call_fastpath:
23547 #if __SYSCALL_MASK == ~0
23548@@ -279,10 +688,13 @@ system_call_fastpath:
23549 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23550 * very bad.
23551 */
23552- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23553+ GET_THREAD_INFO(%rcx)
23554+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23555 jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */
23556
23557 CFI_REMEMBER_STATE
23558+ pax_exit_kernel_user
23559+ pax_erase_kstack
23560
23561 RESTORE_C_REGS_EXCEPT_RCX_R11
23562 movq RIP(%rsp),%rcx
23563@@ -316,6 +728,9 @@ tracesys:
23564 call syscall_trace_enter_phase1
23565 test %rax, %rax
23566 jnz tracesys_phase2 /* if needed, run the slow path */
23567+
23568+ pax_erase_kstack
23569+
23570 RESTORE_C_REGS_EXCEPT_RAX /* else restore clobbered regs */
23571 movq ORIG_RAX(%rsp), %rax
23572 jmp system_call_fastpath /* and return to the fast path */
23573@@ -327,6 +742,8 @@ tracesys_phase2:
23574 movq %rax,%rdx
23575 call syscall_trace_enter_phase2
23576
23577+ pax_erase_kstack
23578+
23579 /*
23580 * Reload registers from stack in case ptrace changed them.
23581 * We don't reload %rax because syscall_trace_entry_phase2() returned
23582@@ -364,6 +781,8 @@ GLOBAL(int_with_check)
23583 andl %edi,%edx
23584 jnz int_careful
23585 andl $~TS_COMPAT,TI_status(%rcx)
23586+ pax_exit_kernel_user
23587+ pax_erase_kstack
23588 jmp syscall_return
23589
23590 /* Either reschedule or signal or syscall exit tracking needed. */
23591@@ -485,7 +904,7 @@ opportunistic_sysret_failed:
23592 SWAPGS
23593 jmp restore_c_regs_and_iret
23594 CFI_ENDPROC
23595-END(system_call)
23596+ENDPROC(system_call)
23597
23598
23599 .macro FORK_LIKE func
23600@@ -495,7 +914,7 @@ ENTRY(stub_\func)
23601 SAVE_EXTRA_REGS 8
23602 jmp sys_\func
23603 CFI_ENDPROC
23604-END(stub_\func)
23605+ENDPROC(stub_\func)
23606 .endm
23607
23608 FORK_LIKE clone
23609@@ -519,7 +938,7 @@ return_from_execve:
23610 movq %rax,RAX(%rsp)
23611 jmp int_ret_from_sys_call
23612 CFI_ENDPROC
23613-END(stub_execve)
23614+ENDPROC(stub_execve)
23615 /*
23616 * Remaining execve stubs are only 7 bytes long.
23617 * ENTRY() often aligns to 16 bytes, which in this case has no benefits.
23618@@ -531,7 +950,7 @@ GLOBAL(stub_execveat)
23619 call sys_execveat
23620 jmp return_from_execve
23621 CFI_ENDPROC
23622-END(stub_execveat)
23623+ENDPROC(stub_execveat)
23624
23625 #ifdef CONFIG_X86_X32_ABI
23626 .align 8
23627@@ -541,7 +960,7 @@ GLOBAL(stub_x32_execve)
23628 call compat_sys_execve
23629 jmp return_from_execve
23630 CFI_ENDPROC
23631-END(stub_x32_execve)
23632+ENDPROC(stub_x32_execve)
23633 .align 8
23634 GLOBAL(stub_x32_execveat)
23635 CFI_STARTPROC
23636@@ -549,7 +968,7 @@ GLOBAL(stub_x32_execveat)
23637 call compat_sys_execveat
23638 jmp return_from_execve
23639 CFI_ENDPROC
23640-END(stub_x32_execveat)
23641+ENDPROC(stub_x32_execveat)
23642 #endif
23643
23644 #ifdef CONFIG_IA32_EMULATION
23645@@ -592,7 +1011,7 @@ return_from_stub:
23646 movq %rax,RAX(%rsp)
23647 jmp int_ret_from_sys_call
23648 CFI_ENDPROC
23649-END(stub_rt_sigreturn)
23650+ENDPROC(stub_rt_sigreturn)
23651
23652 #ifdef CONFIG_X86_X32_ABI
23653 ENTRY(stub_x32_rt_sigreturn)
23654@@ -602,7 +1021,7 @@ ENTRY(stub_x32_rt_sigreturn)
23655 call sys32_x32_rt_sigreturn
23656 jmp return_from_stub
23657 CFI_ENDPROC
23658-END(stub_x32_rt_sigreturn)
23659+ENDPROC(stub_x32_rt_sigreturn)
23660 #endif
23661
23662 /*
23663@@ -622,7 +1041,7 @@ ENTRY(ret_from_fork)
23664
23665 RESTORE_EXTRA_REGS
23666
23667- testl $3,CS(%rsp) # from kernel_thread?
23668+ testb $3,CS(%rsp) # from kernel_thread?
23669
23670 /*
23671 * By the time we get here, we have no idea whether our pt_regs,
23672@@ -641,7 +1060,7 @@ ENTRY(ret_from_fork)
23673 RESTORE_EXTRA_REGS
23674 jmp int_ret_from_sys_call
23675 CFI_ENDPROC
23676-END(ret_from_fork)
23677+ENDPROC(ret_from_fork)
23678
23679 /*
23680 * Build the entry stubs with some assembler magic.
23681@@ -659,7 +1078,7 @@ ENTRY(irq_entries_start)
23682 .align 8
23683 .endr
23684 CFI_ENDPROC
23685-END(irq_entries_start)
23686+ENDPROC(irq_entries_start)
23687
23688 /*
23689 * Interrupt entry/exit.
23690@@ -672,21 +1091,13 @@ END(irq_entries_start)
23691 /* 0(%rsp): ~(interrupt number) */
23692 .macro interrupt func
23693 cld
23694- /*
23695- * Since nothing in interrupt handling code touches r12...r15 members
23696- * of "struct pt_regs", and since interrupts can nest, we can save
23697- * four stack slots and simultaneously provide
23698- * an unwind-friendly stack layout by saving "truncated" pt_regs
23699- * exactly up to rbp slot, without these members.
23700- */
23701- ALLOC_PT_GPREGS_ON_STACK -RBP
23702- SAVE_C_REGS -RBP
23703- /* this goes to 0(%rsp) for unwinder, not for saving the value: */
23704- SAVE_EXTRA_REGS_RBP -RBP
23705+ ALLOC_PT_GPREGS_ON_STACK
23706+ SAVE_C_REGS
23707+ SAVE_EXTRA_REGS
23708
23709- leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
23710+ movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */
23711
23712- testl $3, CS-RBP(%rsp)
23713+ testb $3, CS(%rsp)
23714 je 1f
23715 SWAPGS
23716 1:
23717@@ -709,8 +1120,20 @@ END(irq_entries_start)
23718 CFI_ESCAPE 0x0f /* DW_CFA_def_cfa_expression */, 6, \
23719 0x77 /* DW_OP_breg7 (rsp) */, 0, \
23720 0x06 /* DW_OP_deref */, \
23721- 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS-RBP, \
23722+ 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS, \
23723 0x22 /* DW_OP_plus */
23724+
23725+#ifdef CONFIG_PAX_MEMORY_UDEREF
23726+ testb $3, CS(%rdi)
23727+ jnz 1f
23728+ pax_enter_kernel
23729+ jmp 2f
23730+1: pax_enter_kernel_user
23731+2:
23732+#else
23733+ pax_enter_kernel
23734+#endif
23735+
23736 /* We entered an interrupt context - irqs are off: */
23737 TRACE_IRQS_OFF
23738
23739@@ -735,13 +1158,12 @@ ret_from_intr:
23740
23741 /* Restore saved previous stack */
23742 popq %rsi
23743- CFI_DEF_CFA rsi,SIZEOF_PTREGS-RBP /* reg/off reset after def_cfa_expr */
23744- /* return code expects complete pt_regs - adjust rsp accordingly: */
23745- leaq -RBP(%rsi),%rsp
23746+ CFI_DEF_CFA rsi,SIZEOF_PTREGS /* reg/off reset after def_cfa_expr */
23747+ movq %rsi, %rsp
23748 CFI_DEF_CFA_REGISTER rsp
23749- CFI_ADJUST_CFA_OFFSET RBP
23750+ CFI_ADJUST_CFA_OFFSET 0
23751
23752- testl $3,CS(%rsp)
23753+ testb $3,CS(%rsp)
23754 je retint_kernel
23755 /* Interrupt came from user space */
23756
23757@@ -763,6 +1185,8 @@ retint_swapgs: /* return to user-space */
23758 * The iretq could re-enable interrupts:
23759 */
23760 DISABLE_INTERRUPTS(CLBR_ANY)
23761+ pax_exit_kernel_user
23762+# pax_erase_kstack
23763 TRACE_IRQS_IRETQ
23764
23765 SWAPGS
23766@@ -781,6 +1205,21 @@ retint_kernel:
23767 jmp 0b
23768 1:
23769 #endif
23770+
23771+ pax_exit_kernel
23772+
23773+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23774+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23775+ * namely calling EFI runtime services with a phys mapping. We're
23776+ * starting off with NOPs and patch in the real instrumentation
23777+ * (BTS/OR) before starting any userland process; even before starting
23778+ * up the APs.
23779+ */
23780+ ALTERNATIVE "", "pax_force_retaddr 16*8", X86_FEATURE_ALWAYS
23781+#else
23782+ pax_force_retaddr RIP
23783+#endif
23784+
23785 /*
23786 * The iretq could re-enable interrupts:
23787 */
23788@@ -793,8 +1232,6 @@ retint_kernel:
23789 restore_c_regs_and_iret:
23790 RESTORE_C_REGS
23791 REMOVE_PT_GPREGS_FROM_STACK 8
23792-
23793-irq_return:
23794 INTERRUPT_RETURN
23795
23796 ENTRY(native_iret)
23797@@ -824,15 +1261,15 @@ native_irq_return_ldt:
23798 SWAPGS
23799 movq PER_CPU_VAR(espfix_waddr),%rdi
23800 movq %rax,(0*8)(%rdi) /* RAX */
23801- movq (2*8)(%rsp),%rax /* RIP */
23802+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23803 movq %rax,(1*8)(%rdi)
23804- movq (3*8)(%rsp),%rax /* CS */
23805+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23806 movq %rax,(2*8)(%rdi)
23807- movq (4*8)(%rsp),%rax /* RFLAGS */
23808+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23809 movq %rax,(3*8)(%rdi)
23810- movq (6*8)(%rsp),%rax /* SS */
23811+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23812 movq %rax,(5*8)(%rdi)
23813- movq (5*8)(%rsp),%rax /* RSP */
23814+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23815 movq %rax,(4*8)(%rdi)
23816 andl $0xffff0000,%eax
23817 popq_cfi %rdi
23818@@ -875,7 +1312,7 @@ retint_signal:
23819 jmp retint_with_reschedule
23820
23821 CFI_ENDPROC
23822-END(common_interrupt)
23823+ENDPROC(common_interrupt)
23824
23825 /*
23826 * APIC interrupts.
23827@@ -889,7 +1326,7 @@ ENTRY(\sym)
23828 interrupt \do_sym
23829 jmp ret_from_intr
23830 CFI_ENDPROC
23831-END(\sym)
23832+ENDPROC(\sym)
23833 .endm
23834
23835 #ifdef CONFIG_TRACING
23836@@ -962,7 +1399,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23837 /*
23838 * Exception entry points.
23839 */
23840-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)
23841+#define CPU_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23842
23843 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23844 ENTRY(\sym)
23845@@ -1018,6 +1455,12 @@ ENTRY(\sym)
23846 .endif
23847
23848 .if \shift_ist != -1
23849+#ifdef CONFIG_SMP
23850+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23851+ lea cpu_tss(%r13), %r13
23852+#else
23853+ lea cpu_tss(%rip), %r13
23854+#endif
23855 subq $EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)
23856 .endif
23857
23858@@ -1065,7 +1508,7 @@ ENTRY(\sym)
23859 .endif
23860
23861 CFI_ENDPROC
23862-END(\sym)
23863+ENDPROC(\sym)
23864 .endm
23865
23866 #ifdef CONFIG_TRACING
23867@@ -1106,9 +1549,10 @@ gs_change:
23868 2: mfence /* workaround */
23869 SWAPGS
23870 popfq_cfi
23871+ pax_force_retaddr
23872 ret
23873 CFI_ENDPROC
23874-END(native_load_gs_index)
23875+ENDPROC(native_load_gs_index)
23876
23877 _ASM_EXTABLE(gs_change,bad_gs)
23878 .section .fixup,"ax"
23879@@ -1136,9 +1580,10 @@ ENTRY(do_softirq_own_stack)
23880 CFI_DEF_CFA_REGISTER rsp
23881 CFI_ADJUST_CFA_OFFSET -8
23882 decl PER_CPU_VAR(irq_count)
23883+ pax_force_retaddr
23884 ret
23885 CFI_ENDPROC
23886-END(do_softirq_own_stack)
23887+ENDPROC(do_softirq_own_stack)
23888
23889 #ifdef CONFIG_XEN
23890 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23891@@ -1179,7 +1624,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23892 #endif
23893 jmp error_exit
23894 CFI_ENDPROC
23895-END(xen_do_hypervisor_callback)
23896+ENDPROC(xen_do_hypervisor_callback)
23897
23898 /*
23899 * Hypervisor uses this for application faults while it executes.
23900@@ -1240,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
23901 SAVE_EXTRA_REGS
23902 jmp error_exit
23903 CFI_ENDPROC
23904-END(xen_failsafe_callback)
23905+ENDPROC(xen_failsafe_callback)
23906
23907 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23908 xen_hvm_callback_vector xen_evtchn_do_upcall
23909@@ -1286,9 +1731,39 @@ ENTRY(paranoid_entry)
23910 js 1f /* negative -> in kernel */
23911 SWAPGS
23912 xorl %ebx,%ebx
23913-1: ret
23914+1:
23915+#ifdef CONFIG_PAX_MEMORY_UDEREF
23916+ testb $3, CS+8(%rsp)
23917+ jnz 1f
23918+ pax_enter_kernel
23919+ jmp 2f
23920+1: pax_enter_kernel_user
23921+2:
23922+#else
23923+ pax_enter_kernel
23924+#endif
23925+ pax_force_retaddr
23926+ ret
23927 CFI_ENDPROC
23928-END(paranoid_entry)
23929+ENDPROC(paranoid_entry)
23930+
23931+ENTRY(paranoid_entry_nmi)
23932+ XCPT_FRAME 1 15*8
23933+ cld
23934+ SAVE_C_REGS 8
23935+ SAVE_EXTRA_REGS 8
23936+ movl $1,%ebx
23937+ movl $MSR_GS_BASE,%ecx
23938+ rdmsr
23939+ testl %edx,%edx
23940+ js 1f /* negative -> in kernel */
23941+ SWAPGS
23942+ xorl %ebx,%ebx
23943+1: pax_enter_kernel_nmi
23944+ pax_force_retaddr
23945+ ret
23946+ CFI_ENDPROC
23947+ENDPROC(paranoid_entry_nmi)
23948
23949 /*
23950 * "Paranoid" exit path from exception stack. This is invoked
23951@@ -1305,20 +1780,27 @@ ENTRY(paranoid_exit)
23952 DEFAULT_FRAME
23953 DISABLE_INTERRUPTS(CLBR_NONE)
23954 TRACE_IRQS_OFF_DEBUG
23955- testl %ebx,%ebx /* swapgs needed? */
23956+ testl $1,%ebx /* swapgs needed? */
23957 jnz paranoid_exit_no_swapgs
23958+#ifdef CONFIG_PAX_MEMORY_UDEREF
23959+ pax_exit_kernel_user
23960+#else
23961+ pax_exit_kernel
23962+#endif
23963 TRACE_IRQS_IRETQ
23964 SWAPGS_UNSAFE_STACK
23965 jmp paranoid_exit_restore
23966 paranoid_exit_no_swapgs:
23967+ pax_exit_kernel
23968 TRACE_IRQS_IRETQ_DEBUG
23969 paranoid_exit_restore:
23970 RESTORE_EXTRA_REGS
23971 RESTORE_C_REGS
23972 REMOVE_PT_GPREGS_FROM_STACK 8
23973+ pax_force_retaddr_bts
23974 INTERRUPT_RETURN
23975 CFI_ENDPROC
23976-END(paranoid_exit)
23977+ENDPROC(paranoid_exit)
23978
23979 /*
23980 * Save all registers in pt_regs, and switch gs if needed.
23981@@ -1330,12 +1812,23 @@ ENTRY(error_entry)
23982 SAVE_C_REGS 8
23983 SAVE_EXTRA_REGS 8
23984 xorl %ebx,%ebx
23985- testl $3,CS+8(%rsp)
23986+ testb $3,CS+8(%rsp)
23987 je error_kernelspace
23988 error_swapgs:
23989 SWAPGS
23990 error_sti:
23991+#ifdef CONFIG_PAX_MEMORY_UDEREF
23992+ testb $3, CS+8(%rsp)
23993+ jnz 1f
23994+ pax_enter_kernel
23995+ jmp 2f
23996+1: pax_enter_kernel_user
23997+2:
23998+#else
23999+ pax_enter_kernel
24000+#endif
24001 TRACE_IRQS_OFF
24002+ pax_force_retaddr
24003 ret
24004
24005 /*
24006@@ -1370,7 +1863,7 @@ error_bad_iret:
24007 decl %ebx /* Return to usergs */
24008 jmp error_sti
24009 CFI_ENDPROC
24010-END(error_entry)
24011+ENDPROC(error_entry)
24012
24013
24014 /* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
24015@@ -1381,7 +1874,7 @@ ENTRY(error_exit)
24016 DISABLE_INTERRUPTS(CLBR_NONE)
24017 TRACE_IRQS_OFF
24018 GET_THREAD_INFO(%rcx)
24019- testl %eax,%eax
24020+ testl $1,%eax
24021 jne retint_kernel
24022 LOCKDEP_SYS_EXIT_IRQ
24023 movl TI_flags(%rcx),%edx
24024@@ -1390,7 +1883,7 @@ ENTRY(error_exit)
24025 jnz retint_careful
24026 jmp retint_swapgs
24027 CFI_ENDPROC
24028-END(error_exit)
24029+ENDPROC(error_exit)
24030
24031 /* Runs on exception stack */
24032 ENTRY(nmi)
24033@@ -1413,11 +1906,12 @@ ENTRY(nmi)
24034 * If the variable is not set and the stack is not the NMI
24035 * stack then:
24036 * o Set the special variable on the stack
24037- * o Copy the interrupt frame into a "saved" location on the stack
24038- * o Copy the interrupt frame into a "copy" location on the stack
24039+ * o Copy the interrupt frame into an "outermost" location on the
24040+ * stack
24041+ * o Copy the interrupt frame into an "iret" location on the stack
24042 * o Continue processing the NMI
24043 * If the variable is set or the previous stack is the NMI stack:
24044- * o Modify the "copy" location to jump to the repeate_nmi
24045+ * o Modify the "iret" location to jump to the repeat_nmi
24046 * o return back to the first NMI
24047 *
24048 * Now on exit of the first NMI, we first clear the stack variable
24049@@ -1426,32 +1920,185 @@ ENTRY(nmi)
24050 * a nested NMI that updated the copy interrupt stack frame, a
24051 * jump will be made to the repeat_nmi code that will handle the second
24052 * NMI.
24053+ *
24054+ * However, espfix prevents us from directly returning to userspace
24055+ * with a single IRET instruction. Similarly, IRET to user mode
24056+ * can fault. We therefore handle NMIs from user space like
24057+ * other IST entries.
24058 */
24059
24060 /* Use %rdx as our temp variable throughout */
24061 pushq_cfi %rdx
24062 CFI_REL_OFFSET rdx, 0
24063
24064+ testb $3, CS-RIP+8(%rsp)
24065+ jz .Lnmi_from_kernel
24066+
24067+ /*
24068+ * NMI from user mode. We need to run on the thread stack, but we
24069+ * can't go through the normal entry paths: NMIs are masked, and
24070+ * we don't want to enable interrupts, because then we'll end
24071+ * up in an awkward situation in which IRQs are on but NMIs
24072+ * are off.
24073+ */
24074+
24075+ SWAPGS
24076+ cld
24077+ movq %rsp, %rdx
24078+ movq PER_CPU_VAR(kernel_stack), %rsp
24079+ pushq 5*8(%rdx) /* pt_regs->ss */
24080+ pushq 4*8(%rdx) /* pt_regs->rsp */
24081+ pushq 3*8(%rdx) /* pt_regs->flags */
24082+ pushq 2*8(%rdx) /* pt_regs->cs */
24083+ pushq 1*8(%rdx) /* pt_regs->rip */
24084+ pushq $-1 /* pt_regs->orig_ax */
24085+ pushq %rdi /* pt_regs->di */
24086+ pushq %rsi /* pt_regs->si */
24087+ pushq (%rdx) /* pt_regs->dx */
24088+ pushq %rcx /* pt_regs->cx */
24089+ pushq %rax /* pt_regs->ax */
24090+ pushq %r8 /* pt_regs->r8 */
24091+ pushq %r9 /* pt_regs->r9 */
24092+ pushq %r10 /* pt_regs->r10 */
24093+ pushq %r11 /* pt_regs->r11 */
24094+ pushq %rbx /* pt_regs->rbx */
24095+ pushq %rbp /* pt_regs->rbp */
24096+ pushq %r12 /* pt_regs->r12 */
24097+ pushq %r13 /* pt_regs->r13 */
24098+ pushq %r14 /* pt_regs->r14 */
24099+ pushq %r15 /* pt_regs->r15 */
24100+
24101+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24102+ xorl %ebx,%ebx
24103+#endif
24104+
24105+ pax_enter_kernel_nmi
24106+
24107 /*
24108- * If %cs was not the kernel segment, then the NMI triggered in user
24109- * space, which means it is definitely not nested.
24110+ * At this point we no longer need to worry about stack damage
24111+ * due to nesting -- we're on the normal thread stack and we're
24112+ * done with the NMI stack.
24113 */
24114- cmpl $__KERNEL_CS, 16(%rsp)
24115- jne first_nmi
24116+
24117+ movq %rsp, %rdi
24118+ movq $-1, %rsi
24119+ call do_nmi
24120+
24121+ pax_exit_kernel_nmi
24122+
24123+ /*
24124+ * Return back to user mode. We must *not* do the normal exit
24125+ * work, because we don't want to enable interrupts. Fortunately,
24126+ * do_nmi doesn't modify pt_regs.
24127+ */
24128+ SWAPGS
24129+
24130+ /*
24131+ * Open-code the entire return process for compatibility with varying
24132+ * register layouts across different kernel versions.
24133+ */
24134+
24135+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24136+ movq RBX(%rsp), %rbx /* pt_regs->rbx*/
24137+#endif
24138+
24139+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
24140+ movq R12(%rsp), %r12 /* pt_regs->r12*/
24141+#endif
24142+
24143+ addq $6*8, %rsp /* skip bx, bp, and r12-r15 */
24144+ popq %r11 /* pt_regs->r11 */
24145+ popq %r10 /* pt_regs->r10 */
24146+ popq %r9 /* pt_regs->r9 */
24147+ popq %r8 /* pt_regs->r8 */
24148+ popq %rax /* pt_regs->ax */
24149+ popq %rcx /* pt_regs->cx */
24150+ popq %rdx /* pt_regs->dx */
24151+ popq %rsi /* pt_regs->si */
24152+ popq %rdi /* pt_regs->di */
24153+ addq $8, %rsp /* skip orig_ax */
24154+ INTERRUPT_RETURN
24155+
24156+.Lnmi_from_kernel:
24157+ /*
24158+ * Here's what our stack frame will look like:
24159+ * +---------------------------------------------------------+
24160+ * | original SS |
24161+ * | original Return RSP |
24162+ * | original RFLAGS |
24163+ * | original CS |
24164+ * | original RIP |
24165+ * +---------------------------------------------------------+
24166+ * | temp storage for rdx |
24167+ * +---------------------------------------------------------+
24168+ * | "NMI executing" variable |
24169+ * +---------------------------------------------------------+
24170+ * | iret SS } Copied from "outermost" frame |
24171+ * | iret Return RSP } on each loop iteration; overwritten |
24172+ * | iret RFLAGS } by a nested NMI to force another |
24173+ * | iret CS } iteration if needed. |
24174+ * | iret RIP } |
24175+ * +---------------------------------------------------------+
24176+ * | outermost SS } initialized in first_nmi; |
24177+ * | outermost Return RSP } will not be changed before |
24178+ * | outermost RFLAGS } NMI processing is done. |
24179+ * | outermost CS } Copied to "iret" frame on each |
24180+ * | outermost RIP } iteration. |
24181+ * +---------------------------------------------------------+
24182+ * | pt_regs |
24183+ * +---------------------------------------------------------+
24184+ *
24185+ * The "original" frame is used by hardware. Before re-enabling
24186+ * NMIs, we need to be done with it, and we need to leave enough
24187+ * space for the asm code here.
24188+ *
24189+ * We return by executing IRET while RSP points to the "iret" frame.
24190+ * That will either return for real or it will loop back into NMI
24191+ * processing.
24192+ *
24193+ * The "outermost" frame is copied to the "iret" frame on each
24194+ * iteration of the loop, so each iteration starts with the "iret"
24195+ * frame pointing to the final return target.
24196+ */
24197+
24198+ /*
24199+ * If we interrupted kernel code between repeat_nmi and
24200+ * end_repeat_nmi, then we are a nested NMI. We must not
24201+ * modify the "iret" frame because it's being written by
24202+ * the outer NMI. That's okay: the outer NMI handler is
24203+ * about to about to call do_nmi anyway, so we can just
24204+ * resume the outer NMI.
24205+ */
24206+
24207+ movq $repeat_nmi, %rdx
24208+ cmpq 8(%rsp), %rdx
24209+ ja 1f
24210+ movq $end_repeat_nmi, %rdx
24211+ cmpq 8(%rsp), %rdx
24212+ ja nested_nmi_out
24213+1:
24214
24215 /*
24216- * Check the special variable on the stack to see if NMIs are
24217- * executing.
24218+ * Now check "NMI executing". If it's set, then we're nested.
24219+ *
24220+ * First check "NMI executing". If it's set, then we're nested.
24221+ * This will not detect if we interrupted an outer NMI just
24222+ * before IRET.
24223 */
24224 cmpl $1, -8(%rsp)
24225 je nested_nmi
24226
24227 /*
24228- * Now test if the previous stack was an NMI stack.
24229- * We need the double check. We check the NMI stack to satisfy the
24230- * race when the first NMI clears the variable before returning.
24231- * We check the variable because the first NMI could be in a
24232- * breakpoint routine using a breakpoint stack.
24233+ * Now test if the previous stack was an NMI stack. This covers
24234+ * the case where we interrupt an outer NMI after it clears
24235+ * "NMI executing" but before IRET. We need to be careful, though:
24236+ * there is one case in which RSP could point to the NMI stack
24237+ * despite there being no NMI active: naughty userspace controls
24238+ * RSP at the very beginning of the SYSCALL targets. We can
24239+ * pull a fast one on naughty userspace, though: we program
24240+ * SYSCALL to mask DF, so userspace cannot cause DF to be set
24241+ * if it controls the kernel's RSP. We set DF before we clear
24242+ * "NMI executing".
24243 */
24244 lea 6*8(%rsp), %rdx
24245 /* Compare the NMI stack (rdx) with the stack we came from (4*8(%rsp)) */
24246@@ -1462,27 +2109,22 @@ ENTRY(nmi)
24247 cmpq %rdx, 4*8(%rsp)
24248 /* If it is below the NMI stack, it is a normal NMI */
24249 jb first_nmi
24250- /* Ah, it is within the NMI stack, treat it as nested */
24251+
24252+ /* Ah, it is within the NMI stack. */
24253+
24254+ testb $(X86_EFLAGS_DF >> 8), (3*8 + 1)(%rsp)
24255+ jz first_nmi /* RSP was user controlled. */
24256
24257 CFI_REMEMBER_STATE
24258
24259+ /* This is a nested NMI. */
24260+
24261 nested_nmi:
24262 /*
24263- * Do nothing if we interrupted the fixup in repeat_nmi.
24264- * It's about to repeat the NMI handler, so we are fine
24265- * with ignoring this one.
24266+ * Modify the "iret" frame to point to repeat_nmi, forcing another
24267+ * iteration of NMI handling.
24268 */
24269- movq $repeat_nmi, %rdx
24270- cmpq 8(%rsp), %rdx
24271- ja 1f
24272- movq $end_repeat_nmi, %rdx
24273- cmpq 8(%rsp), %rdx
24274- ja nested_nmi_out
24275-
24276-1:
24277- /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24278- leaq -1*8(%rsp), %rdx
24279- movq %rdx, %rsp
24280+ subq $8, %rsp
24281 CFI_ADJUST_CFA_OFFSET 1*8
24282 leaq -10*8(%rsp), %rdx
24283 pushq_cfi $__KERNEL_DS
24284@@ -1499,60 +2141,24 @@ nested_nmi_out:
24285 popq_cfi %rdx
24286 CFI_RESTORE rdx
24287
24288- /* No need to check faults here */
24289+ /* We are returning to kernel mode, so this cannot result in a fault. */
24290+# pax_force_retaddr_bts
24291 INTERRUPT_RETURN
24292
24293 CFI_RESTORE_STATE
24294 first_nmi:
24295- /*
24296- * Because nested NMIs will use the pushed location that we
24297- * stored in rdx, we must keep that space available.
24298- * Here's what our stack frame will look like:
24299- * +-------------------------+
24300- * | original SS |
24301- * | original Return RSP |
24302- * | original RFLAGS |
24303- * | original CS |
24304- * | original RIP |
24305- * +-------------------------+
24306- * | temp storage for rdx |
24307- * +-------------------------+
24308- * | NMI executing variable |
24309- * +-------------------------+
24310- * | copied SS |
24311- * | copied Return RSP |
24312- * | copied RFLAGS |
24313- * | copied CS |
24314- * | copied RIP |
24315- * +-------------------------+
24316- * | Saved SS |
24317- * | Saved Return RSP |
24318- * | Saved RFLAGS |
24319- * | Saved CS |
24320- * | Saved RIP |
24321- * +-------------------------+
24322- * | pt_regs |
24323- * +-------------------------+
24324- *
24325- * The saved stack frame is used to fix up the copied stack frame
24326- * that a nested NMI may change to make the interrupted NMI iret jump
24327- * to the repeat_nmi. The original stack frame and the temp storage
24328- * is also used by nested NMIs and can not be trusted on exit.
24329- */
24330- /* Do not pop rdx, nested NMIs will corrupt that part of the stack */
24331+ /* Restore rdx. */
24332 movq (%rsp), %rdx
24333 CFI_RESTORE rdx
24334
24335 /* Set the NMI executing variable on the stack. */
24336 pushq_cfi $1
24337
24338- /*
24339- * Leave room for the "copied" frame
24340- */
24341+ /* Leave room for the "iret" frame */
24342 subq $(5*8), %rsp
24343 CFI_ADJUST_CFA_OFFSET 5*8
24344
24345- /* Copy the stack frame to the Saved frame */
24346+ /* Copy the "original" frame to the "outermost" frame */
24347 .rept 5
24348 pushq_cfi 11*8(%rsp)
24349 .endr
24350@@ -1560,6 +2166,7 @@ first_nmi:
24351
24352 /* Everything up to here is safe from nested NMIs */
24353
24354+repeat_nmi:
24355 /*
24356 * If there was a nested NMI, the first NMI's iret will return
24357 * here. But NMIs are still enabled and we can take another
24358@@ -1568,16 +2175,21 @@ first_nmi:
24359 * it will just return, as we are about to repeat an NMI anyway.
24360 * This makes it safe to copy to the stack frame that a nested
24361 * NMI will update.
24362- */
24363-repeat_nmi:
24364- /*
24365- * Update the stack variable to say we are still in NMI (the update
24366- * is benign for the non-repeat case, where 1 was pushed just above
24367- * to this very stack slot).
24368+ *
24369+ * RSP is pointing to "outermost RIP". gsbase is unknown, but, if
24370+ * we're repeating an NMI, gsbase has the same value that it had on
24371+ * the first iteration. paranoid_entry will load the kernel
24372+ * gsbase if needed before we call do_nmi.
24373+ *
24374+ * Set "NMI executing" in case we came back here via IRET.
24375 */
24376 movq $1, 10*8(%rsp)
24377
24378- /* Make another copy, this one may be modified by nested NMIs */
24379+ /*
24380+ * Copy the "outermost" frame to the "iret" frame. NMIs that nest
24381+ * here must not modify the "iret" frame while we're writing to
24382+ * it or it will end up containing garbage.
24383+ */
24384 addq $(10*8), %rsp
24385 CFI_ADJUST_CFA_OFFSET -10*8
24386 .rept 5
24387@@ -1588,66 +2200,65 @@ repeat_nmi:
24388 end_repeat_nmi:
24389
24390 /*
24391- * Everything below this point can be preempted by a nested
24392- * NMI if the first NMI took an exception and reset our iret stack
24393- * so that we repeat another NMI.
24394+ * Everything below this point can be preempted by a nested NMI.
24395+ * If this happens, then the inner NMI will change the "iret"
24396+ * frame to point back to repeat_nmi.
24397 */
24398 pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
24399 ALLOC_PT_GPREGS_ON_STACK
24400
24401 /*
24402- * Use paranoid_entry to handle SWAPGS, but no need to use paranoid_exit
24403+ * Use paranoid_entry_nmi to handle SWAPGS, but no need to use paranoid_exit
24404 * as we should not be calling schedule in NMI context.
24405 * Even with normal interrupts enabled. An NMI should not be
24406 * setting NEED_RESCHED or anything that normal interrupts and
24407 * exceptions might do.
24408 */
24409- call paranoid_entry
24410+ call paranoid_entry_nmi
24411 DEFAULT_FRAME 0
24412
24413- /*
24414- * Save off the CR2 register. If we take a page fault in the NMI then
24415- * it could corrupt the CR2 value. If the NMI preempts a page fault
24416- * handler before it was able to read the CR2 register, and then the
24417- * NMI itself takes a page fault, the page fault that was preempted
24418- * will read the information from the NMI page fault and not the
24419- * origin fault. Save it off and restore it if it changes.
24420- * Use the r12 callee-saved register.
24421- */
24422- movq %cr2, %r12
24423-
24424 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24425 movq %rsp,%rdi
24426 movq $-1,%rsi
24427 call do_nmi
24428
24429- /* Did the NMI take a page fault? Restore cr2 if it did */
24430- movq %cr2, %rcx
24431- cmpq %rcx, %r12
24432- je 1f
24433- movq %r12, %cr2
24434-1:
24435-
24436- testl %ebx,%ebx /* swapgs needed? */
24437+ testl $1,%ebx /* swapgs needed? */
24438 jnz nmi_restore
24439 nmi_swapgs:
24440 SWAPGS_UNSAFE_STACK
24441 nmi_restore:
24442+ pax_exit_kernel_nmi
24443 RESTORE_EXTRA_REGS
24444 RESTORE_C_REGS
24445- /* Pop the extra iret frame at once */
24446+
24447 REMOVE_PT_GPREGS_FROM_STACK 6*8
24448
24449- /* Clear the NMI executing stack variable */
24450- movq $0, 5*8(%rsp)
24451- jmp irq_return
24452+ pax_force_retaddr_bts
24453+
24454+ /*
24455+ * Clear "NMI executing". Set DF first so that we can easily
24456+ * distinguish the remaining code between here and IRET from
24457+ * the SYSCALL entry and exit paths. On a native kernel, we
24458+ * could just inspect RIP, but, on paravirt kernels,
24459+ * INTERRUPT_RETURN can translate into a jump into a
24460+ * hypercall page.
24461+ */
24462+ std
24463+ movq $0, 5*8(%rsp) /* clear "NMI executing" */
24464+
24465+ /*
24466+ * INTERRUPT_RETURN reads the "iret" frame and exits the NMI
24467+ * stack in a single instruction. We are returning to kernel
24468+ * mode, so this cannot result in a fault.
24469+ */
24470+ INTERRUPT_RETURN
24471 CFI_ENDPROC
24472-END(nmi)
24473+ENDPROC(nmi)
24474
24475 ENTRY(ignore_sysret)
24476 CFI_STARTPROC
24477 mov $-ENOSYS,%eax
24478 sysret
24479 CFI_ENDPROC
24480-END(ignore_sysret)
24481+ENDPROC(ignore_sysret)
24482
24483diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24484index f5d0730..5bce89c 100644
24485--- a/arch/x86/kernel/espfix_64.c
24486+++ b/arch/x86/kernel/espfix_64.c
24487@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24488 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24489 static void *espfix_pages[ESPFIX_MAX_PAGES];
24490
24491-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24492- __aligned(PAGE_SIZE);
24493+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24494
24495 static unsigned int page_random, slot_random;
24496
24497@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24498 void __init init_espfix_bsp(void)
24499 {
24500 pgd_t *pgd_p;
24501+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24502
24503 /* Install the espfix pud into the kernel page directory */
24504- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24505+ pgd_p = &init_level4_pgt[index];
24506 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24507
24508+#ifdef CONFIG_PAX_PER_CPU_PGD
24509+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24510+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24511+#endif
24512+
24513 /* Randomize the locations */
24514 init_espfix_random();
24515
24516@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24517 set_pte(&pte_p[n*PTE_STRIDE], pte);
24518
24519 /* Job is done for this CPU and any CPU which shares this page */
24520- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24521+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24522
24523 unlock_done:
24524 mutex_unlock(&espfix_init_mutex);
24525diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24526index 8b7b0a5..02219db 100644
24527--- a/arch/x86/kernel/ftrace.c
24528+++ b/arch/x86/kernel/ftrace.c
24529@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24530 * kernel identity mapping to modify code.
24531 */
24532 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24533- ip = (unsigned long)__va(__pa_symbol(ip));
24534+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24535
24536 return ip;
24537 }
24538@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24539 {
24540 unsigned char replaced[MCOUNT_INSN_SIZE];
24541
24542+ ip = ktla_ktva(ip);
24543+
24544 /*
24545 * Note: Due to modules and __init, code can
24546 * disappear and change, we need to protect against faulting
24547@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24548 unsigned char old[MCOUNT_INSN_SIZE];
24549 int ret;
24550
24551- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24552+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24553
24554 ftrace_update_func = ip;
24555 /* Make sure the breakpoints see the ftrace_update_func update */
24556@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24557 unsigned char replaced[MCOUNT_INSN_SIZE];
24558 unsigned char brk = BREAKPOINT_INSTRUCTION;
24559
24560- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24561+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24562 return -EFAULT;
24563
24564 /* Make sure it is what we expect it to be */
24565@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24566 /* Module allocation simplifies allocating memory for code */
24567 static inline void *alloc_tramp(unsigned long size)
24568 {
24569- return module_alloc(size);
24570+ return module_alloc_exec(size);
24571 }
24572 static inline void tramp_free(void *tramp)
24573 {
24574- module_memfree(tramp);
24575+ module_memfree_exec(tramp);
24576 }
24577 #else
24578 /* Trampolines can only be created if modules are supported */
24579@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24580 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24581
24582 /* Copy ftrace_caller onto the trampoline memory */
24583+ pax_open_kernel();
24584 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24585+ pax_close_kernel();
24586 if (WARN_ON(ret < 0)) {
24587 tramp_free(trampoline);
24588 return 0;
24589@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24590
24591 /* The trampoline ends with a jmp to ftrace_return */
24592 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24593+ pax_open_kernel();
24594 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24595
24596 /*
24597@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24598
24599 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24600 *ptr = (unsigned long)ops;
24601+ pax_close_kernel();
24602
24603 op_offset -= start_offset;
24604 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24605@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24606 op_ptr.offset = offset;
24607
24608 /* put in the new offset to the ftrace_ops */
24609+ pax_open_kernel();
24610 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24611+ pax_close_kernel();
24612
24613 /* ALLOC_TRAMP flags lets us know we created it */
24614 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24615diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24616index 5a46681..1ef7ffa 100644
24617--- a/arch/x86/kernel/head64.c
24618+++ b/arch/x86/kernel/head64.c
24619@@ -68,12 +68,12 @@ again:
24620 pgd = *pgd_p;
24621
24622 /*
24623- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24624- * critical -- __PAGE_OFFSET would point us back into the dynamic
24625+ * The use of __early_va rather than __va here is critical:
24626+ * __va would point us back into the dynamic
24627 * range and we might end up looping forever...
24628 */
24629 if (pgd)
24630- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24631+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24632 else {
24633 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24634 reset_early_page_tables();
24635@@ -83,13 +83,13 @@ again:
24636 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24637 for (i = 0; i < PTRS_PER_PUD; i++)
24638 pud_p[i] = 0;
24639- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24640+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24641 }
24642 pud_p += pud_index(address);
24643 pud = *pud_p;
24644
24645 if (pud)
24646- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24647+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24648 else {
24649 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24650 reset_early_page_tables();
24651@@ -99,7 +99,7 @@ again:
24652 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24653 for (i = 0; i < PTRS_PER_PMD; i++)
24654 pmd_p[i] = 0;
24655- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24656+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24657 }
24658 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24659 pmd_p[pmd_index(address)] = pmd;
24660@@ -177,7 +177,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24661 */
24662 load_ucode_bsp();
24663
24664- clear_page(init_level4_pgt);
24665 /* set init_level4_pgt kernel high mapping*/
24666 init_level4_pgt[511] = early_level4_pgt[511];
24667
24668diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24669index 7e429c9..7244a52 100644
24670--- a/arch/x86/kernel/head_32.S
24671+++ b/arch/x86/kernel/head_32.S
24672@@ -27,6 +27,12 @@
24673 /* Physical address */
24674 #define pa(X) ((X) - __PAGE_OFFSET)
24675
24676+#ifdef CONFIG_PAX_KERNEXEC
24677+#define ta(X) (X)
24678+#else
24679+#define ta(X) ((X) - __PAGE_OFFSET)
24680+#endif
24681+
24682 /*
24683 * References to members of the new_cpu_data structure.
24684 */
24685@@ -56,11 +62,7 @@
24686 * and small than max_low_pfn, otherwise will waste some page table entries
24687 */
24688
24689-#if PTRS_PER_PMD > 1
24690-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24691-#else
24692-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24693-#endif
24694+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24695
24696 /*
24697 * Number of possible pages in the lowmem region.
24698@@ -86,6 +88,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24699 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24700
24701 /*
24702+ * Real beginning of normal "text" segment
24703+ */
24704+ENTRY(stext)
24705+ENTRY(_stext)
24706+
24707+/*
24708 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24709 * %esi points to the real-mode code as a 32-bit pointer.
24710 * CS and DS must be 4 GB flat segments, but we don't depend on
24711@@ -93,6 +101,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24712 * can.
24713 */
24714 __HEAD
24715+
24716+#ifdef CONFIG_PAX_KERNEXEC
24717+ jmp startup_32
24718+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24719+.fill PAGE_SIZE-5,1,0xcc
24720+#endif
24721+
24722 ENTRY(startup_32)
24723 movl pa(stack_start),%ecx
24724
24725@@ -114,6 +129,59 @@ ENTRY(startup_32)
24726 2:
24727 leal -__PAGE_OFFSET(%ecx),%esp
24728
24729+#ifdef CONFIG_SMP
24730+ movl $pa(cpu_gdt_table),%edi
24731+ movl $__per_cpu_load,%eax
24732+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24733+ rorl $16,%eax
24734+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24735+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24736+ movl $__per_cpu_end - 1,%eax
24737+ subl $__per_cpu_start,%eax
24738+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24739+#endif
24740+
24741+#ifdef CONFIG_PAX_MEMORY_UDEREF
24742+ movl $NR_CPUS,%ecx
24743+ movl $pa(cpu_gdt_table),%edi
24744+1:
24745+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24746+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24747+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24748+ addl $PAGE_SIZE_asm,%edi
24749+ loop 1b
24750+#endif
24751+
24752+#ifdef CONFIG_PAX_KERNEXEC
24753+ movl $pa(boot_gdt),%edi
24754+ movl $__LOAD_PHYSICAL_ADDR,%eax
24755+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24756+ rorl $16,%eax
24757+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24758+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24759+ rorl $16,%eax
24760+
24761+ ljmp $(__BOOT_CS),$1f
24762+1:
24763+
24764+ movl $NR_CPUS,%ecx
24765+ movl $pa(cpu_gdt_table),%edi
24766+ addl $__PAGE_OFFSET,%eax
24767+1:
24768+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24769+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24770+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24771+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24772+ rorl $16,%eax
24773+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24774+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24775+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24776+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24777+ rorl $16,%eax
24778+ addl $PAGE_SIZE_asm,%edi
24779+ loop 1b
24780+#endif
24781+
24782 /*
24783 * Clear BSS first so that there are no surprises...
24784 */
24785@@ -209,8 +277,11 @@ ENTRY(startup_32)
24786 movl %eax, pa(max_pfn_mapped)
24787
24788 /* Do early initialization of the fixmap area */
24789- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24790- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24791+#ifdef CONFIG_COMPAT_VDSO
24792+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24793+#else
24794+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24795+#endif
24796 #else /* Not PAE */
24797
24798 page_pde_offset = (__PAGE_OFFSET >> 20);
24799@@ -240,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24800 movl %eax, pa(max_pfn_mapped)
24801
24802 /* Do early initialization of the fixmap area */
24803- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24804- movl %eax,pa(initial_page_table+0xffc)
24805+#ifdef CONFIG_COMPAT_VDSO
24806+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24807+#else
24808+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24809+#endif
24810 #endif
24811
24812 #ifdef CONFIG_PARAVIRT
24813@@ -255,9 +329,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24814 cmpl $num_subarch_entries, %eax
24815 jae bad_subarch
24816
24817- movl pa(subarch_entries)(,%eax,4), %eax
24818- subl $__PAGE_OFFSET, %eax
24819- jmp *%eax
24820+ jmp *pa(subarch_entries)(,%eax,4)
24821
24822 bad_subarch:
24823 WEAK(lguest_entry)
24824@@ -269,10 +341,10 @@ WEAK(xen_entry)
24825 __INITDATA
24826
24827 subarch_entries:
24828- .long default_entry /* normal x86/PC */
24829- .long lguest_entry /* lguest hypervisor */
24830- .long xen_entry /* Xen hypervisor */
24831- .long default_entry /* Moorestown MID */
24832+ .long ta(default_entry) /* normal x86/PC */
24833+ .long ta(lguest_entry) /* lguest hypervisor */
24834+ .long ta(xen_entry) /* Xen hypervisor */
24835+ .long ta(default_entry) /* Moorestown MID */
24836 num_subarch_entries = (. - subarch_entries) / 4
24837 .previous
24838 #else
24839@@ -362,6 +434,7 @@ default_entry:
24840 movl pa(mmu_cr4_features),%eax
24841 movl %eax,%cr4
24842
24843+#ifdef CONFIG_X86_PAE
24844 testb $X86_CR4_PAE, %al # check if PAE is enabled
24845 jz enable_paging
24846
24847@@ -390,6 +463,9 @@ default_entry:
24848 /* Make changes effective */
24849 wrmsr
24850
24851+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24852+#endif
24853+
24854 enable_paging:
24855
24856 /*
24857@@ -457,14 +533,20 @@ is486:
24858 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24859 movl %eax,%ss # after changing gdt.
24860
24861- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24862+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24863 movl %eax,%ds
24864 movl %eax,%es
24865
24866 movl $(__KERNEL_PERCPU), %eax
24867 movl %eax,%fs # set this cpu's percpu
24868
24869+#ifdef CONFIG_CC_STACKPROTECTOR
24870 movl $(__KERNEL_STACK_CANARY),%eax
24871+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24872+ movl $(__USER_DS),%eax
24873+#else
24874+ xorl %eax,%eax
24875+#endif
24876 movl %eax,%gs
24877
24878 xorl %eax,%eax # Clear LDT
24879@@ -521,8 +603,11 @@ setup_once:
24880 * relocation. Manually set base address in stack canary
24881 * segment descriptor.
24882 */
24883- movl $gdt_page,%eax
24884+ movl $cpu_gdt_table,%eax
24885 movl $stack_canary,%ecx
24886+#ifdef CONFIG_SMP
24887+ addl $__per_cpu_load,%ecx
24888+#endif
24889 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24890 shrl $16, %ecx
24891 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24892@@ -559,7 +644,7 @@ early_idt_handler_common:
24893 cmpl $2,(%esp) # X86_TRAP_NMI
24894 je is_nmi # Ignore NMI
24895
24896- cmpl $2,%ss:early_recursion_flag
24897+ cmpl $1,%ss:early_recursion_flag
24898 je hlt_loop
24899 incl %ss:early_recursion_flag
24900
24901@@ -597,8 +682,8 @@ early_idt_handler_common:
24902 pushl (20+6*4)(%esp) /* trapno */
24903 pushl $fault_msg
24904 call printk
24905-#endif
24906 call dump_stack
24907+#endif
24908 hlt_loop:
24909 hlt
24910 jmp hlt_loop
24911@@ -618,8 +703,11 @@ ENDPROC(early_idt_handler_common)
24912 /* This is the default interrupt "handler" :-) */
24913 ALIGN
24914 ignore_int:
24915- cld
24916 #ifdef CONFIG_PRINTK
24917+ cmpl $2,%ss:early_recursion_flag
24918+ je hlt_loop
24919+ incl %ss:early_recursion_flag
24920+ cld
24921 pushl %eax
24922 pushl %ecx
24923 pushl %edx
24924@@ -628,9 +716,6 @@ ignore_int:
24925 movl $(__KERNEL_DS),%eax
24926 movl %eax,%ds
24927 movl %eax,%es
24928- cmpl $2,early_recursion_flag
24929- je hlt_loop
24930- incl early_recursion_flag
24931 pushl 16(%esp)
24932 pushl 24(%esp)
24933 pushl 32(%esp)
24934@@ -664,29 +749,34 @@ ENTRY(setup_once_ref)
24935 /*
24936 * BSS section
24937 */
24938-__PAGE_ALIGNED_BSS
24939- .align PAGE_SIZE
24940 #ifdef CONFIG_X86_PAE
24941+.section .initial_pg_pmd,"a",@progbits
24942 initial_pg_pmd:
24943 .fill 1024*KPMDS,4,0
24944 #else
24945+.section .initial_page_table,"a",@progbits
24946 ENTRY(initial_page_table)
24947 .fill 1024,4,0
24948 #endif
24949+.section .initial_pg_fixmap,"a",@progbits
24950 initial_pg_fixmap:
24951 .fill 1024,4,0
24952+.section .empty_zero_page,"a",@progbits
24953 ENTRY(empty_zero_page)
24954 .fill 4096,1,0
24955+.section .swapper_pg_dir,"a",@progbits
24956 ENTRY(swapper_pg_dir)
24957+#ifdef CONFIG_X86_PAE
24958+ .fill 4,8,0
24959+#else
24960 .fill 1024,4,0
24961+#endif
24962
24963 /*
24964 * This starts the data section.
24965 */
24966 #ifdef CONFIG_X86_PAE
24967-__PAGE_ALIGNED_DATA
24968- /* Page-aligned for the benefit of paravirt? */
24969- .align PAGE_SIZE
24970+.section .initial_page_table,"a",@progbits
24971 ENTRY(initial_page_table)
24972 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24973 # if KPMDS == 3
24974@@ -705,12 +795,20 @@ ENTRY(initial_page_table)
24975 # error "Kernel PMDs should be 1, 2 or 3"
24976 # endif
24977 .align PAGE_SIZE /* needs to be page-sized too */
24978+
24979+#ifdef CONFIG_PAX_PER_CPU_PGD
24980+ENTRY(cpu_pgd)
24981+ .rept 2*NR_CPUS
24982+ .fill 4,8,0
24983+ .endr
24984+#endif
24985+
24986 #endif
24987
24988 .data
24989 .balign 4
24990 ENTRY(stack_start)
24991- .long init_thread_union+THREAD_SIZE
24992+ .long init_thread_union+THREAD_SIZE-8
24993
24994 __INITRODATA
24995 int_msg:
24996@@ -738,7 +836,7 @@ fault_msg:
24997 * segment size, and 32-bit linear address value:
24998 */
24999
25000- .data
25001+.section .rodata,"a",@progbits
25002 .globl boot_gdt_descr
25003 .globl idt_descr
25004
25005@@ -747,7 +845,7 @@ fault_msg:
25006 .word 0 # 32 bit align gdt_desc.address
25007 boot_gdt_descr:
25008 .word __BOOT_DS+7
25009- .long boot_gdt - __PAGE_OFFSET
25010+ .long pa(boot_gdt)
25011
25012 .word 0 # 32-bit align idt_desc.address
25013 idt_descr:
25014@@ -758,7 +856,7 @@ idt_descr:
25015 .word 0 # 32 bit align gdt_desc.address
25016 ENTRY(early_gdt_descr)
25017 .word GDT_ENTRIES*8-1
25018- .long gdt_page /* Overwritten for secondary CPUs */
25019+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
25020
25021 /*
25022 * The boot_gdt must mirror the equivalent in setup.S and is
25023@@ -767,5 +865,65 @@ ENTRY(early_gdt_descr)
25024 .align L1_CACHE_BYTES
25025 ENTRY(boot_gdt)
25026 .fill GDT_ENTRY_BOOT_CS,8,0
25027- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
25028- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
25029+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
25030+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
25031+
25032+ .align PAGE_SIZE_asm
25033+ENTRY(cpu_gdt_table)
25034+ .rept NR_CPUS
25035+ .quad 0x0000000000000000 /* NULL descriptor */
25036+ .quad 0x0000000000000000 /* 0x0b reserved */
25037+ .quad 0x0000000000000000 /* 0x13 reserved */
25038+ .quad 0x0000000000000000 /* 0x1b reserved */
25039+
25040+#ifdef CONFIG_PAX_KERNEXEC
25041+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
25042+#else
25043+ .quad 0x0000000000000000 /* 0x20 unused */
25044+#endif
25045+
25046+ .quad 0x0000000000000000 /* 0x28 unused */
25047+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
25048+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
25049+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
25050+ .quad 0x0000000000000000 /* 0x4b reserved */
25051+ .quad 0x0000000000000000 /* 0x53 reserved */
25052+ .quad 0x0000000000000000 /* 0x5b reserved */
25053+
25054+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
25055+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
25056+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
25057+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
25058+
25059+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
25060+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
25061+
25062+ /*
25063+ * Segments used for calling PnP BIOS have byte granularity.
25064+ * The code segments and data segments have fixed 64k limits,
25065+ * the transfer segment sizes are set at run time.
25066+ */
25067+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
25068+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
25069+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
25070+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
25071+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
25072+
25073+ /*
25074+ * The APM segments have byte granularity and their bases
25075+ * are set at run time. All have 64k limits.
25076+ */
25077+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
25078+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
25079+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
25080+
25081+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
25082+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
25083+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
25084+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
25085+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
25086+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
25087+
25088+ /* Be sure this is zeroed to avoid false validations in Xen */
25089+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
25090+ .endr
25091diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
25092index df7e780..e97a497 100644
25093--- a/arch/x86/kernel/head_64.S
25094+++ b/arch/x86/kernel/head_64.S
25095@@ -20,6 +20,8 @@
25096 #include <asm/processor-flags.h>
25097 #include <asm/percpu.h>
25098 #include <asm/nops.h>
25099+#include <asm/cpufeature.h>
25100+#include <asm/alternative-asm.h>
25101
25102 #ifdef CONFIG_PARAVIRT
25103 #include <asm/asm-offsets.h>
25104@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
25105 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
25106 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
25107 L3_START_KERNEL = pud_index(__START_KERNEL_map)
25108+L4_VMALLOC_START = pgd_index(VMALLOC_START)
25109+L3_VMALLOC_START = pud_index(VMALLOC_START)
25110+L4_VMALLOC_END = pgd_index(VMALLOC_END)
25111+L3_VMALLOC_END = pud_index(VMALLOC_END)
25112+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
25113+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
25114
25115 .text
25116 __HEAD
25117@@ -89,11 +97,26 @@ startup_64:
25118 * Fixup the physical addresses in the page table
25119 */
25120 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
25121+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
25122+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
25123+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
25124+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
25125+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
25126
25127- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
25128- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
25129+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
25130+#ifndef CONFIG_XEN
25131+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
25132+#endif
25133
25134+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
25135+
25136+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
25137+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
25138+
25139+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
25140+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
25141 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
25142+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
25143
25144 /*
25145 * Set up the identity mapping for the switchover. These
25146@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
25147 * after the boot processor executes this code.
25148 */
25149
25150+ orq $-1, %rbp
25151 movq $(init_level4_pgt - __START_KERNEL_map), %rax
25152 1:
25153
25154- /* Enable PAE mode and PGE */
25155- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
25156+ /* Enable PAE mode and PSE/PGE */
25157+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
25158 movq %rcx, %cr4
25159
25160 /* Setup early boot stage 4 level pagetables. */
25161@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
25162 movl $MSR_EFER, %ecx
25163 rdmsr
25164 btsl $_EFER_SCE, %eax /* Enable System Call */
25165- btl $20,%edi /* No Execute supported? */
25166+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
25167 jnc 1f
25168 btsl $_EFER_NX, %eax
25169+ cmpq $-1, %rbp
25170+ je 1f
25171 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
25172+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
25173+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
25174+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
25175+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
25176+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
25177+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
25178+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
25179+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
25180+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
25181 1: wrmsr /* Make changes effective */
25182
25183 /* Setup cr0 */
25184@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
25185 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
25186 * address given in m16:64.
25187 */
25188+ pax_set_fptr_mask
25189 movq initial_code(%rip),%rax
25190 pushq $0 # fake return address to stop unwinder
25191 pushq $__KERNEL_CS # set correct cs
25192@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
25193 .quad INIT_PER_CPU_VAR(irq_stack_union)
25194
25195 GLOBAL(stack_start)
25196- .quad init_thread_union+THREAD_SIZE-8
25197+ .quad init_thread_union+THREAD_SIZE-16
25198 .word 0
25199 __FINITDATA
25200
25201@@ -393,7 +429,7 @@ early_idt_handler_common:
25202 call dump_stack
25203 #ifdef CONFIG_KALLSYMS
25204 leaq early_idt_ripmsg(%rip),%rdi
25205- movq 40(%rsp),%rsi # %rip again
25206+ movq 88(%rsp),%rsi # %rip again
25207 call __print_symbol
25208 #endif
25209 #endif /* EARLY_PRINTK */
25210@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
25211 early_recursion_flag:
25212 .long 0
25213
25214+ .section .rodata,"a",@progbits
25215 #ifdef CONFIG_EARLY_PRINTK
25216 early_idt_msg:
25217 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
25218@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
25219 NEXT_PAGE(early_dynamic_pgts)
25220 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
25221
25222- .data
25223+ .section .rodata,"a",@progbits
25224
25225-#ifndef CONFIG_XEN
25226 NEXT_PAGE(init_level4_pgt)
25227- .fill 512,8,0
25228-#else
25229-NEXT_PAGE(init_level4_pgt)
25230- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25231 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
25232 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25233+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
25234+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
25235+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
25236+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
25237+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
25238+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25239 .org init_level4_pgt + L4_START_KERNEL*8, 0
25240 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
25241 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
25242
25243+#ifdef CONFIG_PAX_PER_CPU_PGD
25244+NEXT_PAGE(cpu_pgd)
25245+ .rept 2*NR_CPUS
25246+ .fill 512,8,0
25247+ .endr
25248+#endif
25249+
25250 NEXT_PAGE(level3_ident_pgt)
25251 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25252+#ifdef CONFIG_XEN
25253 .fill 511, 8, 0
25254+#else
25255+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
25256+ .fill 510,8,0
25257+#endif
25258+
25259+NEXT_PAGE(level3_vmalloc_start_pgt)
25260+ .fill 512,8,0
25261+
25262+NEXT_PAGE(level3_vmalloc_end_pgt)
25263+ .fill 512,8,0
25264+
25265+NEXT_PAGE(level3_vmemmap_pgt)
25266+ .fill L3_VMEMMAP_START,8,0
25267+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25268+
25269 NEXT_PAGE(level2_ident_pgt)
25270- /* Since I easily can, map the first 1G.
25271+ /* Since I easily can, map the first 2G.
25272 * Don't set NX because code runs from these pages.
25273 */
25274- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25275-#endif
25276+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25277
25278 NEXT_PAGE(level3_kernel_pgt)
25279 .fill L3_START_KERNEL,8,0
25280@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25281 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25282 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25283
25284+NEXT_PAGE(level2_vmemmap_pgt)
25285+ .fill 512,8,0
25286+
25287 NEXT_PAGE(level2_kernel_pgt)
25288 /*
25289 * 512 MB kernel mapping. We spend a full page on this pagetable
25290@@ -494,23 +557,61 @@ NEXT_PAGE(level2_kernel_pgt)
25291 KERNEL_IMAGE_SIZE/PMD_SIZE)
25292
25293 NEXT_PAGE(level2_fixmap_pgt)
25294- .fill 506,8,0
25295- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25296- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25297- .fill 5,8,0
25298+ .fill 504,8,0
25299+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25300+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25301+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25302+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25303+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25304+ .fill 4,8,0
25305
25306 NEXT_PAGE(level1_fixmap_pgt)
25307+ .fill 3*512,8,0
25308+
25309+NEXT_PAGE(level1_vsyscall_pgt)
25310 .fill 512,8,0
25311
25312 #undef PMDS
25313
25314- .data
25315+ .align PAGE_SIZE
25316+ENTRY(cpu_gdt_table)
25317+ .rept NR_CPUS
25318+ .quad 0x0000000000000000 /* NULL descriptor */
25319+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25320+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25321+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25322+ .quad 0x00cffb000000ffff /* __USER32_CS */
25323+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25324+ .quad 0x00affb000000ffff /* __USER_CS */
25325+
25326+#ifdef CONFIG_PAX_KERNEXEC
25327+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25328+#else
25329+ .quad 0x0 /* unused */
25330+#endif
25331+
25332+ .quad 0,0 /* TSS */
25333+ .quad 0,0 /* LDT */
25334+ .quad 0,0,0 /* three TLS descriptors */
25335+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25336+ /* asm/segment.h:GDT_ENTRIES must match this */
25337+
25338+#ifdef CONFIG_PAX_MEMORY_UDEREF
25339+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25340+#else
25341+ .quad 0x0 /* unused */
25342+#endif
25343+
25344+ /* zero the remaining page */
25345+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25346+ .endr
25347+
25348 .align 16
25349 .globl early_gdt_descr
25350 early_gdt_descr:
25351 .word GDT_ENTRIES*8-1
25352 early_gdt_descr_base:
25353- .quad INIT_PER_CPU_VAR(gdt_page)
25354+ .quad cpu_gdt_table
25355
25356 ENTRY(phys_base)
25357 /* This must match the first entry in level2_kernel_pgt */
25358@@ -534,8 +635,8 @@ NEXT_PAGE(kasan_zero_pud)
25359
25360
25361 #include "../../x86/xen/xen-head.S"
25362-
25363- __PAGE_ALIGNED_BSS
25364+
25365+ .section .rodata,"a",@progbits
25366 NEXT_PAGE(empty_zero_page)
25367 .skip PAGE_SIZE
25368
25369diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25370index 05fd74f..c3548b1 100644
25371--- a/arch/x86/kernel/i386_ksyms_32.c
25372+++ b/arch/x86/kernel/i386_ksyms_32.c
25373@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25374 EXPORT_SYMBOL(cmpxchg8b_emu);
25375 #endif
25376
25377+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25378+
25379 /* Networking helper routines. */
25380 EXPORT_SYMBOL(csum_partial_copy_generic);
25381+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25382+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25383
25384 EXPORT_SYMBOL(__get_user_1);
25385 EXPORT_SYMBOL(__get_user_2);
25386@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25387 EXPORT_SYMBOL(___preempt_schedule_context);
25388 #endif
25389 #endif
25390+
25391+#ifdef CONFIG_PAX_KERNEXEC
25392+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25393+#endif
25394+
25395+#ifdef CONFIG_PAX_PER_CPU_PGD
25396+EXPORT_SYMBOL(cpu_pgd);
25397+#endif
25398diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25399index e7cc537..67d7372 100644
25400--- a/arch/x86/kernel/i8259.c
25401+++ b/arch/x86/kernel/i8259.c
25402@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25403 static void make_8259A_irq(unsigned int irq)
25404 {
25405 disable_irq_nosync(irq);
25406- io_apic_irqs &= ~(1<<irq);
25407+ io_apic_irqs &= ~(1UL<<irq);
25408 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25409 enable_irq(irq);
25410 }
25411@@ -208,7 +208,7 @@ spurious_8259A_irq:
25412 "spurious 8259A interrupt: IRQ%d.\n", irq);
25413 spurious_irq_mask |= irqmask;
25414 }
25415- atomic_inc(&irq_err_count);
25416+ atomic_inc_unchecked(&irq_err_count);
25417 /*
25418 * Theoretically we do not have to handle this IRQ,
25419 * but in Linux this does not cause problems and is
25420@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25421 /* (slave's support for AEOI in flat mode is to be investigated) */
25422 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25423
25424+ pax_open_kernel();
25425 if (auto_eoi)
25426 /*
25427 * In AEOI mode we just have to mask the interrupt
25428 * when acking.
25429 */
25430- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25431+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25432 else
25433- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25434+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25435+ pax_close_kernel();
25436
25437 udelay(100); /* wait for 8259A to initialize */
25438
25439diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25440index a979b5b..1d6db75 100644
25441--- a/arch/x86/kernel/io_delay.c
25442+++ b/arch/x86/kernel/io_delay.c
25443@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25444 * Quirk table for systems that misbehave (lock up, etc.) if port
25445 * 0x80 is used:
25446 */
25447-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25448+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25449 {
25450 .callback = dmi_io_delay_0xed_port,
25451 .ident = "Compaq Presario V6000",
25452diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25453index 37dae79..620dd84 100644
25454--- a/arch/x86/kernel/ioport.c
25455+++ b/arch/x86/kernel/ioport.c
25456@@ -6,6 +6,7 @@
25457 #include <linux/sched.h>
25458 #include <linux/kernel.h>
25459 #include <linux/capability.h>
25460+#include <linux/security.h>
25461 #include <linux/errno.h>
25462 #include <linux/types.h>
25463 #include <linux/ioport.h>
25464@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25465 return -EINVAL;
25466 if (turn_on && !capable(CAP_SYS_RAWIO))
25467 return -EPERM;
25468+#ifdef CONFIG_GRKERNSEC_IO
25469+ if (turn_on && grsec_disable_privio) {
25470+ gr_handle_ioperm();
25471+ return -ENODEV;
25472+ }
25473+#endif
25474
25475 /*
25476 * If it's the first ioperm() call in this thread's lifetime, set the
25477@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25478 * because the ->io_bitmap_max value must match the bitmap
25479 * contents:
25480 */
25481- tss = &per_cpu(cpu_tss, get_cpu());
25482+ tss = cpu_tss + get_cpu();
25483
25484 if (turn_on)
25485 bitmap_clear(t->io_bitmap_ptr, from, num);
25486@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25487 if (level > old) {
25488 if (!capable(CAP_SYS_RAWIO))
25489 return -EPERM;
25490+#ifdef CONFIG_GRKERNSEC_IO
25491+ if (grsec_disable_privio) {
25492+ gr_handle_iopl();
25493+ return -ENODEV;
25494+ }
25495+#endif
25496 }
25497 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25498 t->iopl = level << 12;
25499diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25500index e5952c2..11c3a54 100644
25501--- a/arch/x86/kernel/irq.c
25502+++ b/arch/x86/kernel/irq.c
25503@@ -22,7 +22,7 @@
25504 #define CREATE_TRACE_POINTS
25505 #include <asm/trace/irq_vectors.h>
25506
25507-atomic_t irq_err_count;
25508+atomic_unchecked_t irq_err_count;
25509
25510 /* Function pointer for generic interrupt vector handling */
25511 void (*x86_platform_ipi_callback)(void) = NULL;
25512@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25513 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25514 seq_puts(p, " Hypervisor callback interrupts\n");
25515 #endif
25516- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25517+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25518 #if defined(CONFIG_X86_IO_APIC)
25519- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25520+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25521 #endif
25522 return 0;
25523 }
25524@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25525
25526 u64 arch_irq_stat(void)
25527 {
25528- u64 sum = atomic_read(&irq_err_count);
25529+ u64 sum = atomic_read_unchecked(&irq_err_count);
25530 return sum;
25531 }
25532
25533diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25534index f9fd86a..e6cc9ae 100644
25535--- a/arch/x86/kernel/irq_32.c
25536+++ b/arch/x86/kernel/irq_32.c
25537@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25538
25539 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25540
25541+extern void gr_handle_kernel_exploit(void);
25542+
25543 int sysctl_panic_on_stackoverflow __read_mostly;
25544
25545 /* Debugging check for stack overflow: is there less than 1KB free? */
25546@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25547 __asm__ __volatile__("andl %%esp,%0" :
25548 "=r" (sp) : "0" (THREAD_SIZE - 1));
25549
25550- return sp < (sizeof(struct thread_info) + STACK_WARN);
25551+ return sp < STACK_WARN;
25552 }
25553
25554 static void print_stack_overflow(void)
25555 {
25556 printk(KERN_WARNING "low stack detected by irq handler\n");
25557 dump_stack();
25558+ gr_handle_kernel_exploit();
25559 if (sysctl_panic_on_stackoverflow)
25560 panic("low stack detected by irq handler - check messages\n");
25561 }
25562@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25563 static inline int
25564 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25565 {
25566- struct irq_stack *curstk, *irqstk;
25567+ struct irq_stack *irqstk;
25568 u32 *isp, *prev_esp, arg1, arg2;
25569
25570- curstk = (struct irq_stack *) current_stack();
25571 irqstk = __this_cpu_read(hardirq_stack);
25572
25573 /*
25574@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25575 * handler) we can't do that and just have to keep using the
25576 * current stack (which is the irq stack already after all)
25577 */
25578- if (unlikely(curstk == irqstk))
25579+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25580 return 0;
25581
25582- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25583+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25584
25585 /* Save the next esp at the bottom of the stack */
25586 prev_esp = (u32 *)irqstk;
25587 *prev_esp = current_stack_pointer();
25588
25589+#ifdef CONFIG_PAX_MEMORY_UDEREF
25590+ __set_fs(MAKE_MM_SEG(0));
25591+#endif
25592+
25593 if (unlikely(overflow))
25594 call_on_stack(print_stack_overflow, isp);
25595
25596@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25597 : "0" (irq), "1" (desc), "2" (isp),
25598 "D" (desc->handle_irq)
25599 : "memory", "cc", "ecx");
25600+
25601+#ifdef CONFIG_PAX_MEMORY_UDEREF
25602+ __set_fs(current_thread_info()->addr_limit);
25603+#endif
25604+
25605 return 1;
25606 }
25607
25608@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25609 */
25610 void irq_ctx_init(int cpu)
25611 {
25612- struct irq_stack *irqstk;
25613-
25614 if (per_cpu(hardirq_stack, cpu))
25615 return;
25616
25617- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25618- THREADINFO_GFP,
25619- THREAD_SIZE_ORDER));
25620- per_cpu(hardirq_stack, cpu) = irqstk;
25621-
25622- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25623- THREADINFO_GFP,
25624- THREAD_SIZE_ORDER));
25625- per_cpu(softirq_stack, cpu) = irqstk;
25626-
25627- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25628- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25629+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25630+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25631 }
25632
25633 void do_softirq_own_stack(void)
25634 {
25635- struct thread_info *curstk;
25636 struct irq_stack *irqstk;
25637 u32 *isp, *prev_esp;
25638
25639- curstk = current_stack();
25640 irqstk = __this_cpu_read(softirq_stack);
25641
25642 /* build the stack frame on the softirq stack */
25643@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25644 prev_esp = (u32 *)irqstk;
25645 *prev_esp = current_stack_pointer();
25646
25647+#ifdef CONFIG_PAX_MEMORY_UDEREF
25648+ __set_fs(MAKE_MM_SEG(0));
25649+#endif
25650+
25651 call_on_stack(__do_softirq, isp);
25652+
25653+#ifdef CONFIG_PAX_MEMORY_UDEREF
25654+ __set_fs(current_thread_info()->addr_limit);
25655+#endif
25656+
25657 }
25658
25659 bool handle_irq(unsigned irq, struct pt_regs *regs)
25660diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25661index 394e643..824fce8 100644
25662--- a/arch/x86/kernel/irq_64.c
25663+++ b/arch/x86/kernel/irq_64.c
25664@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25665 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25666 EXPORT_PER_CPU_SYMBOL(irq_regs);
25667
25668+extern void gr_handle_kernel_exploit(void);
25669+
25670 int sysctl_panic_on_stackoverflow;
25671
25672 /*
25673@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25674 irq_stack_top, irq_stack_bottom,
25675 estack_top, estack_bottom);
25676
25677+ gr_handle_kernel_exploit();
25678+
25679 if (sysctl_panic_on_stackoverflow)
25680 panic("low stack detected by irq handler - check messages\n");
25681 #endif
25682diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25683index 26d5a55..a01160a 100644
25684--- a/arch/x86/kernel/jump_label.c
25685+++ b/arch/x86/kernel/jump_label.c
25686@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25687 * Jump label is enabled for the first time.
25688 * So we expect a default_nop...
25689 */
25690- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25691+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25692 != 0))
25693 bug_at((void *)entry->code, __LINE__);
25694 } else {
25695@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25696 * ...otherwise expect an ideal_nop. Otherwise
25697 * something went horribly wrong.
25698 */
25699- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25700+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25701 != 0))
25702 bug_at((void *)entry->code, __LINE__);
25703 }
25704@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25705 * are converting the default nop to the ideal nop.
25706 */
25707 if (init) {
25708- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25709+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25710 bug_at((void *)entry->code, __LINE__);
25711 } else {
25712 code.jump = 0xe9;
25713 code.offset = entry->target -
25714 (entry->code + JUMP_LABEL_NOP_SIZE);
25715- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25716+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25717 bug_at((void *)entry->code, __LINE__);
25718 }
25719 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25720diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25721index d6178d9..e12482f 100644
25722--- a/arch/x86/kernel/kgdb.c
25723+++ b/arch/x86/kernel/kgdb.c
25724@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25725 bp->attr.bp_addr = breakinfo[breakno].addr;
25726 bp->attr.bp_len = breakinfo[breakno].len;
25727 bp->attr.bp_type = breakinfo[breakno].type;
25728- info->address = breakinfo[breakno].addr;
25729+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25730+ info->address = ktla_ktva(breakinfo[breakno].addr);
25731+ else
25732+ info->address = breakinfo[breakno].addr;
25733 info->len = breakinfo[breakno].len;
25734 info->type = breakinfo[breakno].type;
25735 val = arch_install_hw_breakpoint(bp);
25736@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25737 case 'k':
25738 /* clear the trace bit */
25739 linux_regs->flags &= ~X86_EFLAGS_TF;
25740- atomic_set(&kgdb_cpu_doing_single_step, -1);
25741+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25742
25743 /* set the trace bit if we're stepping */
25744 if (remcomInBuffer[0] == 's') {
25745 linux_regs->flags |= X86_EFLAGS_TF;
25746- atomic_set(&kgdb_cpu_doing_single_step,
25747+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25748 raw_smp_processor_id());
25749 }
25750
25751@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25752
25753 switch (cmd) {
25754 case DIE_DEBUG:
25755- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25756+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25757 if (user_mode(regs))
25758 return single_step_cont(regs, args);
25759 break;
25760@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25761 #endif /* CONFIG_DEBUG_RODATA */
25762
25763 bpt->type = BP_BREAKPOINT;
25764- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25765+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25766 BREAK_INSTR_SIZE);
25767 if (err)
25768 return err;
25769- err = probe_kernel_write((char *)bpt->bpt_addr,
25770+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25771 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25772 #ifdef CONFIG_DEBUG_RODATA
25773 if (!err)
25774@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25775 return -EBUSY;
25776 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25777 BREAK_INSTR_SIZE);
25778- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25779+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25780 if (err)
25781 return err;
25782 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25783@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25784 if (mutex_is_locked(&text_mutex))
25785 goto knl_write;
25786 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25787- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25788+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25789 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25790 goto knl_write;
25791 return err;
25792 knl_write:
25793 #endif /* CONFIG_DEBUG_RODATA */
25794- return probe_kernel_write((char *)bpt->bpt_addr,
25795+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25796 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25797 }
25798
25799diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25800index 1deffe6..4705700 100644
25801--- a/arch/x86/kernel/kprobes/core.c
25802+++ b/arch/x86/kernel/kprobes/core.c
25803@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25804 s32 raddr;
25805 } __packed *insn;
25806
25807- insn = (struct __arch_relative_insn *)from;
25808+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25809+
25810+ pax_open_kernel();
25811 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25812 insn->op = op;
25813+ pax_close_kernel();
25814 }
25815
25816 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25817@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25818 kprobe_opcode_t opcode;
25819 kprobe_opcode_t *orig_opcodes = opcodes;
25820
25821- if (search_exception_tables((unsigned long)opcodes))
25822+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25823 return 0; /* Page fault may occur on this address. */
25824
25825 retry:
25826@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25827 * Fortunately, we know that the original code is the ideal 5-byte
25828 * long NOP.
25829 */
25830- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25831+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25832 if (faddr)
25833 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25834 else
25835 buf[0] = kp->opcode;
25836- return (unsigned long)buf;
25837+ return ktva_ktla((unsigned long)buf);
25838 }
25839
25840 /*
25841@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25842 /* Another subsystem puts a breakpoint, failed to recover */
25843 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25844 return 0;
25845+ pax_open_kernel();
25846 memcpy(dest, insn.kaddr, length);
25847+ pax_close_kernel();
25848
25849 #ifdef CONFIG_X86_64
25850 if (insn_rip_relative(&insn)) {
25851@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25852 return 0;
25853 }
25854 disp = (u8 *) dest + insn_offset_displacement(&insn);
25855+ pax_open_kernel();
25856 *(s32 *) disp = (s32) newdisp;
25857+ pax_close_kernel();
25858 }
25859 #endif
25860 return length;
25861@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25862 * nor set current_kprobe, because it doesn't use single
25863 * stepping.
25864 */
25865- regs->ip = (unsigned long)p->ainsn.insn;
25866+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25867 preempt_enable_no_resched();
25868 return;
25869 }
25870@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25871 regs->flags &= ~X86_EFLAGS_IF;
25872 /* single step inline if the instruction is an int3 */
25873 if (p->opcode == BREAKPOINT_INSTRUCTION)
25874- regs->ip = (unsigned long)p->addr;
25875+ regs->ip = ktla_ktva((unsigned long)p->addr);
25876 else
25877- regs->ip = (unsigned long)p->ainsn.insn;
25878+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25879 }
25880 NOKPROBE_SYMBOL(setup_singlestep);
25881
25882@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25883 setup_singlestep(p, regs, kcb, 0);
25884 return 1;
25885 }
25886- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25887+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25888 /*
25889 * The breakpoint instruction was removed right
25890 * after we hit it. Another cpu has removed
25891@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25892 " movq %rax, 152(%rsp)\n"
25893 RESTORE_REGS_STRING
25894 " popfq\n"
25895+#ifdef KERNEXEC_PLUGIN
25896+ " btsq $63,(%rsp)\n"
25897+#endif
25898 #else
25899 " pushf\n"
25900 SAVE_REGS_STRING
25901@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25902 struct kprobe_ctlblk *kcb)
25903 {
25904 unsigned long *tos = stack_addr(regs);
25905- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25906+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25907 unsigned long orig_ip = (unsigned long)p->addr;
25908 kprobe_opcode_t *insn = p->ainsn.insn;
25909
25910diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25911index 7b3b9d1..e2478b91 100644
25912--- a/arch/x86/kernel/kprobes/opt.c
25913+++ b/arch/x86/kernel/kprobes/opt.c
25914@@ -79,6 +79,7 @@ found:
25915 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25916 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25917 {
25918+ pax_open_kernel();
25919 #ifdef CONFIG_X86_64
25920 *addr++ = 0x48;
25921 *addr++ = 0xbf;
25922@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25923 *addr++ = 0xb8;
25924 #endif
25925 *(unsigned long *)addr = val;
25926+ pax_close_kernel();
25927 }
25928
25929 asm (
25930@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25931 * Verify if the address gap is in 2GB range, because this uses
25932 * a relative jump.
25933 */
25934- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25935+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25936 if (abs(rel) > 0x7fffffff) {
25937 __arch_remove_optimized_kprobe(op, 0);
25938 return -ERANGE;
25939@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25940 op->optinsn.size = ret;
25941
25942 /* Copy arch-dep-instance from template */
25943- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25944+ pax_open_kernel();
25945+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25946+ pax_close_kernel();
25947
25948 /* Set probe information */
25949 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25950
25951 /* Set probe function call */
25952- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25953+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25954
25955 /* Set returning jmp instruction at the tail of out-of-line buffer */
25956- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25957+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25958 (u8 *)op->kp.addr + op->optinsn.size);
25959
25960 flush_icache_range((unsigned long) buf,
25961@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25962 WARN_ON(kprobe_disabled(&op->kp));
25963
25964 /* Backup instructions which will be replaced by jump address */
25965- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25966+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25967 RELATIVE_ADDR_SIZE);
25968
25969 insn_buf[0] = RELATIVEJUMP_OPCODE;
25970@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25971 /* This kprobe is really able to run optimized path. */
25972 op = container_of(p, struct optimized_kprobe, kp);
25973 /* Detour through copied instructions */
25974- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25975+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25976 if (!reenter)
25977 reset_current_kprobe();
25978 preempt_enable_no_resched();
25979diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25980index c2bedae..25e7ab60 100644
25981--- a/arch/x86/kernel/ksysfs.c
25982+++ b/arch/x86/kernel/ksysfs.c
25983@@ -184,7 +184,7 @@ out:
25984
25985 static struct kobj_attribute type_attr = __ATTR_RO(type);
25986
25987-static struct bin_attribute data_attr = {
25988+static bin_attribute_no_const data_attr __read_only = {
25989 .attr = {
25990 .name = "data",
25991 .mode = S_IRUGO,
25992diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25993index c37886d..f43b63d 100644
25994--- a/arch/x86/kernel/ldt.c
25995+++ b/arch/x86/kernel/ldt.c
25996@@ -11,6 +11,7 @@
25997 #include <linux/sched.h>
25998 #include <linux/string.h>
25999 #include <linux/mm.h>
26000+#include <linux/ratelimit.h>
26001 #include <linux/smp.h>
26002 #include <linux/vmalloc.h>
26003 #include <linux/uaccess.h>
26004@@ -20,6 +21,14 @@
26005 #include <asm/mmu_context.h>
26006 #include <asm/syscalls.h>
26007
26008+#ifdef CONFIG_GRKERNSEC
26009+int sysctl_modify_ldt __read_only = 0;
26010+#elif defined(CONFIG_DEFAULT_MODIFY_LDT_SYSCALL)
26011+int sysctl_modify_ldt __read_only = 1;
26012+#else
26013+int sysctl_modify_ldt __read_only = 0;
26014+#endif
26015+
26016 #ifdef CONFIG_SMP
26017 static void flush_ldt(void *current_mm)
26018 {
26019@@ -66,13 +75,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
26020 if (reload) {
26021 #ifdef CONFIG_SMP
26022 preempt_disable();
26023- load_LDT(pc);
26024+ load_LDT_nolock(pc);
26025 if (!cpumask_equal(mm_cpumask(current->mm),
26026 cpumask_of(smp_processor_id())))
26027 smp_call_function(flush_ldt, current->mm, 1);
26028 preempt_enable();
26029 #else
26030- load_LDT(pc);
26031+ load_LDT_nolock(pc);
26032 #endif
26033 }
26034 if (oldsize) {
26035@@ -94,7 +103,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
26036 return err;
26037
26038 for (i = 0; i < old->size; i++)
26039- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
26040+ write_ldt_entry(new->ldt, i, old->ldt + i);
26041 return 0;
26042 }
26043
26044@@ -115,6 +124,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
26045 retval = copy_ldt(&mm->context, &old_mm->context);
26046 mutex_unlock(&old_mm->context.lock);
26047 }
26048+
26049+ if (tsk == current) {
26050+ mm->context.vdso = 0;
26051+
26052+#ifdef CONFIG_X86_32
26053+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
26054+ mm->context.user_cs_base = 0UL;
26055+ mm->context.user_cs_limit = ~0UL;
26056+
26057+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
26058+ cpumask_clear(&mm->context.cpu_user_cs_mask);
26059+#endif
26060+
26061+#endif
26062+#endif
26063+
26064+ }
26065+
26066 return retval;
26067 }
26068
26069@@ -229,6 +256,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
26070 }
26071 }
26072
26073+#ifdef CONFIG_PAX_SEGMEXEC
26074+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
26075+ error = -EINVAL;
26076+ goto out_unlock;
26077+ }
26078+#endif
26079+
26080 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
26081 error = -EINVAL;
26082 goto out_unlock;
26083@@ -254,6 +288,15 @@ asmlinkage int sys_modify_ldt(int func, void __user *ptr,
26084 {
26085 int ret = -ENOSYS;
26086
26087+ if (!sysctl_modify_ldt) {
26088+ printk_ratelimited(KERN_INFO
26089+ "Denied a call to modify_ldt() from %s[%d] (uid: %d)."
26090+ " Adjust sysctl if this was not an exploit attempt.\n",
26091+ current->comm, task_pid_nr(current),
26092+ from_kuid_munged(current_user_ns(), current_uid()));
26093+ return ret;
26094+ }
26095+
26096 switch (func) {
26097 case 0:
26098 ret = read_ldt(ptr, bytecount);
26099diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
26100index ff3c3101d..d7c0cd8 100644
26101--- a/arch/x86/kernel/livepatch.c
26102+++ b/arch/x86/kernel/livepatch.c
26103@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
26104 int ret, numpages, size = 4;
26105 bool readonly;
26106 unsigned long val;
26107- unsigned long core = (unsigned long)mod->module_core;
26108- unsigned long core_ro_size = mod->core_ro_size;
26109- unsigned long core_size = mod->core_size;
26110+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
26111+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
26112+ unsigned long core_size_rx = mod->core_size_rx;
26113+ unsigned long core_size_rw = mod->core_size_rw;
26114
26115 switch (type) {
26116 case R_X86_64_NONE:
26117@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
26118 return -EINVAL;
26119 }
26120
26121- if (loc < core || loc >= core + core_size)
26122+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
26123+ (loc < core_rw || loc >= core_rw + core_size_rw))
26124 /* loc does not point to any symbol inside the module */
26125 return -EINVAL;
26126
26127- if (loc < core + core_ro_size)
26128+ if (loc < core_rx + core_size_rx)
26129 readonly = true;
26130 else
26131 readonly = false;
26132diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
26133index 469b23d..5449cfe 100644
26134--- a/arch/x86/kernel/machine_kexec_32.c
26135+++ b/arch/x86/kernel/machine_kexec_32.c
26136@@ -26,7 +26,7 @@
26137 #include <asm/cacheflush.h>
26138 #include <asm/debugreg.h>
26139
26140-static void set_idt(void *newidt, __u16 limit)
26141+static void set_idt(struct desc_struct *newidt, __u16 limit)
26142 {
26143 struct desc_ptr curidt;
26144
26145@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
26146 }
26147
26148
26149-static void set_gdt(void *newgdt, __u16 limit)
26150+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
26151 {
26152 struct desc_ptr curgdt;
26153
26154@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
26155 }
26156
26157 control_page = page_address(image->control_code_page);
26158- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
26159+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
26160
26161 relocate_kernel_ptr = control_page;
26162 page_list[PA_CONTROL_PAGE] = __pa(control_page);
26163diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
26164index 94ea120..4154cea 100644
26165--- a/arch/x86/kernel/mcount_64.S
26166+++ b/arch/x86/kernel/mcount_64.S
26167@@ -7,7 +7,7 @@
26168 #include <linux/linkage.h>
26169 #include <asm/ptrace.h>
26170 #include <asm/ftrace.h>
26171-
26172+#include <asm/alternative-asm.h>
26173
26174 .code64
26175 .section .entry.text, "ax"
26176@@ -148,8 +148,9 @@
26177 #ifdef CONFIG_DYNAMIC_FTRACE
26178
26179 ENTRY(function_hook)
26180+ pax_force_retaddr
26181 retq
26182-END(function_hook)
26183+ENDPROC(function_hook)
26184
26185 ENTRY(ftrace_caller)
26186 /* save_mcount_regs fills in first two parameters */
26187@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
26188 #endif
26189
26190 GLOBAL(ftrace_stub)
26191+ pax_force_retaddr
26192 retq
26193-END(ftrace_caller)
26194+ENDPROC(ftrace_caller)
26195
26196 ENTRY(ftrace_regs_caller)
26197 /* Save the current flags before any operations that can change them */
26198@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
26199
26200 jmp ftrace_return
26201
26202-END(ftrace_regs_caller)
26203+ENDPROC(ftrace_regs_caller)
26204
26205
26206 #else /* ! CONFIG_DYNAMIC_FTRACE */
26207@@ -272,18 +274,20 @@ fgraph_trace:
26208 #endif
26209
26210 GLOBAL(ftrace_stub)
26211+ pax_force_retaddr
26212 retq
26213
26214 trace:
26215 /* save_mcount_regs fills in first two parameters */
26216 save_mcount_regs
26217
26218+ pax_force_fptr ftrace_trace_function
26219 call *ftrace_trace_function
26220
26221 restore_mcount_regs
26222
26223 jmp fgraph_trace
26224-END(function_hook)
26225+ENDPROC(function_hook)
26226 #endif /* CONFIG_DYNAMIC_FTRACE */
26227 #endif /* CONFIG_FUNCTION_TRACER */
26228
26229@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
26230
26231 restore_mcount_regs
26232
26233+ pax_force_retaddr
26234 retq
26235-END(ftrace_graph_caller)
26236+ENDPROC(ftrace_graph_caller)
26237
26238 GLOBAL(return_to_handler)
26239 subq $24, %rsp
26240@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26241 movq 8(%rsp), %rdx
26242 movq (%rsp), %rax
26243 addq $24, %rsp
26244+ pax_force_fptr %rdi
26245 jmp *%rdi
26246+ENDPROC(return_to_handler)
26247 #endif
26248diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26249index 005c03e..2f440cd 100644
26250--- a/arch/x86/kernel/module.c
26251+++ b/arch/x86/kernel/module.c
26252@@ -75,17 +75,17 @@ static unsigned long int get_module_load_offset(void)
26253 }
26254 #endif
26255
26256-void *module_alloc(unsigned long size)
26257+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26258 {
26259 void *p;
26260
26261- if (PAGE_ALIGN(size) > MODULES_LEN)
26262+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26263 return NULL;
26264
26265 p = __vmalloc_node_range(size, MODULE_ALIGN,
26266 MODULES_VADDR + get_module_load_offset(),
26267- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26268- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26269+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26270+ prot, 0, NUMA_NO_NODE,
26271 __builtin_return_address(0));
26272 if (p && (kasan_module_alloc(p, size) < 0)) {
26273 vfree(p);
26274@@ -95,6 +95,51 @@ void *module_alloc(unsigned long size)
26275 return p;
26276 }
26277
26278+void *module_alloc(unsigned long size)
26279+{
26280+
26281+#ifdef CONFIG_PAX_KERNEXEC
26282+ return __module_alloc(size, PAGE_KERNEL);
26283+#else
26284+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26285+#endif
26286+
26287+}
26288+
26289+#ifdef CONFIG_PAX_KERNEXEC
26290+#ifdef CONFIG_X86_32
26291+void *module_alloc_exec(unsigned long size)
26292+{
26293+ struct vm_struct *area;
26294+
26295+ if (size == 0)
26296+ return NULL;
26297+
26298+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26299+return area ? area->addr : NULL;
26300+}
26301+EXPORT_SYMBOL(module_alloc_exec);
26302+
26303+void module_memfree_exec(void *module_region)
26304+{
26305+ vunmap(module_region);
26306+}
26307+EXPORT_SYMBOL(module_memfree_exec);
26308+#else
26309+void module_memfree_exec(void *module_region)
26310+{
26311+ module_memfree(module_region);
26312+}
26313+EXPORT_SYMBOL(module_memfree_exec);
26314+
26315+void *module_alloc_exec(unsigned long size)
26316+{
26317+ return __module_alloc(size, PAGE_KERNEL_RX);
26318+}
26319+EXPORT_SYMBOL(module_alloc_exec);
26320+#endif
26321+#endif
26322+
26323 #ifdef CONFIG_X86_32
26324 int apply_relocate(Elf32_Shdr *sechdrs,
26325 const char *strtab,
26326@@ -105,14 +150,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26327 unsigned int i;
26328 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26329 Elf32_Sym *sym;
26330- uint32_t *location;
26331+ uint32_t *plocation, location;
26332
26333 DEBUGP("Applying relocate section %u to %u\n",
26334 relsec, sechdrs[relsec].sh_info);
26335 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26336 /* This is where to make the change */
26337- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26338- + rel[i].r_offset;
26339+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26340+ location = (uint32_t)plocation;
26341+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26342+ plocation = ktla_ktva((void *)plocation);
26343 /* This is the symbol it is referring to. Note that all
26344 undefined symbols have been resolved. */
26345 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26346@@ -121,11 +168,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26347 switch (ELF32_R_TYPE(rel[i].r_info)) {
26348 case R_386_32:
26349 /* We add the value into the location given */
26350- *location += sym->st_value;
26351+ pax_open_kernel();
26352+ *plocation += sym->st_value;
26353+ pax_close_kernel();
26354 break;
26355 case R_386_PC32:
26356 /* Add the value, subtract its position */
26357- *location += sym->st_value - (uint32_t)location;
26358+ pax_open_kernel();
26359+ *plocation += sym->st_value - location;
26360+ pax_close_kernel();
26361 break;
26362 default:
26363 pr_err("%s: Unknown relocation: %u\n",
26364@@ -170,21 +221,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26365 case R_X86_64_NONE:
26366 break;
26367 case R_X86_64_64:
26368+ pax_open_kernel();
26369 *(u64 *)loc = val;
26370+ pax_close_kernel();
26371 break;
26372 case R_X86_64_32:
26373+ pax_open_kernel();
26374 *(u32 *)loc = val;
26375+ pax_close_kernel();
26376 if (val != *(u32 *)loc)
26377 goto overflow;
26378 break;
26379 case R_X86_64_32S:
26380+ pax_open_kernel();
26381 *(s32 *)loc = val;
26382+ pax_close_kernel();
26383 if ((s64)val != *(s32 *)loc)
26384 goto overflow;
26385 break;
26386 case R_X86_64_PC32:
26387 val -= (u64)loc;
26388+ pax_open_kernel();
26389 *(u32 *)loc = val;
26390+ pax_close_kernel();
26391+
26392 #if 0
26393 if ((s64)val != *(s32 *)loc)
26394 goto overflow;
26395diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26396index 113e707..0a690e1 100644
26397--- a/arch/x86/kernel/msr.c
26398+++ b/arch/x86/kernel/msr.c
26399@@ -39,6 +39,7 @@
26400 #include <linux/notifier.h>
26401 #include <linux/uaccess.h>
26402 #include <linux/gfp.h>
26403+#include <linux/grsecurity.h>
26404
26405 #include <asm/processor.h>
26406 #include <asm/msr.h>
26407@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26408 int err = 0;
26409 ssize_t bytes = 0;
26410
26411+#ifdef CONFIG_GRKERNSEC_KMEM
26412+ gr_handle_msr_write();
26413+ return -EPERM;
26414+#endif
26415+
26416 if (count % 8)
26417 return -EINVAL; /* Invalid chunk size */
26418
26419@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26420 err = -EBADF;
26421 break;
26422 }
26423+#ifdef CONFIG_GRKERNSEC_KMEM
26424+ gr_handle_msr_write();
26425+ return -EPERM;
26426+#endif
26427 if (copy_from_user(&regs, uregs, sizeof regs)) {
26428 err = -EFAULT;
26429 break;
26430@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26431 return notifier_from_errno(err);
26432 }
26433
26434-static struct notifier_block __refdata msr_class_cpu_notifier = {
26435+static struct notifier_block msr_class_cpu_notifier = {
26436 .notifier_call = msr_class_cpu_callback,
26437 };
26438
26439diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26440index c3e985d..f690edd 100644
26441--- a/arch/x86/kernel/nmi.c
26442+++ b/arch/x86/kernel/nmi.c
26443@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26444
26445 static void nmi_max_handler(struct irq_work *w)
26446 {
26447- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26448+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26449 int remainder_ns, decimal_msecs;
26450- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26451+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26452
26453 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26454 decimal_msecs = remainder_ns / 1000;
26455
26456 printk_ratelimited(KERN_INFO
26457 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26458- a->handler, whole_msecs, decimal_msecs);
26459+ n->action->handler, whole_msecs, decimal_msecs);
26460 }
26461
26462 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26463@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26464 delta = sched_clock() - delta;
26465 trace_nmi_handler(a->handler, (int)delta, thishandled);
26466
26467- if (delta < nmi_longest_ns || delta < a->max_duration)
26468+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26469 continue;
26470
26471- a->max_duration = delta;
26472- irq_work_queue(&a->irq_work);
26473+ a->work->max_duration = delta;
26474+ irq_work_queue(&a->work->irq_work);
26475 }
26476
26477 rcu_read_unlock();
26478@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26479 }
26480 NOKPROBE_SYMBOL(nmi_handle);
26481
26482-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26483+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26484 {
26485 struct nmi_desc *desc = nmi_to_desc(type);
26486 unsigned long flags;
26487@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26488 if (!action->handler)
26489 return -EINVAL;
26490
26491- init_irq_work(&action->irq_work, nmi_max_handler);
26492+ action->work->action = action;
26493+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26494
26495 spin_lock_irqsave(&desc->lock, flags);
26496
26497@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26498 * event confuses some handlers (kdump uses this flag)
26499 */
26500 if (action->flags & NMI_FLAG_FIRST)
26501- list_add_rcu(&action->list, &desc->head);
26502+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26503 else
26504- list_add_tail_rcu(&action->list, &desc->head);
26505+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26506
26507 spin_unlock_irqrestore(&desc->lock, flags);
26508 return 0;
26509@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26510 if (!strcmp(n->name, name)) {
26511 WARN(in_nmi(),
26512 "Trying to free NMI (%s) from NMI context!\n", n->name);
26513- list_del_rcu(&n->list);
26514+ pax_list_del_rcu((struct list_head *)&n->list);
26515 break;
26516 }
26517 }
26518@@ -408,15 +409,15 @@ static void default_do_nmi(struct pt_regs *regs)
26519 NOKPROBE_SYMBOL(default_do_nmi);
26520
26521 /*
26522- * NMIs can hit breakpoints which will cause it to lose its
26523- * NMI context with the CPU when the breakpoint does an iret.
26524- */
26525-#ifdef CONFIG_X86_32
26526-/*
26527- * For i386, NMIs use the same stack as the kernel, and we can
26528- * add a workaround to the iret problem in C (preventing nested
26529- * NMIs if an NMI takes a trap). Simply have 3 states the NMI
26530- * can be in:
26531+ * NMIs can page fault or hit breakpoints which will cause it to lose
26532+ * its NMI context with the CPU when the breakpoint or page fault does an IRET.
26533+ *
26534+ * As a result, NMIs can nest if NMIs get unmasked due an IRET during
26535+ * NMI processing. On x86_64, the asm glue protects us from nested NMIs
26536+ * if the outer NMI came from kernel mode, but we can still nest if the
26537+ * outer NMI came from user mode.
26538+ *
26539+ * To handle these nested NMIs, we have three states:
26540 *
26541 * 1) not running
26542 * 2) executing
26543@@ -430,15 +431,14 @@ NOKPROBE_SYMBOL(default_do_nmi);
26544 * (Note, the latch is binary, thus multiple NMIs triggering,
26545 * when one is running, are ignored. Only one NMI is restarted.)
26546 *
26547- * If an NMI hits a breakpoint that executes an iret, another
26548- * NMI can preempt it. We do not want to allow this new NMI
26549- * to run, but we want to execute it when the first one finishes.
26550- * We set the state to "latched", and the exit of the first NMI will
26551- * perform a dec_return, if the result is zero (NOT_RUNNING), then
26552- * it will simply exit the NMI handler. If not, the dec_return
26553- * would have set the state to NMI_EXECUTING (what we want it to
26554- * be when we are running). In this case, we simply jump back
26555- * to rerun the NMI handler again, and restart the 'latched' NMI.
26556+ * If an NMI executes an iret, another NMI can preempt it. We do not
26557+ * want to allow this new NMI to run, but we want to execute it when the
26558+ * first one finishes. We set the state to "latched", and the exit of
26559+ * the first NMI will perform a dec_return, if the result is zero
26560+ * (NOT_RUNNING), then it will simply exit the NMI handler. If not, the
26561+ * dec_return would have set the state to NMI_EXECUTING (what we want it
26562+ * to be when we are running). In this case, we simply jump back to
26563+ * rerun the NMI handler again, and restart the 'latched' NMI.
26564 *
26565 * No trap (breakpoint or page fault) should be hit before nmi_restart,
26566 * thus there is no race between the first check of state for NOT_RUNNING
26567@@ -461,49 +461,47 @@ enum nmi_states {
26568 static DEFINE_PER_CPU(enum nmi_states, nmi_state);
26569 static DEFINE_PER_CPU(unsigned long, nmi_cr2);
26570
26571-#define nmi_nesting_preprocess(regs) \
26572- do { \
26573- if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) { \
26574- this_cpu_write(nmi_state, NMI_LATCHED); \
26575- return; \
26576- } \
26577- this_cpu_write(nmi_state, NMI_EXECUTING); \
26578- this_cpu_write(nmi_cr2, read_cr2()); \
26579- } while (0); \
26580- nmi_restart:
26581-
26582-#define nmi_nesting_postprocess() \
26583- do { \
26584- if (unlikely(this_cpu_read(nmi_cr2) != read_cr2())) \
26585- write_cr2(this_cpu_read(nmi_cr2)); \
26586- if (this_cpu_dec_return(nmi_state)) \
26587- goto nmi_restart; \
26588- } while (0)
26589-#else /* x86_64 */
26590+#ifdef CONFIG_X86_64
26591 /*
26592- * In x86_64 things are a bit more difficult. This has the same problem
26593- * where an NMI hitting a breakpoint that calls iret will remove the
26594- * NMI context, allowing a nested NMI to enter. What makes this more
26595- * difficult is that both NMIs and breakpoints have their own stack.
26596- * When a new NMI or breakpoint is executed, the stack is set to a fixed
26597- * point. If an NMI is nested, it will have its stack set at that same
26598- * fixed address that the first NMI had, and will start corrupting the
26599- * stack. This is handled in entry_64.S, but the same problem exists with
26600- * the breakpoint stack.
26601+ * In x86_64, we need to handle breakpoint -> NMI -> breakpoint. Without
26602+ * some care, the inner breakpoint will clobber the outer breakpoint's
26603+ * stack.
26604 *
26605- * If a breakpoint is being processed, and the debug stack is being used,
26606- * if an NMI comes in and also hits a breakpoint, the stack pointer
26607- * will be set to the same fixed address as the breakpoint that was
26608- * interrupted, causing that stack to be corrupted. To handle this case,
26609- * check if the stack that was interrupted is the debug stack, and if
26610- * so, change the IDT so that new breakpoints will use the current stack
26611- * and not switch to the fixed address. On return of the NMI, switch back
26612- * to the original IDT.
26613+ * If a breakpoint is being processed, and the debug stack is being
26614+ * used, if an NMI comes in and also hits a breakpoint, the stack
26615+ * pointer will be set to the same fixed address as the breakpoint that
26616+ * was interrupted, causing that stack to be corrupted. To handle this
26617+ * case, check if the stack that was interrupted is the debug stack, and
26618+ * if so, change the IDT so that new breakpoints will use the current
26619+ * stack and not switch to the fixed address. On return of the NMI,
26620+ * switch back to the original IDT.
26621 */
26622 static DEFINE_PER_CPU(int, update_debug_stack);
26623+#endif
26624
26625-static inline void nmi_nesting_preprocess(struct pt_regs *regs)
26626+dotraplinkage notrace void
26627+do_nmi(struct pt_regs *regs, long error_code)
26628 {
26629+
26630+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26631+ if (!user_mode(regs)) {
26632+ unsigned long cs = regs->cs & 0xFFFF;
26633+ unsigned long ip = ktva_ktla(regs->ip);
26634+
26635+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26636+ regs->ip = ip;
26637+ }
26638+#endif
26639+
26640+ if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) {
26641+ this_cpu_write(nmi_state, NMI_LATCHED);
26642+ return;
26643+ }
26644+ this_cpu_write(nmi_state, NMI_EXECUTING);
26645+ this_cpu_write(nmi_cr2, read_cr2());
26646+nmi_restart:
26647+
26648+#ifdef CONFIG_X86_64
26649 /*
26650 * If we interrupted a breakpoint, it is possible that
26651 * the nmi handler will have breakpoints too. We need to
26652@@ -514,22 +512,8 @@ static inline void nmi_nesting_preprocess(struct pt_regs *regs)
26653 debug_stack_set_zero();
26654 this_cpu_write(update_debug_stack, 1);
26655 }
26656-}
26657-
26658-static inline void nmi_nesting_postprocess(void)
26659-{
26660- if (unlikely(this_cpu_read(update_debug_stack))) {
26661- debug_stack_reset();
26662- this_cpu_write(update_debug_stack, 0);
26663- }
26664-}
26665 #endif
26666
26667-dotraplinkage notrace void
26668-do_nmi(struct pt_regs *regs, long error_code)
26669-{
26670- nmi_nesting_preprocess(regs);
26671-
26672 nmi_enter();
26673
26674 inc_irq_stat(__nmi_count);
26675@@ -539,8 +523,17 @@ do_nmi(struct pt_regs *regs, long error_code)
26676
26677 nmi_exit();
26678
26679- /* On i386, may loop back to preprocess */
26680- nmi_nesting_postprocess();
26681+#ifdef CONFIG_X86_64
26682+ if (unlikely(this_cpu_read(update_debug_stack))) {
26683+ debug_stack_reset();
26684+ this_cpu_write(update_debug_stack, 0);
26685+ }
26686+#endif
26687+
26688+ if (unlikely(this_cpu_read(nmi_cr2) != read_cr2()))
26689+ write_cr2(this_cpu_read(nmi_cr2));
26690+ if (this_cpu_dec_return(nmi_state))
26691+ goto nmi_restart;
26692 }
26693 NOKPROBE_SYMBOL(do_nmi);
26694
26695diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26696index 6d9582e..f746287 100644
26697--- a/arch/x86/kernel/nmi_selftest.c
26698+++ b/arch/x86/kernel/nmi_selftest.c
26699@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26700 {
26701 /* trap all the unknown NMIs we may generate */
26702 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26703- __initdata);
26704+ __initconst);
26705 }
26706
26707 static void __init cleanup_nmi_testsuite(void)
26708@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26709 unsigned long timeout;
26710
26711 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26712- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26713+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26714 nmi_fail = FAILURE;
26715 return;
26716 }
26717diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26718index bbb6c73..24a58ef 100644
26719--- a/arch/x86/kernel/paravirt-spinlocks.c
26720+++ b/arch/x86/kernel/paravirt-spinlocks.c
26721@@ -8,7 +8,7 @@
26722
26723 #include <asm/paravirt.h>
26724
26725-struct pv_lock_ops pv_lock_ops = {
26726+struct pv_lock_ops pv_lock_ops __read_only = {
26727 #ifdef CONFIG_SMP
26728 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26729 .unlock_kick = paravirt_nop,
26730diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26731index c614dd4..9ad659e 100644
26732--- a/arch/x86/kernel/paravirt.c
26733+++ b/arch/x86/kernel/paravirt.c
26734@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26735 {
26736 return x;
26737 }
26738+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26739+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26740+#endif
26741
26742 void __init default_banner(void)
26743 {
26744@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26745
26746 if (opfunc == NULL)
26747 /* If there's no function, patch it with a ud2a (BUG) */
26748- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26749- else if (opfunc == _paravirt_nop)
26750+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26751+ else if (opfunc == (void *)_paravirt_nop)
26752 /* If the operation is a nop, then nop the callsite */
26753 ret = paravirt_patch_nop();
26754
26755 /* identity functions just return their single argument */
26756- else if (opfunc == _paravirt_ident_32)
26757+ else if (opfunc == (void *)_paravirt_ident_32)
26758 ret = paravirt_patch_ident_32(insnbuf, len);
26759- else if (opfunc == _paravirt_ident_64)
26760+ else if (opfunc == (void *)_paravirt_ident_64)
26761 ret = paravirt_patch_ident_64(insnbuf, len);
26762+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26763+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26764+ ret = paravirt_patch_ident_64(insnbuf, len);
26765+#endif
26766
26767 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26768 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26769@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26770 if (insn_len > len || start == NULL)
26771 insn_len = len;
26772 else
26773- memcpy(insnbuf, start, insn_len);
26774+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26775
26776 return insn_len;
26777 }
26778@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26779 return this_cpu_read(paravirt_lazy_mode);
26780 }
26781
26782-struct pv_info pv_info = {
26783+struct pv_info pv_info __read_only = {
26784 .name = "bare hardware",
26785 .paravirt_enabled = 0,
26786 .kernel_rpl = 0,
26787@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26788 #endif
26789 };
26790
26791-struct pv_init_ops pv_init_ops = {
26792+struct pv_init_ops pv_init_ops __read_only = {
26793 .patch = native_patch,
26794 };
26795
26796-struct pv_time_ops pv_time_ops = {
26797+struct pv_time_ops pv_time_ops __read_only = {
26798 .sched_clock = native_sched_clock,
26799 .steal_clock = native_steal_clock,
26800 };
26801
26802-__visible struct pv_irq_ops pv_irq_ops = {
26803+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26804 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26805 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26806 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26807@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26808 #endif
26809 };
26810
26811-__visible struct pv_cpu_ops pv_cpu_ops = {
26812+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26813 .cpuid = native_cpuid,
26814 .get_debugreg = native_get_debugreg,
26815 .set_debugreg = native_set_debugreg,
26816@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26817 NOKPROBE_SYMBOL(native_set_debugreg);
26818 NOKPROBE_SYMBOL(native_load_idt);
26819
26820-struct pv_apic_ops pv_apic_ops = {
26821+struct pv_apic_ops pv_apic_ops __read_only= {
26822 #ifdef CONFIG_X86_LOCAL_APIC
26823 .startup_ipi_hook = paravirt_nop,
26824 #endif
26825 };
26826
26827-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26828+#ifdef CONFIG_X86_32
26829+#ifdef CONFIG_X86_PAE
26830+/* 64-bit pagetable entries */
26831+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26832+#else
26833 /* 32-bit pagetable entries */
26834 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26835+#endif
26836 #else
26837 /* 64-bit pagetable entries */
26838 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26839 #endif
26840
26841-struct pv_mmu_ops pv_mmu_ops = {
26842+struct pv_mmu_ops pv_mmu_ops __read_only = {
26843
26844 .read_cr2 = native_read_cr2,
26845 .write_cr2 = native_write_cr2,
26846@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26847 .make_pud = PTE_IDENT,
26848
26849 .set_pgd = native_set_pgd,
26850+ .set_pgd_batched = native_set_pgd_batched,
26851 #endif
26852 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
26853
26854@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26855 },
26856
26857 .set_fixmap = native_set_fixmap,
26858+
26859+#ifdef CONFIG_PAX_KERNEXEC
26860+ .pax_open_kernel = native_pax_open_kernel,
26861+ .pax_close_kernel = native_pax_close_kernel,
26862+#endif
26863+
26864 };
26865
26866 EXPORT_SYMBOL_GPL(pv_time_ops);
26867diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26868index a1da673..b6f5831 100644
26869--- a/arch/x86/kernel/paravirt_patch_64.c
26870+++ b/arch/x86/kernel/paravirt_patch_64.c
26871@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26872 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26873 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26874 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26875+
26876+#ifndef CONFIG_PAX_MEMORY_UDEREF
26877 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26878+#endif
26879+
26880 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26881 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26882
26883@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26884 PATCH_SITE(pv_mmu_ops, read_cr3);
26885 PATCH_SITE(pv_mmu_ops, write_cr3);
26886 PATCH_SITE(pv_cpu_ops, clts);
26887+
26888+#ifndef CONFIG_PAX_MEMORY_UDEREF
26889 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26890+#endif
26891+
26892 PATCH_SITE(pv_cpu_ops, wbinvd);
26893
26894 patch_site:
26895diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26896index 0497f71..7186c0d 100644
26897--- a/arch/x86/kernel/pci-calgary_64.c
26898+++ b/arch/x86/kernel/pci-calgary_64.c
26899@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26900 tce_space = be64_to_cpu(readq(target));
26901 tce_space = tce_space & TAR_SW_BITS;
26902
26903- tce_space = tce_space & (~specified_table_size);
26904+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26905 info->tce_space = (u64 *)__va(tce_space);
26906 }
26907 }
26908diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26909index 35ccf75..7a15747 100644
26910--- a/arch/x86/kernel/pci-iommu_table.c
26911+++ b/arch/x86/kernel/pci-iommu_table.c
26912@@ -2,7 +2,7 @@
26913 #include <asm/iommu_table.h>
26914 #include <linux/string.h>
26915 #include <linux/kallsyms.h>
26916-
26917+#include <linux/sched.h>
26918
26919 #define DEBUG 1
26920
26921diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26922index 77dd0ad..9ec4723 100644
26923--- a/arch/x86/kernel/pci-swiotlb.c
26924+++ b/arch/x86/kernel/pci-swiotlb.c
26925@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26926 struct dma_attrs *attrs)
26927 {
26928 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26929- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26930+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26931 else
26932 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26933 }
26934diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26935index 6e338e3..82f946e 100644
26936--- a/arch/x86/kernel/process.c
26937+++ b/arch/x86/kernel/process.c
26938@@ -38,7 +38,8 @@
26939 * section. Since TSS's are completely CPU-local, we want them
26940 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26941 */
26942-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26943+struct tss_struct cpu_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = {
26944+ [0 ... NR_CPUS-1] = {
26945 .x86_tss = {
26946 .sp0 = TOP_OF_INIT_STACK,
26947 #ifdef CONFIG_X86_32
26948@@ -56,6 +57,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26949 */
26950 .io_bitmap = { [0 ... IO_BITMAP_LONGS] = ~0 },
26951 #endif
26952+}
26953 };
26954 EXPORT_PER_CPU_SYMBOL(cpu_tss);
26955
26956@@ -115,7 +117,7 @@ void arch_task_cache_init(void)
26957 task_xstate_cachep =
26958 kmem_cache_create("task_xstate", xstate_size,
26959 __alignof__(union thread_xstate),
26960- SLAB_PANIC | SLAB_NOTRACK, NULL);
26961+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26962 setup_xstate_comp();
26963 }
26964
26965@@ -129,7 +131,7 @@ void exit_thread(void)
26966 unsigned long *bp = t->io_bitmap_ptr;
26967
26968 if (bp) {
26969- struct tss_struct *tss = &per_cpu(cpu_tss, get_cpu());
26970+ struct tss_struct *tss = cpu_tss + get_cpu();
26971
26972 t->io_bitmap_ptr = NULL;
26973 clear_thread_flag(TIF_IO_BITMAP);
26974@@ -149,6 +151,9 @@ void flush_thread(void)
26975 {
26976 struct task_struct *tsk = current;
26977
26978+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26979+ loadsegment(gs, 0);
26980+#endif
26981 flush_ptrace_hw_breakpoint(tsk);
26982 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26983
26984@@ -302,7 +307,7 @@ static void __exit_idle(void)
26985 void exit_idle(void)
26986 {
26987 /* idle loop has pid 0 */
26988- if (current->pid)
26989+ if (task_pid_nr(current))
26990 return;
26991 __exit_idle();
26992 }
26993@@ -355,7 +360,7 @@ bool xen_set_default_idle(void)
26994 return ret;
26995 }
26996 #endif
26997-void stop_this_cpu(void *dummy)
26998+__noreturn void stop_this_cpu(void *dummy)
26999 {
27000 local_irq_disable();
27001 /*
27002@@ -531,16 +536,43 @@ static int __init idle_setup(char *str)
27003 }
27004 early_param("idle", idle_setup);
27005
27006-unsigned long arch_align_stack(unsigned long sp)
27007-{
27008- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
27009- sp -= get_random_int() % 8192;
27010- return sp & ~0xf;
27011-}
27012-
27013 unsigned long arch_randomize_brk(struct mm_struct *mm)
27014 {
27015 unsigned long range_end = mm->brk + 0x02000000;
27016 return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
27017 }
27018
27019+#ifdef CONFIG_PAX_RANDKSTACK
27020+void pax_randomize_kstack(struct pt_regs *regs)
27021+{
27022+ struct thread_struct *thread = &current->thread;
27023+ unsigned long time;
27024+
27025+ if (!randomize_va_space)
27026+ return;
27027+
27028+ if (v8086_mode(regs))
27029+ return;
27030+
27031+ rdtscl(time);
27032+
27033+ /* P4 seems to return a 0 LSB, ignore it */
27034+#ifdef CONFIG_MPENTIUM4
27035+ time &= 0x3EUL;
27036+ time <<= 2;
27037+#elif defined(CONFIG_X86_64)
27038+ time &= 0xFUL;
27039+ time <<= 4;
27040+#else
27041+ time &= 0x1FUL;
27042+ time <<= 3;
27043+#endif
27044+
27045+ thread->sp0 ^= time;
27046+ load_sp0(cpu_tss + smp_processor_id(), thread);
27047+
27048+#ifdef CONFIG_X86_64
27049+ this_cpu_write(kernel_stack, thread->sp0);
27050+#endif
27051+}
27052+#endif
27053diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
27054index 8ed2106..1345704 100644
27055--- a/arch/x86/kernel/process_32.c
27056+++ b/arch/x86/kernel/process_32.c
27057@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
27058 unsigned long thread_saved_pc(struct task_struct *tsk)
27059 {
27060 return ((unsigned long *)tsk->thread.sp)[3];
27061+//XXX return tsk->thread.eip;
27062 }
27063
27064 void __show_regs(struct pt_regs *regs, int all)
27065@@ -76,16 +77,15 @@ void __show_regs(struct pt_regs *regs, int all)
27066 if (user_mode(regs)) {
27067 sp = regs->sp;
27068 ss = regs->ss & 0xffff;
27069- gs = get_user_gs(regs);
27070 } else {
27071 sp = kernel_stack_pointer(regs);
27072 savesegment(ss, ss);
27073- savesegment(gs, gs);
27074 }
27075+ gs = get_user_gs(regs);
27076
27077 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
27078 (u16)regs->cs, regs->ip, regs->flags,
27079- smp_processor_id());
27080+ raw_smp_processor_id());
27081 print_symbol("EIP is at %s\n", regs->ip);
27082
27083 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
27084@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
27085 int copy_thread(unsigned long clone_flags, unsigned long sp,
27086 unsigned long arg, struct task_struct *p)
27087 {
27088- struct pt_regs *childregs = task_pt_regs(p);
27089+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
27090 struct task_struct *tsk;
27091 int err;
27092
27093 p->thread.sp = (unsigned long) childregs;
27094 p->thread.sp0 = (unsigned long) (childregs+1);
27095+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
27096 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
27097
27098 if (unlikely(p->flags & PF_KTHREAD)) {
27099 /* kernel thread */
27100 memset(childregs, 0, sizeof(struct pt_regs));
27101 p->thread.ip = (unsigned long) ret_from_kernel_thread;
27102- task_user_gs(p) = __KERNEL_STACK_CANARY;
27103- childregs->ds = __USER_DS;
27104- childregs->es = __USER_DS;
27105+ savesegment(gs, childregs->gs);
27106+ childregs->ds = __KERNEL_DS;
27107+ childregs->es = __KERNEL_DS;
27108 childregs->fs = __KERNEL_PERCPU;
27109 childregs->bx = sp; /* function */
27110 childregs->bp = arg;
27111@@ -244,7 +245,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27112 struct thread_struct *prev = &prev_p->thread,
27113 *next = &next_p->thread;
27114 int cpu = smp_processor_id();
27115- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
27116+ struct tss_struct *tss = cpu_tss + cpu;
27117 fpu_switch_t fpu;
27118
27119 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
27120@@ -263,6 +264,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27121 */
27122 lazy_save_gs(prev->gs);
27123
27124+#ifdef CONFIG_PAX_MEMORY_UDEREF
27125+ __set_fs(task_thread_info(next_p)->addr_limit);
27126+#endif
27127+
27128 /*
27129 * Load the per-thread Thread-Local Storage descriptor.
27130 */
27131@@ -306,12 +311,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27132 * current_thread_info().
27133 */
27134 load_sp0(tss, next);
27135- this_cpu_write(kernel_stack,
27136- (unsigned long)task_stack_page(next_p) +
27137- THREAD_SIZE);
27138- this_cpu_write(cpu_current_top_of_stack,
27139- (unsigned long)task_stack_page(next_p) +
27140- THREAD_SIZE);
27141+ this_cpu_write(current_task, next_p);
27142+ this_cpu_write(current_tinfo, &next_p->tinfo);
27143+ this_cpu_write(kernel_stack, next->sp0);
27144+ this_cpu_write(cpu_current_top_of_stack, next->sp0);
27145
27146 /*
27147 * Restore %gs if needed (which is common)
27148@@ -321,8 +324,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27149
27150 switch_fpu_finish(next_p, fpu);
27151
27152- this_cpu_write(current_task, next_p);
27153-
27154 return prev_p;
27155 }
27156
27157@@ -352,4 +353,3 @@ unsigned long get_wchan(struct task_struct *p)
27158 } while (count++ < 16);
27159 return 0;
27160 }
27161-
27162diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
27163index ddfdbf7..625417c 100644
27164--- a/arch/x86/kernel/process_64.c
27165+++ b/arch/x86/kernel/process_64.c
27166@@ -158,9 +158,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
27167 struct pt_regs *childregs;
27168 struct task_struct *me = current;
27169
27170- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
27171+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
27172 childregs = task_pt_regs(p);
27173 p->thread.sp = (unsigned long) childregs;
27174+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
27175 set_tsk_thread_flag(p, TIF_FORK);
27176 p->thread.io_bitmap_ptr = NULL;
27177
27178@@ -170,6 +171,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
27179 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
27180 savesegment(es, p->thread.es);
27181 savesegment(ds, p->thread.ds);
27182+ savesegment(ss, p->thread.ss);
27183+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
27184 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
27185
27186 if (unlikely(p->flags & PF_KTHREAD)) {
27187@@ -275,7 +278,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27188 struct thread_struct *prev = &prev_p->thread;
27189 struct thread_struct *next = &next_p->thread;
27190 int cpu = smp_processor_id();
27191- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
27192+ struct tss_struct *tss = cpu_tss + cpu;
27193 unsigned fsindex, gsindex;
27194 fpu_switch_t fpu;
27195
27196@@ -326,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27197 if (unlikely(next->ds | prev->ds))
27198 loadsegment(ds, next->ds);
27199
27200+ savesegment(ss, prev->ss);
27201+ if (unlikely(next->ss != prev->ss))
27202+ loadsegment(ss, next->ss);
27203+
27204 /*
27205 * Switch FS and GS.
27206 *
27207@@ -397,6 +404,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27208 * Switch the PDA and FPU contexts.
27209 */
27210 this_cpu_write(current_task, next_p);
27211+ this_cpu_write(current_tinfo, &next_p->tinfo);
27212
27213 /*
27214 * If it were not for PREEMPT_ACTIVE we could guarantee that the
27215@@ -409,8 +417,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27216 /* Reload esp0 and ss1. This changes current_thread_info(). */
27217 load_sp0(tss, next);
27218
27219- this_cpu_write(kernel_stack,
27220- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
27221+ this_cpu_write(kernel_stack, next->sp0);
27222
27223 /*
27224 * Now maybe reload the debug registers and handle I/O bitmaps
27225@@ -508,12 +515,11 @@ unsigned long get_wchan(struct task_struct *p)
27226 if (!p || p == current || p->state == TASK_RUNNING)
27227 return 0;
27228 stack = (unsigned long)task_stack_page(p);
27229- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
27230+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
27231 return 0;
27232 fp = *(u64 *)(p->thread.sp);
27233 do {
27234- if (fp < (unsigned long)stack ||
27235- fp >= (unsigned long)stack+THREAD_SIZE)
27236+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
27237 return 0;
27238 ip = *(u64 *)(fp+8);
27239 if (!in_sched_functions(ip))
27240diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
27241index a7bc794..094ee8e 100644
27242--- a/arch/x86/kernel/ptrace.c
27243+++ b/arch/x86/kernel/ptrace.c
27244@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
27245 unsigned long sp = (unsigned long)&regs->sp;
27246 u32 *prev_esp;
27247
27248- if (context == (sp & ~(THREAD_SIZE - 1)))
27249+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
27250 return sp;
27251
27252- prev_esp = (u32 *)(context);
27253+ prev_esp = *(u32 **)(context);
27254 if (prev_esp)
27255 return (unsigned long)prev_esp;
27256
27257@@ -446,6 +446,20 @@ static int putreg(struct task_struct *child,
27258 if (child->thread.gs != value)
27259 return do_arch_prctl(child, ARCH_SET_GS, value);
27260 return 0;
27261+
27262+ case offsetof(struct user_regs_struct,ip):
27263+ /*
27264+ * Protect against any attempt to set ip to an
27265+ * impossible address. There are dragons lurking if the
27266+ * address is noncanonical. (This explicitly allows
27267+ * setting ip to TASK_SIZE_MAX, because user code can do
27268+ * that all by itself by running off the end of its
27269+ * address space.
27270+ */
27271+ if (value > TASK_SIZE_MAX)
27272+ return -EIO;
27273+ break;
27274+
27275 #endif
27276 }
27277
27278@@ -582,7 +596,7 @@ static void ptrace_triggered(struct perf_event *bp,
27279 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
27280 {
27281 int i;
27282- int dr7 = 0;
27283+ unsigned long dr7 = 0;
27284 struct arch_hw_breakpoint *info;
27285
27286 for (i = 0; i < HBP_NUM; i++) {
27287@@ -816,7 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,
27288 unsigned long addr, unsigned long data)
27289 {
27290 int ret;
27291- unsigned long __user *datap = (unsigned long __user *)data;
27292+ unsigned long __user *datap = (__force unsigned long __user *)data;
27293
27294 switch (request) {
27295 /* read the word at location addr in the USER area. */
27296@@ -901,14 +915,14 @@ long arch_ptrace(struct task_struct *child, long request,
27297 if ((int) addr < 0)
27298 return -EIO;
27299 ret = do_get_thread_area(child, addr,
27300- (struct user_desc __user *)data);
27301+ (__force struct user_desc __user *) data);
27302 break;
27303
27304 case PTRACE_SET_THREAD_AREA:
27305 if ((int) addr < 0)
27306 return -EIO;
27307 ret = do_set_thread_area(child, addr,
27308- (struct user_desc __user *)data, 0);
27309+ (__force struct user_desc __user *) data, 0);
27310 break;
27311 #endif
27312
27313@@ -1286,7 +1300,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
27314
27315 #ifdef CONFIG_X86_64
27316
27317-static struct user_regset x86_64_regsets[] __read_mostly = {
27318+static user_regset_no_const x86_64_regsets[] __read_only = {
27319 [REGSET_GENERAL] = {
27320 .core_note_type = NT_PRSTATUS,
27321 .n = sizeof(struct user_regs_struct) / sizeof(long),
27322@@ -1327,7 +1341,7 @@ static const struct user_regset_view user_x86_64_view = {
27323 #endif /* CONFIG_X86_64 */
27324
27325 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
27326-static struct user_regset x86_32_regsets[] __read_mostly = {
27327+static user_regset_no_const x86_32_regsets[] __read_only = {
27328 [REGSET_GENERAL] = {
27329 .core_note_type = NT_PRSTATUS,
27330 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
27331@@ -1380,7 +1394,7 @@ static const struct user_regset_view user_x86_32_view = {
27332 */
27333 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
27334
27335-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
27336+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
27337 {
27338 #ifdef CONFIG_X86_64
27339 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
27340@@ -1415,7 +1429,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
27341 memset(info, 0, sizeof(*info));
27342 info->si_signo = SIGTRAP;
27343 info->si_code = si_code;
27344- info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
27345+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
27346 }
27347
27348 void user_single_step_siginfo(struct task_struct *tsk,
27349@@ -1449,6 +1463,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
27350 }
27351 }
27352
27353+#ifdef CONFIG_GRKERNSEC_SETXID
27354+extern void gr_delayed_cred_worker(void);
27355+#endif
27356+
27357 /*
27358 * We can return 0 to resume the syscall or anything else to go to phase
27359 * 2. If we resume the syscall, we need to put something appropriate in
27360@@ -1556,6 +1574,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
27361
27362 BUG_ON(regs != task_pt_regs(current));
27363
27364+#ifdef CONFIG_GRKERNSEC_SETXID
27365+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27366+ gr_delayed_cred_worker();
27367+#endif
27368+
27369 /*
27370 * If we stepped into a sysenter/syscall insn, it trapped in
27371 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
27372@@ -1614,6 +1637,11 @@ void syscall_trace_leave(struct pt_regs *regs)
27373 */
27374 user_exit();
27375
27376+#ifdef CONFIG_GRKERNSEC_SETXID
27377+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27378+ gr_delayed_cred_worker();
27379+#endif
27380+
27381 audit_syscall_exit(regs);
27382
27383 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
27384diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
27385index 2f355d2..e75ed0a 100644
27386--- a/arch/x86/kernel/pvclock.c
27387+++ b/arch/x86/kernel/pvclock.c
27388@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
27389 reset_hung_task_detector();
27390 }
27391
27392-static atomic64_t last_value = ATOMIC64_INIT(0);
27393+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
27394
27395 void pvclock_resume(void)
27396 {
27397- atomic64_set(&last_value, 0);
27398+ atomic64_set_unchecked(&last_value, 0);
27399 }
27400
27401 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
27402@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
27403 * updating at the same time, and one of them could be slightly behind,
27404 * making the assumption that last_value always go forward fail to hold.
27405 */
27406- last = atomic64_read(&last_value);
27407+ last = atomic64_read_unchecked(&last_value);
27408 do {
27409 if (ret < last)
27410 return last;
27411- last = atomic64_cmpxchg(&last_value, last, ret);
27412+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27413 } while (unlikely(last != ret));
27414
27415 return ret;
27416diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27417index 86db4bc..a50a54a 100644
27418--- a/arch/x86/kernel/reboot.c
27419+++ b/arch/x86/kernel/reboot.c
27420@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27421
27422 void __noreturn machine_real_restart(unsigned int type)
27423 {
27424+
27425+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27426+ struct desc_struct *gdt;
27427+#endif
27428+
27429 local_irq_disable();
27430
27431 /*
27432@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27433
27434 /* Jump to the identity-mapped low memory code */
27435 #ifdef CONFIG_X86_32
27436- asm volatile("jmpl *%0" : :
27437+
27438+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27439+ gdt = get_cpu_gdt_table(smp_processor_id());
27440+ pax_open_kernel();
27441+#ifdef CONFIG_PAX_MEMORY_UDEREF
27442+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27443+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27444+ loadsegment(ds, __KERNEL_DS);
27445+ loadsegment(es, __KERNEL_DS);
27446+ loadsegment(ss, __KERNEL_DS);
27447+#endif
27448+#ifdef CONFIG_PAX_KERNEXEC
27449+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27450+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27451+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27452+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27453+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27454+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27455+#endif
27456+ pax_close_kernel();
27457+#endif
27458+
27459+ asm volatile("ljmpl *%0" : :
27460 "rm" (real_mode_header->machine_real_restart_asm),
27461 "a" (type));
27462 #else
27463@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27464 /*
27465 * This is a single dmi_table handling all reboot quirks.
27466 */
27467-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27468+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27469
27470 /* Acer */
27471 { /* Handle reboot issue on Acer Aspire one */
27472@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27473 * This means that this function can never return, it can misbehave
27474 * by not rebooting properly and hanging.
27475 */
27476-static void native_machine_emergency_restart(void)
27477+static void __noreturn native_machine_emergency_restart(void)
27478 {
27479 int i;
27480 int attempt = 0;
27481@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27482 #endif
27483 }
27484
27485-static void __machine_emergency_restart(int emergency)
27486+static void __noreturn __machine_emergency_restart(int emergency)
27487 {
27488 reboot_emergency = emergency;
27489 machine_ops.emergency_restart();
27490 }
27491
27492-static void native_machine_restart(char *__unused)
27493+static void __noreturn native_machine_restart(char *__unused)
27494 {
27495 pr_notice("machine restart\n");
27496
27497@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27498 __machine_emergency_restart(0);
27499 }
27500
27501-static void native_machine_halt(void)
27502+static void __noreturn native_machine_halt(void)
27503 {
27504 /* Stop other cpus and apics */
27505 machine_shutdown();
27506@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27507 stop_this_cpu(NULL);
27508 }
27509
27510-static void native_machine_power_off(void)
27511+static void __noreturn native_machine_power_off(void)
27512 {
27513 if (pm_power_off) {
27514 if (!reboot_force)
27515@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27516 }
27517 /* A fallback in case there is no PM info available */
27518 tboot_shutdown(TB_SHUTDOWN_HALT);
27519+ unreachable();
27520 }
27521
27522-struct machine_ops machine_ops = {
27523+struct machine_ops machine_ops __read_only = {
27524 .power_off = native_machine_power_off,
27525 .shutdown = native_machine_shutdown,
27526 .emergency_restart = native_machine_emergency_restart,
27527diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27528index c8e41e9..64049ef 100644
27529--- a/arch/x86/kernel/reboot_fixups_32.c
27530+++ b/arch/x86/kernel/reboot_fixups_32.c
27531@@ -57,7 +57,7 @@ struct device_fixup {
27532 unsigned int vendor;
27533 unsigned int device;
27534 void (*reboot_fixup)(struct pci_dev *);
27535-};
27536+} __do_const;
27537
27538 /*
27539 * PCI ids solely used for fixups_table go here
27540diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27541index 98111b3..73ca125 100644
27542--- a/arch/x86/kernel/relocate_kernel_64.S
27543+++ b/arch/x86/kernel/relocate_kernel_64.S
27544@@ -96,8 +96,7 @@ relocate_kernel:
27545
27546 /* jump to identity mapped page */
27547 addq $(identity_mapped - relocate_kernel), %r8
27548- pushq %r8
27549- ret
27550+ jmp *%r8
27551
27552 identity_mapped:
27553 /* set return address to 0 if not preserving context */
27554diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27555index d74ac33..d9efe04 100644
27556--- a/arch/x86/kernel/setup.c
27557+++ b/arch/x86/kernel/setup.c
27558@@ -111,6 +111,7 @@
27559 #include <asm/mce.h>
27560 #include <asm/alternative.h>
27561 #include <asm/prom.h>
27562+#include <asm/boot.h>
27563
27564 /*
27565 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27566@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27567 #endif
27568
27569
27570-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27571-__visible unsigned long mmu_cr4_features;
27572+#ifdef CONFIG_X86_64
27573+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27574+#elif defined(CONFIG_X86_PAE)
27575+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27576 #else
27577-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27578+__visible unsigned long mmu_cr4_features __read_only;
27579 #endif
27580
27581 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27582@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27583 * area (640->1Mb) as ram even though it is not.
27584 * take them out.
27585 */
27586- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27587+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27588
27589 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27590 }
27591@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27592 /* called before trim_bios_range() to spare extra sanitize */
27593 static void __init e820_add_kernel_range(void)
27594 {
27595- u64 start = __pa_symbol(_text);
27596+ u64 start = __pa_symbol(ktla_ktva(_text));
27597 u64 size = __pa_symbol(_end) - start;
27598
27599 /*
27600@@ -860,8 +863,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27601
27602 void __init setup_arch(char **cmdline_p)
27603 {
27604+#ifdef CONFIG_X86_32
27605+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27606+#else
27607 memblock_reserve(__pa_symbol(_text),
27608 (unsigned long)__bss_stop - (unsigned long)_text);
27609+#endif
27610
27611 early_reserve_initrd();
27612
27613@@ -959,16 +966,16 @@ void __init setup_arch(char **cmdline_p)
27614
27615 if (!boot_params.hdr.root_flags)
27616 root_mountflags &= ~MS_RDONLY;
27617- init_mm.start_code = (unsigned long) _text;
27618- init_mm.end_code = (unsigned long) _etext;
27619+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27620+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27621 init_mm.end_data = (unsigned long) _edata;
27622 init_mm.brk = _brk_end;
27623
27624 mpx_mm_init(&init_mm);
27625
27626- code_resource.start = __pa_symbol(_text);
27627- code_resource.end = __pa_symbol(_etext)-1;
27628- data_resource.start = __pa_symbol(_etext);
27629+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27630+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27631+ data_resource.start = __pa_symbol(_sdata);
27632 data_resource.end = __pa_symbol(_edata)-1;
27633 bss_resource.start = __pa_symbol(__bss_start);
27634 bss_resource.end = __pa_symbol(__bss_stop)-1;
27635diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27636index e4fcb87..9c06c55 100644
27637--- a/arch/x86/kernel/setup_percpu.c
27638+++ b/arch/x86/kernel/setup_percpu.c
27639@@ -21,19 +21,17 @@
27640 #include <asm/cpu.h>
27641 #include <asm/stackprotector.h>
27642
27643-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27644+#ifdef CONFIG_SMP
27645+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27646 EXPORT_PER_CPU_SYMBOL(cpu_number);
27647+#endif
27648
27649-#ifdef CONFIG_X86_64
27650 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27651-#else
27652-#define BOOT_PERCPU_OFFSET 0
27653-#endif
27654
27655 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27656 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27657
27658-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27659+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27660 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27661 };
27662 EXPORT_SYMBOL(__per_cpu_offset);
27663@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27664 {
27665 #ifdef CONFIG_NEED_MULTIPLE_NODES
27666 pg_data_t *last = NULL;
27667- unsigned int cpu;
27668+ int cpu;
27669
27670 for_each_possible_cpu(cpu) {
27671 int node = early_cpu_to_node(cpu);
27672@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27673 {
27674 #ifdef CONFIG_X86_32
27675 struct desc_struct gdt;
27676+ unsigned long base = per_cpu_offset(cpu);
27677
27678- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27679- 0x2 | DESCTYPE_S, 0x8);
27680- gdt.s = 1;
27681+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27682+ 0x83 | DESCTYPE_S, 0xC);
27683 write_gdt_entry(get_cpu_gdt_table(cpu),
27684 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27685 #endif
27686@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27687 /* alrighty, percpu areas up and running */
27688 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27689 for_each_possible_cpu(cpu) {
27690+#ifdef CONFIG_CC_STACKPROTECTOR
27691+#ifdef CONFIG_X86_32
27692+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27693+#endif
27694+#endif
27695 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27696 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27697 per_cpu(cpu_number, cpu) = cpu;
27698@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27699 */
27700 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27701 #endif
27702+#ifdef CONFIG_CC_STACKPROTECTOR
27703+#ifdef CONFIG_X86_32
27704+ if (!cpu)
27705+ per_cpu(stack_canary.canary, cpu) = canary;
27706+#endif
27707+#endif
27708 /*
27709 * Up to this point, the boot CPU has been using .init.data
27710 * area. Reload any changed state for the boot CPU.
27711diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27712index 1ea14fd..b16147f 100644
27713--- a/arch/x86/kernel/signal.c
27714+++ b/arch/x86/kernel/signal.c
27715@@ -183,7 +183,7 @@ static unsigned long align_sigframe(unsigned long sp)
27716 * Align the stack pointer according to the i386 ABI,
27717 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27718 */
27719- sp = ((sp + 4) & -16ul) - 4;
27720+ sp = ((sp - 12) & -16ul) - 4;
27721 #else /* !CONFIG_X86_32 */
27722 sp = round_down(sp, 16) - 8;
27723 #endif
27724@@ -291,10 +291,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27725 }
27726
27727 if (current->mm->context.vdso)
27728- restorer = current->mm->context.vdso +
27729- selected_vdso32->sym___kernel_sigreturn;
27730+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27731 else
27732- restorer = &frame->retcode;
27733+ restorer = (void __user *)&frame->retcode;
27734 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27735 restorer = ksig->ka.sa.sa_restorer;
27736
27737@@ -308,7 +307,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27738 * reasons and because gdb uses it as a signature to notice
27739 * signal handler stack frames.
27740 */
27741- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27742+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27743
27744 if (err)
27745 return -EFAULT;
27746@@ -355,8 +354,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27747 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27748
27749 /* Set up to return from userspace. */
27750- restorer = current->mm->context.vdso +
27751- selected_vdso32->sym___kernel_rt_sigreturn;
27752+ if (current->mm->context.vdso)
27753+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27754+ else
27755+ restorer = (void __user *)&frame->retcode;
27756 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27757 restorer = ksig->ka.sa.sa_restorer;
27758 put_user_ex(restorer, &frame->pretcode);
27759@@ -368,7 +369,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27760 * reasons and because gdb uses it as a signature to notice
27761 * signal handler stack frames.
27762 */
27763- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27764+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27765 } put_user_catch(err);
27766
27767 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27768@@ -598,7 +599,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27769 {
27770 int usig = ksig->sig;
27771 sigset_t *set = sigmask_to_save();
27772- compat_sigset_t *cset = (compat_sigset_t *) set;
27773+ sigset_t sigcopy;
27774+ compat_sigset_t *cset;
27775+
27776+ sigcopy = *set;
27777+
27778+ cset = (compat_sigset_t *) &sigcopy;
27779
27780 /* Set up the stack frame */
27781 if (is_ia32_frame()) {
27782@@ -609,7 +615,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27783 } else if (is_x32_frame()) {
27784 return x32_setup_rt_frame(ksig, cset, regs);
27785 } else {
27786- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27787+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27788 }
27789 }
27790
27791diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27792index be8e1bd..a3d93fa 100644
27793--- a/arch/x86/kernel/smp.c
27794+++ b/arch/x86/kernel/smp.c
27795@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27796
27797 __setup("nonmi_ipi", nonmi_ipi_setup);
27798
27799-struct smp_ops smp_ops = {
27800+struct smp_ops smp_ops __read_only = {
27801 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27802 .smp_prepare_cpus = native_smp_prepare_cpus,
27803 .smp_cpus_done = native_smp_cpus_done,
27804diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27805index 50e547e..d59d06a 100644
27806--- a/arch/x86/kernel/smpboot.c
27807+++ b/arch/x86/kernel/smpboot.c
27808@@ -226,14 +226,17 @@ static void notrace start_secondary(void *unused)
27809
27810 enable_start_cpu0 = 0;
27811
27812-#ifdef CONFIG_X86_32
27813+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27814+ barrier();
27815+
27816 /* switch away from the initial page table */
27817+#ifdef CONFIG_PAX_PER_CPU_PGD
27818+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27819+#else
27820 load_cr3(swapper_pg_dir);
27821+#endif
27822 __flush_tlb_all();
27823-#endif
27824
27825- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27826- barrier();
27827 /*
27828 * Check TSC synchronization with the BP:
27829 */
27830@@ -782,18 +785,17 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
27831 alternatives_enable_smp();
27832
27833 per_cpu(current_task, cpu) = idle;
27834+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27835
27836 #ifdef CONFIG_X86_32
27837 /* Stack for startup_32 can be just as for start_secondary onwards */
27838 irq_ctx_init(cpu);
27839- per_cpu(cpu_current_top_of_stack, cpu) =
27840- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27841+ per_cpu(cpu_current_top_of_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27842 #else
27843 clear_tsk_thread_flag(idle, TIF_FORK);
27844 initial_gs = per_cpu_offset(cpu);
27845 #endif
27846- per_cpu(kernel_stack, cpu) =
27847- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27848+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27849 }
27850
27851 /*
27852@@ -814,9 +816,11 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27853 unsigned long timeout;
27854
27855 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27856- (THREAD_SIZE + task_stack_page(idle))) - 1);
27857+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27858
27859+ pax_open_kernel();
27860 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27861+ pax_close_kernel();
27862 initial_code = (unsigned long)start_secondary;
27863 stack_start = idle->thread.sp;
27864
27865@@ -961,6 +965,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27866
27867 common_cpu_up(cpu, tidle);
27868
27869+#ifdef CONFIG_PAX_PER_CPU_PGD
27870+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27871+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27872+ KERNEL_PGD_PTRS);
27873+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27874+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27875+ KERNEL_PGD_PTRS);
27876+#endif
27877+
27878 err = do_boot_cpu(apicid, cpu, tidle);
27879 if (err) {
27880 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27881diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27882index 9b4d51d..5d28b58 100644
27883--- a/arch/x86/kernel/step.c
27884+++ b/arch/x86/kernel/step.c
27885@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27886 struct desc_struct *desc;
27887 unsigned long base;
27888
27889- seg &= ~7UL;
27890+ seg >>= 3;
27891
27892 mutex_lock(&child->mm->context.lock);
27893- if (unlikely((seg >> 3) >= child->mm->context.size))
27894+ if (unlikely(seg >= child->mm->context.size))
27895 addr = -1L; /* bogus selector, access would fault */
27896 else {
27897 desc = child->mm->context.ldt + seg;
27898@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27899 addr += base;
27900 }
27901 mutex_unlock(&child->mm->context.lock);
27902- }
27903+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27904+ addr = ktla_ktva(addr);
27905
27906 return addr;
27907 }
27908@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27909 unsigned char opcode[15];
27910 unsigned long addr = convert_ip_to_linear(child, regs);
27911
27912+ if (addr == -EINVAL)
27913+ return 0;
27914+
27915 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27916 for (i = 0; i < copied; i++) {
27917 switch (opcode[i]) {
27918diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27919new file mode 100644
27920index 0000000..5877189
27921--- /dev/null
27922+++ b/arch/x86/kernel/sys_i386_32.c
27923@@ -0,0 +1,189 @@
27924+/*
27925+ * This file contains various random system calls that
27926+ * have a non-standard calling sequence on the Linux/i386
27927+ * platform.
27928+ */
27929+
27930+#include <linux/errno.h>
27931+#include <linux/sched.h>
27932+#include <linux/mm.h>
27933+#include <linux/fs.h>
27934+#include <linux/smp.h>
27935+#include <linux/sem.h>
27936+#include <linux/msg.h>
27937+#include <linux/shm.h>
27938+#include <linux/stat.h>
27939+#include <linux/syscalls.h>
27940+#include <linux/mman.h>
27941+#include <linux/file.h>
27942+#include <linux/utsname.h>
27943+#include <linux/ipc.h>
27944+#include <linux/elf.h>
27945+
27946+#include <linux/uaccess.h>
27947+#include <linux/unistd.h>
27948+
27949+#include <asm/syscalls.h>
27950+
27951+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27952+{
27953+ unsigned long pax_task_size = TASK_SIZE;
27954+
27955+#ifdef CONFIG_PAX_SEGMEXEC
27956+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27957+ pax_task_size = SEGMEXEC_TASK_SIZE;
27958+#endif
27959+
27960+ if (flags & MAP_FIXED)
27961+ if (len > pax_task_size || addr > pax_task_size - len)
27962+ return -EINVAL;
27963+
27964+ return 0;
27965+}
27966+
27967+/*
27968+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27969+ */
27970+static unsigned long get_align_mask(void)
27971+{
27972+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27973+ return 0;
27974+
27975+ if (!(current->flags & PF_RANDOMIZE))
27976+ return 0;
27977+
27978+ return va_align.mask;
27979+}
27980+
27981+unsigned long
27982+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27983+ unsigned long len, unsigned long pgoff, unsigned long flags)
27984+{
27985+ struct mm_struct *mm = current->mm;
27986+ struct vm_area_struct *vma;
27987+ unsigned long pax_task_size = TASK_SIZE;
27988+ struct vm_unmapped_area_info info;
27989+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27990+
27991+#ifdef CONFIG_PAX_SEGMEXEC
27992+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27993+ pax_task_size = SEGMEXEC_TASK_SIZE;
27994+#endif
27995+
27996+ pax_task_size -= PAGE_SIZE;
27997+
27998+ if (len > pax_task_size)
27999+ return -ENOMEM;
28000+
28001+ if (flags & MAP_FIXED)
28002+ return addr;
28003+
28004+#ifdef CONFIG_PAX_RANDMMAP
28005+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28006+#endif
28007+
28008+ if (addr) {
28009+ addr = PAGE_ALIGN(addr);
28010+ if (pax_task_size - len >= addr) {
28011+ vma = find_vma(mm, addr);
28012+ if (check_heap_stack_gap(vma, addr, len, offset))
28013+ return addr;
28014+ }
28015+ }
28016+
28017+ info.flags = 0;
28018+ info.length = len;
28019+ info.align_mask = filp ? get_align_mask() : 0;
28020+ info.align_offset = pgoff << PAGE_SHIFT;
28021+ info.threadstack_offset = offset;
28022+
28023+#ifdef CONFIG_PAX_PAGEEXEC
28024+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
28025+ info.low_limit = 0x00110000UL;
28026+ info.high_limit = mm->start_code;
28027+
28028+#ifdef CONFIG_PAX_RANDMMAP
28029+ if (mm->pax_flags & MF_PAX_RANDMMAP)
28030+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
28031+#endif
28032+
28033+ if (info.low_limit < info.high_limit) {
28034+ addr = vm_unmapped_area(&info);
28035+ if (!IS_ERR_VALUE(addr))
28036+ return addr;
28037+ }
28038+ } else
28039+#endif
28040+
28041+ info.low_limit = mm->mmap_base;
28042+ info.high_limit = pax_task_size;
28043+
28044+ return vm_unmapped_area(&info);
28045+}
28046+
28047+unsigned long
28048+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28049+ const unsigned long len, const unsigned long pgoff,
28050+ const unsigned long flags)
28051+{
28052+ struct vm_area_struct *vma;
28053+ struct mm_struct *mm = current->mm;
28054+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
28055+ struct vm_unmapped_area_info info;
28056+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28057+
28058+#ifdef CONFIG_PAX_SEGMEXEC
28059+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
28060+ pax_task_size = SEGMEXEC_TASK_SIZE;
28061+#endif
28062+
28063+ pax_task_size -= PAGE_SIZE;
28064+
28065+ /* requested length too big for entire address space */
28066+ if (len > pax_task_size)
28067+ return -ENOMEM;
28068+
28069+ if (flags & MAP_FIXED)
28070+ return addr;
28071+
28072+#ifdef CONFIG_PAX_PAGEEXEC
28073+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
28074+ goto bottomup;
28075+#endif
28076+
28077+#ifdef CONFIG_PAX_RANDMMAP
28078+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28079+#endif
28080+
28081+ /* requesting a specific address */
28082+ if (addr) {
28083+ addr = PAGE_ALIGN(addr);
28084+ if (pax_task_size - len >= addr) {
28085+ vma = find_vma(mm, addr);
28086+ if (check_heap_stack_gap(vma, addr, len, offset))
28087+ return addr;
28088+ }
28089+ }
28090+
28091+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
28092+ info.length = len;
28093+ info.low_limit = PAGE_SIZE;
28094+ info.high_limit = mm->mmap_base;
28095+ info.align_mask = filp ? get_align_mask() : 0;
28096+ info.align_offset = pgoff << PAGE_SHIFT;
28097+ info.threadstack_offset = offset;
28098+
28099+ addr = vm_unmapped_area(&info);
28100+ if (!(addr & ~PAGE_MASK))
28101+ return addr;
28102+ VM_BUG_ON(addr != -ENOMEM);
28103+
28104+bottomup:
28105+ /*
28106+ * A failed mmap() very likely causes application failure,
28107+ * so fall back to the bottom-up function here. This scenario
28108+ * can happen with large stack limits and large mmap()
28109+ * allocations.
28110+ */
28111+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
28112+}
28113diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
28114index 10e0272..b4bb9a7 100644
28115--- a/arch/x86/kernel/sys_x86_64.c
28116+++ b/arch/x86/kernel/sys_x86_64.c
28117@@ -97,8 +97,8 @@ out:
28118 return error;
28119 }
28120
28121-static void find_start_end(unsigned long flags, unsigned long *begin,
28122- unsigned long *end)
28123+static void find_start_end(struct mm_struct *mm, unsigned long flags,
28124+ unsigned long *begin, unsigned long *end)
28125 {
28126 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
28127 unsigned long new_begin;
28128@@ -117,7 +117,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
28129 *begin = new_begin;
28130 }
28131 } else {
28132- *begin = current->mm->mmap_legacy_base;
28133+ *begin = mm->mmap_legacy_base;
28134 *end = TASK_SIZE;
28135 }
28136 }
28137@@ -130,20 +130,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
28138 struct vm_area_struct *vma;
28139 struct vm_unmapped_area_info info;
28140 unsigned long begin, end;
28141+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28142
28143 if (flags & MAP_FIXED)
28144 return addr;
28145
28146- find_start_end(flags, &begin, &end);
28147+ find_start_end(mm, flags, &begin, &end);
28148
28149 if (len > end)
28150 return -ENOMEM;
28151
28152+#ifdef CONFIG_PAX_RANDMMAP
28153+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28154+#endif
28155+
28156 if (addr) {
28157 addr = PAGE_ALIGN(addr);
28158 vma = find_vma(mm, addr);
28159- if (end - len >= addr &&
28160- (!vma || addr + len <= vma->vm_start))
28161+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
28162 return addr;
28163 }
28164
28165@@ -157,6 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
28166 info.align_mask = get_align_mask();
28167 info.align_offset += get_align_bits();
28168 }
28169+ info.threadstack_offset = offset;
28170 return vm_unmapped_area(&info);
28171 }
28172
28173@@ -169,6 +174,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28174 struct mm_struct *mm = current->mm;
28175 unsigned long addr = addr0;
28176 struct vm_unmapped_area_info info;
28177+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28178
28179 /* requested length too big for entire address space */
28180 if (len > TASK_SIZE)
28181@@ -181,12 +187,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28182 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
28183 goto bottomup;
28184
28185+#ifdef CONFIG_PAX_RANDMMAP
28186+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28187+#endif
28188+
28189 /* requesting a specific address */
28190 if (addr) {
28191 addr = PAGE_ALIGN(addr);
28192 vma = find_vma(mm, addr);
28193- if (TASK_SIZE - len >= addr &&
28194- (!vma || addr + len <= vma->vm_start))
28195+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
28196 return addr;
28197 }
28198
28199@@ -200,6 +209,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28200 info.align_mask = get_align_mask();
28201 info.align_offset += get_align_bits();
28202 }
28203+ info.threadstack_offset = offset;
28204 addr = vm_unmapped_area(&info);
28205 if (!(addr & ~PAGE_MASK))
28206 return addr;
28207diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
28208index 91a4496..42fc304 100644
28209--- a/arch/x86/kernel/tboot.c
28210+++ b/arch/x86/kernel/tboot.c
28211@@ -44,6 +44,7 @@
28212 #include <asm/setup.h>
28213 #include <asm/e820.h>
28214 #include <asm/io.h>
28215+#include <asm/tlbflush.h>
28216
28217 #include "../realmode/rm/wakeup.h"
28218
28219@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
28220
28221 void tboot_shutdown(u32 shutdown_type)
28222 {
28223- void (*shutdown)(void);
28224+ void (* __noreturn shutdown)(void);
28225
28226 if (!tboot_enabled())
28227 return;
28228@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
28229 tboot->shutdown_type = shutdown_type;
28230
28231 switch_to_tboot_pt();
28232+ cr4_clear_bits(X86_CR4_PCIDE);
28233
28234- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
28235+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
28236 shutdown();
28237
28238 /* should not reach here */
28239@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
28240 return -ENODEV;
28241 }
28242
28243-static atomic_t ap_wfs_count;
28244+static atomic_unchecked_t ap_wfs_count;
28245
28246 static int tboot_wait_for_aps(int num_aps)
28247 {
28248@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
28249 {
28250 switch (action) {
28251 case CPU_DYING:
28252- atomic_inc(&ap_wfs_count);
28253+ atomic_inc_unchecked(&ap_wfs_count);
28254 if (num_online_cpus() == 1)
28255- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
28256+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
28257 return NOTIFY_BAD;
28258 break;
28259 }
28260@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
28261
28262 tboot_create_trampoline();
28263
28264- atomic_set(&ap_wfs_count, 0);
28265+ atomic_set_unchecked(&ap_wfs_count, 0);
28266 register_hotcpu_notifier(&tboot_cpu_notifier);
28267
28268 #ifdef CONFIG_DEBUG_FS
28269diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
28270index d39c091..1df4349 100644
28271--- a/arch/x86/kernel/time.c
28272+++ b/arch/x86/kernel/time.c
28273@@ -32,7 +32,7 @@ unsigned long profile_pc(struct pt_regs *regs)
28274
28275 if (!user_mode(regs) && in_lock_functions(pc)) {
28276 #ifdef CONFIG_FRAME_POINTER
28277- return *(unsigned long *)(regs->bp + sizeof(long));
28278+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
28279 #else
28280 unsigned long *sp =
28281 (unsigned long *)kernel_stack_pointer(regs);
28282@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
28283 * or above a saved flags. Eflags has bits 22-31 zero,
28284 * kernel addresses don't.
28285 */
28286+
28287+#ifdef CONFIG_PAX_KERNEXEC
28288+ return ktla_ktva(sp[0]);
28289+#else
28290 if (sp[0] >> 22)
28291 return sp[0];
28292 if (sp[1] >> 22)
28293 return sp[1];
28294 #endif
28295+
28296+#endif
28297 }
28298 return pc;
28299 }
28300diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
28301index 7fc5e84..c6e445a 100644
28302--- a/arch/x86/kernel/tls.c
28303+++ b/arch/x86/kernel/tls.c
28304@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
28305 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
28306 return -EINVAL;
28307
28308+#ifdef CONFIG_PAX_SEGMEXEC
28309+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
28310+ return -EINVAL;
28311+#endif
28312+
28313 set_tls_desc(p, idx, &info, 1);
28314
28315 return 0;
28316@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
28317
28318 if (kbuf)
28319 info = kbuf;
28320- else if (__copy_from_user(infobuf, ubuf, count))
28321+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
28322 return -EFAULT;
28323 else
28324 info = infobuf;
28325diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
28326index 1c113db..287b42e 100644
28327--- a/arch/x86/kernel/tracepoint.c
28328+++ b/arch/x86/kernel/tracepoint.c
28329@@ -9,11 +9,11 @@
28330 #include <linux/atomic.h>
28331
28332 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
28333-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28334+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28335 (unsigned long) trace_idt_table };
28336
28337 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28338-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
28339+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
28340
28341 static int trace_irq_vector_refcount;
28342 static DEFINE_MUTEX(irq_vector_mutex);
28343diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
28344index 324ab52..0cfd2d05 100644
28345--- a/arch/x86/kernel/traps.c
28346+++ b/arch/x86/kernel/traps.c
28347@@ -68,7 +68,7 @@
28348 #include <asm/proto.h>
28349
28350 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28351-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
28352+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
28353 #else
28354 #include <asm/processor-flags.h>
28355 #include <asm/setup.h>
28356@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
28357 #endif
28358
28359 /* Must be page-aligned because the real IDT is used in a fixmap. */
28360-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
28361+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
28362
28363 DECLARE_BITMAP(used_vectors, NR_VECTORS);
28364 EXPORT_SYMBOL_GPL(used_vectors);
28365@@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
28366 * will catch asm bugs and any attempt to use ist_preempt_enable
28367 * from double_fault.
28368 */
28369- BUG_ON((unsigned long)(current_top_of_stack() -
28370+ BUG_ON((unsigned long)(current_top_of_stack(smp_processor_id()) -
28371 current_stack_pointer()) >= THREAD_SIZE);
28372
28373 preempt_count_sub(HARDIRQ_OFFSET);
28374@@ -191,7 +191,7 @@ void ist_end_non_atomic(void)
28375 }
28376
28377 static nokprobe_inline int
28378-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28379+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
28380 struct pt_regs *regs, long error_code)
28381 {
28382 if (v8086_mode(regs)) {
28383@@ -211,8 +211,20 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28384 if (!fixup_exception(regs)) {
28385 tsk->thread.error_code = error_code;
28386 tsk->thread.trap_nr = trapnr;
28387+
28388+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28389+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28390+ str = "PAX: suspicious stack segment fault";
28391+#endif
28392+
28393 die(str, regs, error_code);
28394 }
28395+
28396+#ifdef CONFIG_PAX_REFCOUNT
28397+ if (trapnr == X86_TRAP_OF)
28398+ pax_report_refcount_overflow(regs);
28399+#endif
28400+
28401 return 0;
28402 }
28403
28404@@ -251,7 +263,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28405 }
28406
28407 static void
28408-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28409+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28410 long error_code, siginfo_t *info)
28411 {
28412 struct task_struct *tsk = current;
28413@@ -275,7 +287,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28414 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28415 printk_ratelimit()) {
28416 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28417- tsk->comm, tsk->pid, str,
28418+ tsk->comm, task_pid_nr(tsk), str,
28419 regs->ip, regs->sp, error_code);
28420 print_vma_addr(" in ", regs->ip);
28421 pr_cont("\n");
28422@@ -357,6 +369,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28423 tsk->thread.error_code = error_code;
28424 tsk->thread.trap_nr = X86_TRAP_DF;
28425
28426+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28427+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28428+ die("grsec: kernel stack overflow detected", regs, error_code);
28429+#endif
28430+
28431 #ifdef CONFIG_DOUBLEFAULT
28432 df_debug(regs, error_code);
28433 #endif
28434@@ -475,11 +492,35 @@ do_general_protection(struct pt_regs *regs, long error_code)
28435 tsk->thread.error_code = error_code;
28436 tsk->thread.trap_nr = X86_TRAP_GP;
28437 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28438- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28439+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28440+
28441+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28442+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28443+ die("PAX: suspicious general protection fault", regs, error_code);
28444+ else
28445+#endif
28446+
28447 die("general protection fault", regs, error_code);
28448+ }
28449 goto exit;
28450 }
28451
28452+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28453+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28454+ struct mm_struct *mm = tsk->mm;
28455+ unsigned long limit;
28456+
28457+ down_write(&mm->mmap_sem);
28458+ limit = mm->context.user_cs_limit;
28459+ if (limit < TASK_SIZE) {
28460+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28461+ up_write(&mm->mmap_sem);
28462+ return;
28463+ }
28464+ up_write(&mm->mmap_sem);
28465+ }
28466+#endif
28467+
28468 tsk->thread.error_code = error_code;
28469 tsk->thread.trap_nr = X86_TRAP_GP;
28470
28471@@ -578,6 +619,9 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28472 container_of(task_pt_regs(current),
28473 struct bad_iret_stack, regs);
28474
28475+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28476+ new_stack = s;
28477+
28478 /* Copy the IRET target to the new stack. */
28479 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28480
28481diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28482index 5054497..139f8f8 100644
28483--- a/arch/x86/kernel/tsc.c
28484+++ b/arch/x86/kernel/tsc.c
28485@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28486 */
28487 smp_wmb();
28488
28489- ACCESS_ONCE(c2n->head) = data;
28490+ ACCESS_ONCE_RW(c2n->head) = data;
28491 }
28492
28493 /*
28494diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28495index 0b81ad6..fff670e 100644
28496--- a/arch/x86/kernel/uprobes.c
28497+++ b/arch/x86/kernel/uprobes.c
28498@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28499
28500 if (nleft != rasize) {
28501 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28502- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28503+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28504
28505 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28506 }
28507diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28508index b9242ba..50c5edd 100644
28509--- a/arch/x86/kernel/verify_cpu.S
28510+++ b/arch/x86/kernel/verify_cpu.S
28511@@ -20,6 +20,7 @@
28512 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28513 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28514 * arch/x86/kernel/head_32.S: processor startup
28515+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28516 *
28517 * verify_cpu, returns the status of longmode and SSE in register %eax.
28518 * 0: Success 1: Failure
28519diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28520index fc9db6e..2c5865d 100644
28521--- a/arch/x86/kernel/vm86_32.c
28522+++ b/arch/x86/kernel/vm86_32.c
28523@@ -44,6 +44,7 @@
28524 #include <linux/ptrace.h>
28525 #include <linux/audit.h>
28526 #include <linux/stddef.h>
28527+#include <linux/grsecurity.h>
28528
28529 #include <asm/uaccess.h>
28530 #include <asm/io.h>
28531@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28532 do_exit(SIGSEGV);
28533 }
28534
28535- tss = &per_cpu(cpu_tss, get_cpu());
28536+ tss = cpu_tss + get_cpu();
28537 current->thread.sp0 = current->thread.saved_sp0;
28538 current->thread.sysenter_cs = __KERNEL_CS;
28539 load_sp0(tss, &current->thread);
28540@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28541
28542 if (tsk->thread.saved_sp0)
28543 return -EPERM;
28544+
28545+#ifdef CONFIG_GRKERNSEC_VM86
28546+ if (!capable(CAP_SYS_RAWIO)) {
28547+ gr_handle_vm86();
28548+ return -EPERM;
28549+ }
28550+#endif
28551+
28552 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28553 offsetof(struct kernel_vm86_struct, vm86plus) -
28554 sizeof(info.regs));
28555@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28556 int tmp;
28557 struct vm86plus_struct __user *v86;
28558
28559+#ifdef CONFIG_GRKERNSEC_VM86
28560+ if (!capable(CAP_SYS_RAWIO)) {
28561+ gr_handle_vm86();
28562+ return -EPERM;
28563+ }
28564+#endif
28565+
28566 tsk = current;
28567 switch (cmd) {
28568 case VM86_REQUEST_IRQ:
28569@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28570 tsk->thread.saved_fs = info->regs32->fs;
28571 tsk->thread.saved_gs = get_user_gs(info->regs32);
28572
28573- tss = &per_cpu(cpu_tss, get_cpu());
28574+ tss = cpu_tss + get_cpu();
28575 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28576 if (cpu_has_sep)
28577 tsk->thread.sysenter_cs = 0;
28578@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28579 goto cannot_handle;
28580 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28581 goto cannot_handle;
28582- intr_ptr = (unsigned long __user *) (i << 2);
28583+ intr_ptr = (__force unsigned long __user *) (i << 2);
28584 if (get_user(segoffs, intr_ptr))
28585 goto cannot_handle;
28586 if ((segoffs >> 16) == BIOSSEG)
28587diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28588index 00bf300..129df8e 100644
28589--- a/arch/x86/kernel/vmlinux.lds.S
28590+++ b/arch/x86/kernel/vmlinux.lds.S
28591@@ -26,6 +26,13 @@
28592 #include <asm/page_types.h>
28593 #include <asm/cache.h>
28594 #include <asm/boot.h>
28595+#include <asm/segment.h>
28596+
28597+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28598+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28599+#else
28600+#define __KERNEL_TEXT_OFFSET 0
28601+#endif
28602
28603 #undef i386 /* in case the preprocessor is a 32bit one */
28604
28605@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28606
28607 PHDRS {
28608 text PT_LOAD FLAGS(5); /* R_E */
28609+#ifdef CONFIG_X86_32
28610+ module PT_LOAD FLAGS(5); /* R_E */
28611+#endif
28612+#ifdef CONFIG_XEN
28613+ rodata PT_LOAD FLAGS(5); /* R_E */
28614+#else
28615+ rodata PT_LOAD FLAGS(4); /* R__ */
28616+#endif
28617 data PT_LOAD FLAGS(6); /* RW_ */
28618-#ifdef CONFIG_X86_64
28619+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28620 #ifdef CONFIG_SMP
28621 percpu PT_LOAD FLAGS(6); /* RW_ */
28622 #endif
28623+ text.init PT_LOAD FLAGS(5); /* R_E */
28624+ text.exit PT_LOAD FLAGS(5); /* R_E */
28625 init PT_LOAD FLAGS(7); /* RWE */
28626-#endif
28627 note PT_NOTE FLAGS(0); /* ___ */
28628 }
28629
28630 SECTIONS
28631 {
28632 #ifdef CONFIG_X86_32
28633- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28634- phys_startup_32 = startup_32 - LOAD_OFFSET;
28635+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28636 #else
28637- . = __START_KERNEL;
28638- phys_startup_64 = startup_64 - LOAD_OFFSET;
28639+ . = __START_KERNEL;
28640 #endif
28641
28642 /* Text and read-only data */
28643- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28644- _text = .;
28645+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28646 /* bootstrapping code */
28647+#ifdef CONFIG_X86_32
28648+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28649+#else
28650+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28651+#endif
28652+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28653+ _text = .;
28654 HEAD_TEXT
28655 . = ALIGN(8);
28656 _stext = .;
28657@@ -104,13 +124,47 @@ SECTIONS
28658 IRQENTRY_TEXT
28659 *(.fixup)
28660 *(.gnu.warning)
28661- /* End of text section */
28662- _etext = .;
28663 } :text = 0x9090
28664
28665- NOTES :text :note
28666+ . += __KERNEL_TEXT_OFFSET;
28667
28668- EXCEPTION_TABLE(16) :text = 0x9090
28669+#ifdef CONFIG_X86_32
28670+ . = ALIGN(PAGE_SIZE);
28671+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28672+
28673+#ifdef CONFIG_PAX_KERNEXEC
28674+ MODULES_EXEC_VADDR = .;
28675+ BYTE(0)
28676+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28677+ . = ALIGN(HPAGE_SIZE) - 1;
28678+ MODULES_EXEC_END = .;
28679+#endif
28680+
28681+ } :module
28682+#endif
28683+
28684+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28685+ /* End of text section */
28686+ BYTE(0)
28687+ _etext = . - __KERNEL_TEXT_OFFSET;
28688+ }
28689+
28690+#ifdef CONFIG_X86_32
28691+ . = ALIGN(PAGE_SIZE);
28692+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28693+ . = ALIGN(PAGE_SIZE);
28694+ *(.empty_zero_page)
28695+ *(.initial_pg_fixmap)
28696+ *(.initial_pg_pmd)
28697+ *(.initial_page_table)
28698+ *(.swapper_pg_dir)
28699+ } :rodata
28700+#endif
28701+
28702+ . = ALIGN(PAGE_SIZE);
28703+ NOTES :rodata :note
28704+
28705+ EXCEPTION_TABLE(16) :rodata
28706
28707 #if defined(CONFIG_DEBUG_RODATA)
28708 /* .text should occupy whole number of pages */
28709@@ -122,16 +176,20 @@ SECTIONS
28710
28711 /* Data */
28712 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28713+
28714+#ifdef CONFIG_PAX_KERNEXEC
28715+ . = ALIGN(HPAGE_SIZE);
28716+#else
28717+ . = ALIGN(PAGE_SIZE);
28718+#endif
28719+
28720 /* Start of data section */
28721 _sdata = .;
28722
28723 /* init_task */
28724 INIT_TASK_DATA(THREAD_SIZE)
28725
28726-#ifdef CONFIG_X86_32
28727- /* 32 bit has nosave before _edata */
28728 NOSAVE_DATA
28729-#endif
28730
28731 PAGE_ALIGNED_DATA(PAGE_SIZE)
28732
28733@@ -174,12 +232,19 @@ SECTIONS
28734 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28735
28736 /* Init code and data - will be freed after init */
28737- . = ALIGN(PAGE_SIZE);
28738 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28739+ BYTE(0)
28740+
28741+#ifdef CONFIG_PAX_KERNEXEC
28742+ . = ALIGN(HPAGE_SIZE);
28743+#else
28744+ . = ALIGN(PAGE_SIZE);
28745+#endif
28746+
28747 __init_begin = .; /* paired with __init_end */
28748- }
28749+ } :init.begin
28750
28751-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28752+#ifdef CONFIG_SMP
28753 /*
28754 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28755 * output PHDR, so the next output section - .init.text - should
28756@@ -190,12 +255,27 @@ SECTIONS
28757 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28758 #endif
28759
28760- INIT_TEXT_SECTION(PAGE_SIZE)
28761-#ifdef CONFIG_X86_64
28762- :init
28763-#endif
28764+ . = ALIGN(PAGE_SIZE);
28765+ init_begin = .;
28766+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28767+ VMLINUX_SYMBOL(_sinittext) = .;
28768+ INIT_TEXT
28769+ . = ALIGN(PAGE_SIZE);
28770+ } :text.init
28771
28772- INIT_DATA_SECTION(16)
28773+ /*
28774+ * .exit.text is discard at runtime, not link time, to deal with
28775+ * references from .altinstructions and .eh_frame
28776+ */
28777+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28778+ EXIT_TEXT
28779+ VMLINUX_SYMBOL(_einittext) = .;
28780+ . = ALIGN(16);
28781+ } :text.exit
28782+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28783+
28784+ . = ALIGN(PAGE_SIZE);
28785+ INIT_DATA_SECTION(16) :init
28786
28787 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28788 __x86_cpu_dev_start = .;
28789@@ -266,19 +346,12 @@ SECTIONS
28790 }
28791
28792 . = ALIGN(8);
28793- /*
28794- * .exit.text is discard at runtime, not link time, to deal with
28795- * references from .altinstructions and .eh_frame
28796- */
28797- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28798- EXIT_TEXT
28799- }
28800
28801 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28802 EXIT_DATA
28803 }
28804
28805-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28806+#ifndef CONFIG_SMP
28807 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28808 #endif
28809
28810@@ -297,16 +370,10 @@ SECTIONS
28811 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28812 __smp_locks = .;
28813 *(.smp_locks)
28814- . = ALIGN(PAGE_SIZE);
28815 __smp_locks_end = .;
28816+ . = ALIGN(PAGE_SIZE);
28817 }
28818
28819-#ifdef CONFIG_X86_64
28820- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28821- NOSAVE_DATA
28822- }
28823-#endif
28824-
28825 /* BSS */
28826 . = ALIGN(PAGE_SIZE);
28827 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28828@@ -322,6 +389,7 @@ SECTIONS
28829 __brk_base = .;
28830 . += 64 * 1024; /* 64k alignment slop space */
28831 *(.brk_reservation) /* areas brk users have reserved */
28832+ . = ALIGN(HPAGE_SIZE);
28833 __brk_limit = .;
28834 }
28835
28836@@ -348,13 +416,12 @@ SECTIONS
28837 * for the boot processor.
28838 */
28839 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28840-INIT_PER_CPU(gdt_page);
28841 INIT_PER_CPU(irq_stack_union);
28842
28843 /*
28844 * Build-time check on the image size:
28845 */
28846-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28847+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28848 "kernel image bigger than KERNEL_IMAGE_SIZE");
28849
28850 #ifdef CONFIG_SMP
28851diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28852index 2dcc6ff..082dc7a 100644
28853--- a/arch/x86/kernel/vsyscall_64.c
28854+++ b/arch/x86/kernel/vsyscall_64.c
28855@@ -38,15 +38,13 @@
28856 #define CREATE_TRACE_POINTS
28857 #include "vsyscall_trace.h"
28858
28859-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28860+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28861
28862 static int __init vsyscall_setup(char *str)
28863 {
28864 if (str) {
28865 if (!strcmp("emulate", str))
28866 vsyscall_mode = EMULATE;
28867- else if (!strcmp("native", str))
28868- vsyscall_mode = NATIVE;
28869 else if (!strcmp("none", str))
28870 vsyscall_mode = NONE;
28871 else
28872@@ -264,8 +262,7 @@ do_ret:
28873 return true;
28874
28875 sigsegv:
28876- force_sig(SIGSEGV, current);
28877- return true;
28878+ do_group_exit(SIGKILL);
28879 }
28880
28881 /*
28882@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28883 static struct vm_area_struct gate_vma = {
28884 .vm_start = VSYSCALL_ADDR,
28885 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28886- .vm_page_prot = PAGE_READONLY_EXEC,
28887- .vm_flags = VM_READ | VM_EXEC,
28888+ .vm_page_prot = PAGE_READONLY,
28889+ .vm_flags = VM_READ,
28890 .vm_ops = &gate_vma_ops,
28891 };
28892
28893@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28894 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28895
28896 if (vsyscall_mode != NONE)
28897- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28898- vsyscall_mode == NATIVE
28899- ? PAGE_KERNEL_VSYSCALL
28900- : PAGE_KERNEL_VVAR);
28901+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28902
28903 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28904 (unsigned long)VSYSCALL_ADDR);
28905diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28906index 37d8fa4..66e319a 100644
28907--- a/arch/x86/kernel/x8664_ksyms_64.c
28908+++ b/arch/x86/kernel/x8664_ksyms_64.c
28909@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28910 EXPORT_SYMBOL(copy_user_generic_unrolled);
28911 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28912 EXPORT_SYMBOL(__copy_user_nocache);
28913-EXPORT_SYMBOL(_copy_from_user);
28914-EXPORT_SYMBOL(_copy_to_user);
28915
28916 EXPORT_SYMBOL(copy_page);
28917 EXPORT_SYMBOL(clear_page);
28918@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28919 EXPORT_SYMBOL(___preempt_schedule_context);
28920 #endif
28921 #endif
28922+
28923+#ifdef CONFIG_PAX_PER_CPU_PGD
28924+EXPORT_SYMBOL(cpu_pgd);
28925+#endif
28926diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28927index 234b072..b7ab191 100644
28928--- a/arch/x86/kernel/x86_init.c
28929+++ b/arch/x86/kernel/x86_init.c
28930@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28931 static void default_nmi_init(void) { };
28932 static int default_i8042_detect(void) { return 1; };
28933
28934-struct x86_platform_ops x86_platform = {
28935+struct x86_platform_ops x86_platform __read_only = {
28936 .calibrate_tsc = native_calibrate_tsc,
28937 .get_wallclock = mach_get_cmos_time,
28938 .set_wallclock = mach_set_rtc_mmss,
28939@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28940 EXPORT_SYMBOL_GPL(x86_platform);
28941
28942 #if defined(CONFIG_PCI_MSI)
28943-struct x86_msi_ops x86_msi = {
28944+struct x86_msi_ops x86_msi __read_only = {
28945 .setup_msi_irqs = native_setup_msi_irqs,
28946 .compose_msi_msg = native_compose_msi_msg,
28947 .teardown_msi_irq = native_teardown_msi_irq,
28948@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28949 }
28950 #endif
28951
28952-struct x86_io_apic_ops x86_io_apic_ops = {
28953+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28954 .init = native_io_apic_init_mappings,
28955 .read = native_io_apic_read,
28956 .write = native_io_apic_write,
28957diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28958index 87a815b..727dbe6 100644
28959--- a/arch/x86/kernel/xsave.c
28960+++ b/arch/x86/kernel/xsave.c
28961@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28962
28963 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28964 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28965- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28966+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28967
28968 if (!use_xsave())
28969 return err;
28970
28971- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28972+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28973
28974 /*
28975 * Read the xstate_bv which we copied (directly from the cpu or
28976 * from the state in task struct) to the user buffers.
28977 */
28978- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28979+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28980
28981 /*
28982 * For legacy compatible, we always set FP/SSE bits in the bit
28983@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28984 */
28985 xstate_bv |= XSTATE_FPSSE;
28986
28987- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28988+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28989
28990 return err;
28991 }
28992@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28993 {
28994 int err;
28995
28996+ buf = (struct xsave_struct __user *)____m(buf);
28997 if (use_xsave())
28998 err = xsave_user(buf);
28999 else if (use_fxsr())
29000@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
29001 */
29002 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
29003 {
29004+ buf = (void __user *)____m(buf);
29005 if (use_xsave()) {
29006 if ((unsigned long)buf % 64 || fx_only) {
29007 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
29008diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
29009index 1d08ad3..c6a4faf 100644
29010--- a/arch/x86/kvm/cpuid.c
29011+++ b/arch/x86/kvm/cpuid.c
29012@@ -204,15 +204,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
29013 struct kvm_cpuid2 *cpuid,
29014 struct kvm_cpuid_entry2 __user *entries)
29015 {
29016- int r;
29017+ int r, i;
29018
29019 r = -E2BIG;
29020 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
29021 goto out;
29022 r = -EFAULT;
29023- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
29024- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
29025+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
29026 goto out;
29027+ for (i = 0; i < cpuid->nent; ++i) {
29028+ struct kvm_cpuid_entry2 cpuid_entry;
29029+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
29030+ goto out;
29031+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
29032+ }
29033 vcpu->arch.cpuid_nent = cpuid->nent;
29034 kvm_apic_set_version(vcpu);
29035 kvm_x86_ops->cpuid_update(vcpu);
29036@@ -225,15 +230,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
29037 struct kvm_cpuid2 *cpuid,
29038 struct kvm_cpuid_entry2 __user *entries)
29039 {
29040- int r;
29041+ int r, i;
29042
29043 r = -E2BIG;
29044 if (cpuid->nent < vcpu->arch.cpuid_nent)
29045 goto out;
29046 r = -EFAULT;
29047- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
29048- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
29049+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
29050 goto out;
29051+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
29052+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
29053+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
29054+ goto out;
29055+ }
29056 return 0;
29057
29058 out:
29059diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
29060index 630bcb0..a7f6d9e 100644
29061--- a/arch/x86/kvm/emulate.c
29062+++ b/arch/x86/kvm/emulate.c
29063@@ -3569,7 +3569,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
29064 int cr = ctxt->modrm_reg;
29065 u64 efer = 0;
29066
29067- static u64 cr_reserved_bits[] = {
29068+ static const u64 cr_reserved_bits[] = {
29069 0xffffffff00000000ULL,
29070 0, 0, 0, /* CR3 checked later */
29071 CR4_RESERVED_BITS,
29072diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
29073index 67d07e0..10769d5 100644
29074--- a/arch/x86/kvm/lapic.c
29075+++ b/arch/x86/kvm/lapic.c
29076@@ -56,7 +56,7 @@
29077 #define APIC_BUS_CYCLE_NS 1
29078
29079 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
29080-#define apic_debug(fmt, arg...)
29081+#define apic_debug(fmt, arg...) do {} while (0)
29082
29083 #define APIC_LVT_NUM 6
29084 /* 14 is the version for Xeon and Pentium 8.4.8*/
29085diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
29086index 9d28383..c4ea87e 100644
29087--- a/arch/x86/kvm/lapic.h
29088+++ b/arch/x86/kvm/lapic.h
29089@@ -150,7 +150,7 @@ static inline bool kvm_apic_vid_enabled(struct kvm *kvm)
29090
29091 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
29092 {
29093- return vcpu->arch.apic->pending_events;
29094+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
29095 }
29096
29097 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
29098diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
29099index 6e6d115..43fecbf 100644
29100--- a/arch/x86/kvm/paging_tmpl.h
29101+++ b/arch/x86/kvm/paging_tmpl.h
29102@@ -343,7 +343,7 @@ retry_walk:
29103 if (unlikely(kvm_is_error_hva(host_addr)))
29104 goto error;
29105
29106- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
29107+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
29108 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
29109 goto error;
29110 walker->ptep_user[walker->level - 1] = ptep_user;
29111diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
29112index 4911bf1..e7d3ed2 100644
29113--- a/arch/x86/kvm/svm.c
29114+++ b/arch/x86/kvm/svm.c
29115@@ -3577,7 +3577,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
29116 int cpu = raw_smp_processor_id();
29117
29118 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
29119+
29120+ pax_open_kernel();
29121 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
29122+ pax_close_kernel();
29123+
29124 load_TR_desc();
29125 }
29126
29127@@ -3973,6 +3977,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
29128 #endif
29129 #endif
29130
29131+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29132+ __set_fs(current_thread_info()->addr_limit);
29133+#endif
29134+
29135 reload_tss(vcpu);
29136
29137 local_irq_disable();
29138diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
29139index 2d73807..84a0e59 100644
29140--- a/arch/x86/kvm/vmx.c
29141+++ b/arch/x86/kvm/vmx.c
29142@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
29143 #endif
29144 }
29145
29146-static void vmcs_clear_bits(unsigned long field, u32 mask)
29147+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
29148 {
29149 vmcs_writel(field, vmcs_readl(field) & ~mask);
29150 }
29151
29152-static void vmcs_set_bits(unsigned long field, u32 mask)
29153+static void vmcs_set_bits(unsigned long field, unsigned long mask)
29154 {
29155 vmcs_writel(field, vmcs_readl(field) | mask);
29156 }
29157@@ -1705,7 +1705,11 @@ static void reload_tss(void)
29158 struct desc_struct *descs;
29159
29160 descs = (void *)gdt->address;
29161+
29162+ pax_open_kernel();
29163 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
29164+ pax_close_kernel();
29165+
29166 load_TR_desc();
29167 }
29168
29169@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
29170 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
29171 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
29172
29173+#ifdef CONFIG_PAX_PER_CPU_PGD
29174+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
29175+#endif
29176+
29177 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
29178 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
29179 vmx->loaded_vmcs->cpu = cpu;
29180@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
29181 * reads and returns guest's timestamp counter "register"
29182 * guest_tsc = host_tsc + tsc_offset -- 21.3
29183 */
29184-static u64 guest_read_tsc(void)
29185+static u64 __intentional_overflow(-1) guest_read_tsc(void)
29186 {
29187 u64 host_tsc, tsc_offset;
29188
29189@@ -4467,7 +4475,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
29190 unsigned long cr4;
29191
29192 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
29193+
29194+#ifndef CONFIG_PAX_PER_CPU_PGD
29195 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
29196+#endif
29197
29198 /* Save the most likely value for this task's CR4 in the VMCS. */
29199 cr4 = cr4_read_shadow();
29200@@ -4494,7 +4505,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
29201 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
29202 vmx->host_idt_base = dt.address;
29203
29204- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
29205+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
29206
29207 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
29208 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
29209@@ -6107,11 +6118,17 @@ static __init int hardware_setup(void)
29210 * page upon invalidation. No need to do anything if not
29211 * using the APIC_ACCESS_ADDR VMCS field.
29212 */
29213- if (!flexpriority_enabled)
29214- kvm_x86_ops->set_apic_access_page_addr = NULL;
29215+ if (!flexpriority_enabled) {
29216+ pax_open_kernel();
29217+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
29218+ pax_close_kernel();
29219+ }
29220
29221- if (!cpu_has_vmx_tpr_shadow())
29222- kvm_x86_ops->update_cr8_intercept = NULL;
29223+ if (!cpu_has_vmx_tpr_shadow()) {
29224+ pax_open_kernel();
29225+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
29226+ pax_close_kernel();
29227+ }
29228
29229 if (enable_ept && !cpu_has_vmx_ept_2m_page())
29230 kvm_disable_largepages();
29231@@ -6122,14 +6139,16 @@ static __init int hardware_setup(void)
29232 if (!cpu_has_vmx_apicv())
29233 enable_apicv = 0;
29234
29235+ pax_open_kernel();
29236 if (enable_apicv)
29237- kvm_x86_ops->update_cr8_intercept = NULL;
29238+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
29239 else {
29240- kvm_x86_ops->hwapic_irr_update = NULL;
29241- kvm_x86_ops->hwapic_isr_update = NULL;
29242- kvm_x86_ops->deliver_posted_interrupt = NULL;
29243- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29244+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
29245+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
29246+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
29247+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29248 }
29249+ pax_close_kernel();
29250
29251 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
29252 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
29253@@ -6182,10 +6201,12 @@ static __init int hardware_setup(void)
29254 enable_pml = 0;
29255
29256 if (!enable_pml) {
29257- kvm_x86_ops->slot_enable_log_dirty = NULL;
29258- kvm_x86_ops->slot_disable_log_dirty = NULL;
29259- kvm_x86_ops->flush_log_dirty = NULL;
29260- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29261+ pax_open_kernel();
29262+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
29263+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
29264+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
29265+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29266+ pax_close_kernel();
29267 }
29268
29269 return alloc_kvm_area();
29270@@ -8230,6 +8251,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29271 "jmp 2f \n\t"
29272 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
29273 "2: "
29274+
29275+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29276+ "ljmp %[cs],$3f\n\t"
29277+ "3: "
29278+#endif
29279+
29280 /* Save guest registers, load host registers, keep flags */
29281 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
29282 "pop %0 \n\t"
29283@@ -8282,6 +8309,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29284 #endif
29285 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
29286 [wordsize]"i"(sizeof(ulong))
29287+
29288+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29289+ ,[cs]"i"(__KERNEL_CS)
29290+#endif
29291+
29292 : "cc", "memory"
29293 #ifdef CONFIG_X86_64
29294 , "rax", "rbx", "rdi", "rsi"
29295@@ -8295,7 +8327,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29296 if (debugctlmsr)
29297 update_debugctlmsr(debugctlmsr);
29298
29299-#ifndef CONFIG_X86_64
29300+#ifdef CONFIG_X86_32
29301 /*
29302 * The sysexit path does not restore ds/es, so we must set them to
29303 * a reasonable value ourselves.
29304@@ -8304,8 +8336,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29305 * may be executed in interrupt context, which saves and restore segments
29306 * around it, nullifying its effect.
29307 */
29308- loadsegment(ds, __USER_DS);
29309- loadsegment(es, __USER_DS);
29310+ loadsegment(ds, __KERNEL_DS);
29311+ loadsegment(es, __KERNEL_DS);
29312+ loadsegment(ss, __KERNEL_DS);
29313+
29314+#ifdef CONFIG_PAX_KERNEXEC
29315+ loadsegment(fs, __KERNEL_PERCPU);
29316+#endif
29317+
29318+#ifdef CONFIG_PAX_MEMORY_UDEREF
29319+ __set_fs(current_thread_info()->addr_limit);
29320+#endif
29321+
29322 #endif
29323
29324 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29325diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29326index ea306ad..669f42d 100644
29327--- a/arch/x86/kvm/x86.c
29328+++ b/arch/x86/kvm/x86.c
29329@@ -1929,8 +1929,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29330 {
29331 struct kvm *kvm = vcpu->kvm;
29332 int lm = is_long_mode(vcpu);
29333- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29334- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29335+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29336+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29337 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29338 : kvm->arch.xen_hvm_config.blob_size_32;
29339 u32 page_num = data & ~PAGE_MASK;
29340@@ -2867,6 +2867,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29341 if (n < msr_list.nmsrs)
29342 goto out;
29343 r = -EFAULT;
29344+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29345+ goto out;
29346 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29347 num_msrs_to_save * sizeof(u32)))
29348 goto out;
29349@@ -5784,7 +5786,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29350 };
29351 #endif
29352
29353-int kvm_arch_init(void *opaque)
29354+int kvm_arch_init(const void *opaque)
29355 {
29356 int r;
29357 struct kvm_x86_ops *ops = opaque;
29358diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29359index 8f9a133..3c7694b 100644
29360--- a/arch/x86/lguest/boot.c
29361+++ b/arch/x86/lguest/boot.c
29362@@ -1341,9 +1341,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29363 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29364 * Launcher to reboot us.
29365 */
29366-static void lguest_restart(char *reason)
29367+static __noreturn void lguest_restart(char *reason)
29368 {
29369 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29370+ BUG();
29371 }
29372
29373 /*G:050
29374diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29375index 00933d5..3a64af9 100644
29376--- a/arch/x86/lib/atomic64_386_32.S
29377+++ b/arch/x86/lib/atomic64_386_32.S
29378@@ -48,6 +48,10 @@ BEGIN(read)
29379 movl (v), %eax
29380 movl 4(v), %edx
29381 RET_ENDP
29382+BEGIN(read_unchecked)
29383+ movl (v), %eax
29384+ movl 4(v), %edx
29385+RET_ENDP
29386 #undef v
29387
29388 #define v %esi
29389@@ -55,6 +59,10 @@ BEGIN(set)
29390 movl %ebx, (v)
29391 movl %ecx, 4(v)
29392 RET_ENDP
29393+BEGIN(set_unchecked)
29394+ movl %ebx, (v)
29395+ movl %ecx, 4(v)
29396+RET_ENDP
29397 #undef v
29398
29399 #define v %esi
29400@@ -70,6 +78,20 @@ RET_ENDP
29401 BEGIN(add)
29402 addl %eax, (v)
29403 adcl %edx, 4(v)
29404+
29405+#ifdef CONFIG_PAX_REFCOUNT
29406+ jno 0f
29407+ subl %eax, (v)
29408+ sbbl %edx, 4(v)
29409+ int $4
29410+0:
29411+ _ASM_EXTABLE(0b, 0b)
29412+#endif
29413+
29414+RET_ENDP
29415+BEGIN(add_unchecked)
29416+ addl %eax, (v)
29417+ adcl %edx, 4(v)
29418 RET_ENDP
29419 #undef v
29420
29421@@ -77,6 +99,24 @@ RET_ENDP
29422 BEGIN(add_return)
29423 addl (v), %eax
29424 adcl 4(v), %edx
29425+
29426+#ifdef CONFIG_PAX_REFCOUNT
29427+ into
29428+1234:
29429+ _ASM_EXTABLE(1234b, 2f)
29430+#endif
29431+
29432+ movl %eax, (v)
29433+ movl %edx, 4(v)
29434+
29435+#ifdef CONFIG_PAX_REFCOUNT
29436+2:
29437+#endif
29438+
29439+RET_ENDP
29440+BEGIN(add_return_unchecked)
29441+ addl (v), %eax
29442+ adcl 4(v), %edx
29443 movl %eax, (v)
29444 movl %edx, 4(v)
29445 RET_ENDP
29446@@ -86,6 +126,20 @@ RET_ENDP
29447 BEGIN(sub)
29448 subl %eax, (v)
29449 sbbl %edx, 4(v)
29450+
29451+#ifdef CONFIG_PAX_REFCOUNT
29452+ jno 0f
29453+ addl %eax, (v)
29454+ adcl %edx, 4(v)
29455+ int $4
29456+0:
29457+ _ASM_EXTABLE(0b, 0b)
29458+#endif
29459+
29460+RET_ENDP
29461+BEGIN(sub_unchecked)
29462+ subl %eax, (v)
29463+ sbbl %edx, 4(v)
29464 RET_ENDP
29465 #undef v
29466
29467@@ -96,6 +150,27 @@ BEGIN(sub_return)
29468 sbbl $0, %edx
29469 addl (v), %eax
29470 adcl 4(v), %edx
29471+
29472+#ifdef CONFIG_PAX_REFCOUNT
29473+ into
29474+1234:
29475+ _ASM_EXTABLE(1234b, 2f)
29476+#endif
29477+
29478+ movl %eax, (v)
29479+ movl %edx, 4(v)
29480+
29481+#ifdef CONFIG_PAX_REFCOUNT
29482+2:
29483+#endif
29484+
29485+RET_ENDP
29486+BEGIN(sub_return_unchecked)
29487+ negl %edx
29488+ negl %eax
29489+ sbbl $0, %edx
29490+ addl (v), %eax
29491+ adcl 4(v), %edx
29492 movl %eax, (v)
29493 movl %edx, 4(v)
29494 RET_ENDP
29495@@ -105,6 +180,20 @@ RET_ENDP
29496 BEGIN(inc)
29497 addl $1, (v)
29498 adcl $0, 4(v)
29499+
29500+#ifdef CONFIG_PAX_REFCOUNT
29501+ jno 0f
29502+ subl $1, (v)
29503+ sbbl $0, 4(v)
29504+ int $4
29505+0:
29506+ _ASM_EXTABLE(0b, 0b)
29507+#endif
29508+
29509+RET_ENDP
29510+BEGIN(inc_unchecked)
29511+ addl $1, (v)
29512+ adcl $0, 4(v)
29513 RET_ENDP
29514 #undef v
29515
29516@@ -114,6 +203,26 @@ BEGIN(inc_return)
29517 movl 4(v), %edx
29518 addl $1, %eax
29519 adcl $0, %edx
29520+
29521+#ifdef CONFIG_PAX_REFCOUNT
29522+ into
29523+1234:
29524+ _ASM_EXTABLE(1234b, 2f)
29525+#endif
29526+
29527+ movl %eax, (v)
29528+ movl %edx, 4(v)
29529+
29530+#ifdef CONFIG_PAX_REFCOUNT
29531+2:
29532+#endif
29533+
29534+RET_ENDP
29535+BEGIN(inc_return_unchecked)
29536+ movl (v), %eax
29537+ movl 4(v), %edx
29538+ addl $1, %eax
29539+ adcl $0, %edx
29540 movl %eax, (v)
29541 movl %edx, 4(v)
29542 RET_ENDP
29543@@ -123,6 +232,20 @@ RET_ENDP
29544 BEGIN(dec)
29545 subl $1, (v)
29546 sbbl $0, 4(v)
29547+
29548+#ifdef CONFIG_PAX_REFCOUNT
29549+ jno 0f
29550+ addl $1, (v)
29551+ adcl $0, 4(v)
29552+ int $4
29553+0:
29554+ _ASM_EXTABLE(0b, 0b)
29555+#endif
29556+
29557+RET_ENDP
29558+BEGIN(dec_unchecked)
29559+ subl $1, (v)
29560+ sbbl $0, 4(v)
29561 RET_ENDP
29562 #undef v
29563
29564@@ -132,6 +255,26 @@ BEGIN(dec_return)
29565 movl 4(v), %edx
29566 subl $1, %eax
29567 sbbl $0, %edx
29568+
29569+#ifdef CONFIG_PAX_REFCOUNT
29570+ into
29571+1234:
29572+ _ASM_EXTABLE(1234b, 2f)
29573+#endif
29574+
29575+ movl %eax, (v)
29576+ movl %edx, 4(v)
29577+
29578+#ifdef CONFIG_PAX_REFCOUNT
29579+2:
29580+#endif
29581+
29582+RET_ENDP
29583+BEGIN(dec_return_unchecked)
29584+ movl (v), %eax
29585+ movl 4(v), %edx
29586+ subl $1, %eax
29587+ sbbl $0, %edx
29588 movl %eax, (v)
29589 movl %edx, 4(v)
29590 RET_ENDP
29591@@ -143,6 +286,13 @@ BEGIN(add_unless)
29592 adcl %edx, %edi
29593 addl (v), %eax
29594 adcl 4(v), %edx
29595+
29596+#ifdef CONFIG_PAX_REFCOUNT
29597+ into
29598+1234:
29599+ _ASM_EXTABLE(1234b, 2f)
29600+#endif
29601+
29602 cmpl %eax, %ecx
29603 je 3f
29604 1:
29605@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29606 1:
29607 addl $1, %eax
29608 adcl $0, %edx
29609+
29610+#ifdef CONFIG_PAX_REFCOUNT
29611+ into
29612+1234:
29613+ _ASM_EXTABLE(1234b, 2f)
29614+#endif
29615+
29616 movl %eax, (v)
29617 movl %edx, 4(v)
29618 movl $1, %eax
29619@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29620 movl 4(v), %edx
29621 subl $1, %eax
29622 sbbl $0, %edx
29623+
29624+#ifdef CONFIG_PAX_REFCOUNT
29625+ into
29626+1234:
29627+ _ASM_EXTABLE(1234b, 1f)
29628+#endif
29629+
29630 js 1f
29631 movl %eax, (v)
29632 movl %edx, 4(v)
29633diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29634index 082a851..6a963bc 100644
29635--- a/arch/x86/lib/atomic64_cx8_32.S
29636+++ b/arch/x86/lib/atomic64_cx8_32.S
29637@@ -25,10 +25,20 @@ ENTRY(atomic64_read_cx8)
29638 CFI_STARTPROC
29639
29640 read64 %ecx
29641+ pax_force_retaddr
29642 ret
29643 CFI_ENDPROC
29644 ENDPROC(atomic64_read_cx8)
29645
29646+ENTRY(atomic64_read_unchecked_cx8)
29647+ CFI_STARTPROC
29648+
29649+ read64 %ecx
29650+ pax_force_retaddr
29651+ ret
29652+ CFI_ENDPROC
29653+ENDPROC(atomic64_read_unchecked_cx8)
29654+
29655 ENTRY(atomic64_set_cx8)
29656 CFI_STARTPROC
29657
29658@@ -38,10 +48,25 @@ ENTRY(atomic64_set_cx8)
29659 cmpxchg8b (%esi)
29660 jne 1b
29661
29662+ pax_force_retaddr
29663 ret
29664 CFI_ENDPROC
29665 ENDPROC(atomic64_set_cx8)
29666
29667+ENTRY(atomic64_set_unchecked_cx8)
29668+ CFI_STARTPROC
29669+
29670+1:
29671+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29672+ * are atomic on 586 and newer */
29673+ cmpxchg8b (%esi)
29674+ jne 1b
29675+
29676+ pax_force_retaddr
29677+ ret
29678+ CFI_ENDPROC
29679+ENDPROC(atomic64_set_unchecked_cx8)
29680+
29681 ENTRY(atomic64_xchg_cx8)
29682 CFI_STARTPROC
29683
29684@@ -50,12 +75,13 @@ ENTRY(atomic64_xchg_cx8)
29685 cmpxchg8b (%esi)
29686 jne 1b
29687
29688+ pax_force_retaddr
29689 ret
29690 CFI_ENDPROC
29691 ENDPROC(atomic64_xchg_cx8)
29692
29693-.macro addsub_return func ins insc
29694-ENTRY(atomic64_\func\()_return_cx8)
29695+.macro addsub_return func ins insc unchecked=""
29696+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29697 CFI_STARTPROC
29698 pushl_cfi_reg ebp
29699 pushl_cfi_reg ebx
29700@@ -72,27 +98,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29701 movl %edx, %ecx
29702 \ins\()l %esi, %ebx
29703 \insc\()l %edi, %ecx
29704+
29705+.ifb \unchecked
29706+#ifdef CONFIG_PAX_REFCOUNT
29707+ into
29708+2:
29709+ _ASM_EXTABLE(2b, 3f)
29710+#endif
29711+.endif
29712+
29713 LOCK_PREFIX
29714 cmpxchg8b (%ebp)
29715 jne 1b
29716-
29717-10:
29718 movl %ebx, %eax
29719 movl %ecx, %edx
29720+
29721+.ifb \unchecked
29722+#ifdef CONFIG_PAX_REFCOUNT
29723+3:
29724+#endif
29725+.endif
29726+
29727 popl_cfi_reg edi
29728 popl_cfi_reg esi
29729 popl_cfi_reg ebx
29730 popl_cfi_reg ebp
29731+ pax_force_retaddr
29732 ret
29733 CFI_ENDPROC
29734-ENDPROC(atomic64_\func\()_return_cx8)
29735+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29736 .endm
29737
29738 addsub_return add add adc
29739 addsub_return sub sub sbb
29740+addsub_return add add adc _unchecked
29741+addsub_return sub sub sbb _unchecked
29742
29743-.macro incdec_return func ins insc
29744-ENTRY(atomic64_\func\()_return_cx8)
29745+.macro incdec_return func ins insc unchecked=""
29746+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29747 CFI_STARTPROC
29748 pushl_cfi_reg ebx
29749
29750@@ -102,21 +145,38 @@ ENTRY(atomic64_\func\()_return_cx8)
29751 movl %edx, %ecx
29752 \ins\()l $1, %ebx
29753 \insc\()l $0, %ecx
29754+
29755+.ifb \unchecked
29756+#ifdef CONFIG_PAX_REFCOUNT
29757+ into
29758+2:
29759+ _ASM_EXTABLE(2b, 3f)
29760+#endif
29761+.endif
29762+
29763 LOCK_PREFIX
29764 cmpxchg8b (%esi)
29765 jne 1b
29766-
29767-10:
29768 movl %ebx, %eax
29769 movl %ecx, %edx
29770+
29771+.ifb \unchecked
29772+#ifdef CONFIG_PAX_REFCOUNT
29773+3:
29774+#endif
29775+.endif
29776+
29777 popl_cfi_reg ebx
29778+ pax_force_retaddr
29779 ret
29780 CFI_ENDPROC
29781-ENDPROC(atomic64_\func\()_return_cx8)
29782+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29783 .endm
29784
29785 incdec_return inc add adc
29786 incdec_return dec sub sbb
29787+incdec_return inc add adc _unchecked
29788+incdec_return dec sub sbb _unchecked
29789
29790 ENTRY(atomic64_dec_if_positive_cx8)
29791 CFI_STARTPROC
29792@@ -128,6 +188,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29793 movl %edx, %ecx
29794 subl $1, %ebx
29795 sbb $0, %ecx
29796+
29797+#ifdef CONFIG_PAX_REFCOUNT
29798+ into
29799+1234:
29800+ _ASM_EXTABLE(1234b, 2f)
29801+#endif
29802+
29803 js 2f
29804 LOCK_PREFIX
29805 cmpxchg8b (%esi)
29806@@ -137,6 +204,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29807 movl %ebx, %eax
29808 movl %ecx, %edx
29809 popl_cfi_reg ebx
29810+ pax_force_retaddr
29811 ret
29812 CFI_ENDPROC
29813 ENDPROC(atomic64_dec_if_positive_cx8)
29814@@ -161,6 +229,13 @@ ENTRY(atomic64_add_unless_cx8)
29815 movl %edx, %ecx
29816 addl %ebp, %ebx
29817 adcl %edi, %ecx
29818+
29819+#ifdef CONFIG_PAX_REFCOUNT
29820+ into
29821+1234:
29822+ _ASM_EXTABLE(1234b, 3f)
29823+#endif
29824+
29825 LOCK_PREFIX
29826 cmpxchg8b (%esi)
29827 jne 1b
29828@@ -171,6 +246,7 @@ ENTRY(atomic64_add_unless_cx8)
29829 CFI_ADJUST_CFA_OFFSET -8
29830 popl_cfi_reg ebx
29831 popl_cfi_reg ebp
29832+ pax_force_retaddr
29833 ret
29834 4:
29835 cmpl %edx, 4(%esp)
29836@@ -193,6 +269,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29837 xorl %ecx, %ecx
29838 addl $1, %ebx
29839 adcl %edx, %ecx
29840+
29841+#ifdef CONFIG_PAX_REFCOUNT
29842+ into
29843+1234:
29844+ _ASM_EXTABLE(1234b, 3f)
29845+#endif
29846+
29847 LOCK_PREFIX
29848 cmpxchg8b (%esi)
29849 jne 1b
29850@@ -200,6 +283,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29851 movl $1, %eax
29852 3:
29853 popl_cfi_reg ebx
29854+ pax_force_retaddr
29855 ret
29856 CFI_ENDPROC
29857 ENDPROC(atomic64_inc_not_zero_cx8)
29858diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29859index 9bc944a..e52be6c 100644
29860--- a/arch/x86/lib/checksum_32.S
29861+++ b/arch/x86/lib/checksum_32.S
29862@@ -29,7 +29,8 @@
29863 #include <asm/dwarf2.h>
29864 #include <asm/errno.h>
29865 #include <asm/asm.h>
29866-
29867+#include <asm/segment.h>
29868+
29869 /*
29870 * computes a partial checksum, e.g. for TCP/UDP fragments
29871 */
29872@@ -285,9 +286,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29873
29874 #define ARGBASE 16
29875 #define FP 12
29876-
29877-ENTRY(csum_partial_copy_generic)
29878+
29879+ENTRY(csum_partial_copy_generic_to_user)
29880 CFI_STARTPROC
29881+
29882+#ifdef CONFIG_PAX_MEMORY_UDEREF
29883+ pushl_cfi %gs
29884+ popl_cfi %es
29885+ jmp csum_partial_copy_generic
29886+#endif
29887+
29888+ENTRY(csum_partial_copy_generic_from_user)
29889+
29890+#ifdef CONFIG_PAX_MEMORY_UDEREF
29891+ pushl_cfi %gs
29892+ popl_cfi %ds
29893+#endif
29894+
29895+ENTRY(csum_partial_copy_generic)
29896 subl $4,%esp
29897 CFI_ADJUST_CFA_OFFSET 4
29898 pushl_cfi_reg edi
29899@@ -306,7 +322,7 @@ ENTRY(csum_partial_copy_generic)
29900 jmp 4f
29901 SRC(1: movw (%esi), %bx )
29902 addl $2, %esi
29903-DST( movw %bx, (%edi) )
29904+DST( movw %bx, %es:(%edi) )
29905 addl $2, %edi
29906 addw %bx, %ax
29907 adcl $0, %eax
29908@@ -318,30 +334,30 @@ DST( movw %bx, (%edi) )
29909 SRC(1: movl (%esi), %ebx )
29910 SRC( movl 4(%esi), %edx )
29911 adcl %ebx, %eax
29912-DST( movl %ebx, (%edi) )
29913+DST( movl %ebx, %es:(%edi) )
29914 adcl %edx, %eax
29915-DST( movl %edx, 4(%edi) )
29916+DST( movl %edx, %es:4(%edi) )
29917
29918 SRC( movl 8(%esi), %ebx )
29919 SRC( movl 12(%esi), %edx )
29920 adcl %ebx, %eax
29921-DST( movl %ebx, 8(%edi) )
29922+DST( movl %ebx, %es:8(%edi) )
29923 adcl %edx, %eax
29924-DST( movl %edx, 12(%edi) )
29925+DST( movl %edx, %es:12(%edi) )
29926
29927 SRC( movl 16(%esi), %ebx )
29928 SRC( movl 20(%esi), %edx )
29929 adcl %ebx, %eax
29930-DST( movl %ebx, 16(%edi) )
29931+DST( movl %ebx, %es:16(%edi) )
29932 adcl %edx, %eax
29933-DST( movl %edx, 20(%edi) )
29934+DST( movl %edx, %es:20(%edi) )
29935
29936 SRC( movl 24(%esi), %ebx )
29937 SRC( movl 28(%esi), %edx )
29938 adcl %ebx, %eax
29939-DST( movl %ebx, 24(%edi) )
29940+DST( movl %ebx, %es:24(%edi) )
29941 adcl %edx, %eax
29942-DST( movl %edx, 28(%edi) )
29943+DST( movl %edx, %es:28(%edi) )
29944
29945 lea 32(%esi), %esi
29946 lea 32(%edi), %edi
29947@@ -355,7 +371,7 @@ DST( movl %edx, 28(%edi) )
29948 shrl $2, %edx # This clears CF
29949 SRC(3: movl (%esi), %ebx )
29950 adcl %ebx, %eax
29951-DST( movl %ebx, (%edi) )
29952+DST( movl %ebx, %es:(%edi) )
29953 lea 4(%esi), %esi
29954 lea 4(%edi), %edi
29955 dec %edx
29956@@ -367,12 +383,12 @@ DST( movl %ebx, (%edi) )
29957 jb 5f
29958 SRC( movw (%esi), %cx )
29959 leal 2(%esi), %esi
29960-DST( movw %cx, (%edi) )
29961+DST( movw %cx, %es:(%edi) )
29962 leal 2(%edi), %edi
29963 je 6f
29964 shll $16,%ecx
29965 SRC(5: movb (%esi), %cl )
29966-DST( movb %cl, (%edi) )
29967+DST( movb %cl, %es:(%edi) )
29968 6: addl %ecx, %eax
29969 adcl $0, %eax
29970 7:
29971@@ -383,7 +399,7 @@ DST( movb %cl, (%edi) )
29972
29973 6001:
29974 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29975- movl $-EFAULT, (%ebx)
29976+ movl $-EFAULT, %ss:(%ebx)
29977
29978 # zero the complete destination - computing the rest
29979 # is too much work
29980@@ -396,37 +412,58 @@ DST( movb %cl, (%edi) )
29981
29982 6002:
29983 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29984- movl $-EFAULT,(%ebx)
29985+ movl $-EFAULT,%ss:(%ebx)
29986 jmp 5000b
29987
29988 .previous
29989
29990+ pushl_cfi %ss
29991+ popl_cfi %ds
29992+ pushl_cfi %ss
29993+ popl_cfi %es
29994 popl_cfi_reg ebx
29995 popl_cfi_reg esi
29996 popl_cfi_reg edi
29997 popl_cfi %ecx # equivalent to addl $4,%esp
29998 ret
29999 CFI_ENDPROC
30000-ENDPROC(csum_partial_copy_generic)
30001+ENDPROC(csum_partial_copy_generic_to_user)
30002
30003 #else
30004
30005 /* Version for PentiumII/PPro */
30006
30007 #define ROUND1(x) \
30008+ nop; nop; nop; \
30009 SRC(movl x(%esi), %ebx ) ; \
30010 addl %ebx, %eax ; \
30011- DST(movl %ebx, x(%edi) ) ;
30012+ DST(movl %ebx, %es:x(%edi)) ;
30013
30014 #define ROUND(x) \
30015+ nop; nop; nop; \
30016 SRC(movl x(%esi), %ebx ) ; \
30017 adcl %ebx, %eax ; \
30018- DST(movl %ebx, x(%edi) ) ;
30019+ DST(movl %ebx, %es:x(%edi)) ;
30020
30021 #define ARGBASE 12
30022-
30023-ENTRY(csum_partial_copy_generic)
30024+
30025+ENTRY(csum_partial_copy_generic_to_user)
30026 CFI_STARTPROC
30027+
30028+#ifdef CONFIG_PAX_MEMORY_UDEREF
30029+ pushl_cfi %gs
30030+ popl_cfi %es
30031+ jmp csum_partial_copy_generic
30032+#endif
30033+
30034+ENTRY(csum_partial_copy_generic_from_user)
30035+
30036+#ifdef CONFIG_PAX_MEMORY_UDEREF
30037+ pushl_cfi %gs
30038+ popl_cfi %ds
30039+#endif
30040+
30041+ENTRY(csum_partial_copy_generic)
30042 pushl_cfi_reg ebx
30043 pushl_cfi_reg edi
30044 pushl_cfi_reg esi
30045@@ -444,7 +481,7 @@ ENTRY(csum_partial_copy_generic)
30046 subl %ebx, %edi
30047 lea -1(%esi),%edx
30048 andl $-32,%edx
30049- lea 3f(%ebx,%ebx), %ebx
30050+ lea 3f(%ebx,%ebx,2), %ebx
30051 testl %esi, %esi
30052 jmp *%ebx
30053 1: addl $64,%esi
30054@@ -465,19 +502,19 @@ ENTRY(csum_partial_copy_generic)
30055 jb 5f
30056 SRC( movw (%esi), %dx )
30057 leal 2(%esi), %esi
30058-DST( movw %dx, (%edi) )
30059+DST( movw %dx, %es:(%edi) )
30060 leal 2(%edi), %edi
30061 je 6f
30062 shll $16,%edx
30063 5:
30064 SRC( movb (%esi), %dl )
30065-DST( movb %dl, (%edi) )
30066+DST( movb %dl, %es:(%edi) )
30067 6: addl %edx, %eax
30068 adcl $0, %eax
30069 7:
30070 .section .fixup, "ax"
30071 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
30072- movl $-EFAULT, (%ebx)
30073+ movl $-EFAULT, %ss:(%ebx)
30074 # zero the complete destination (computing the rest is too much work)
30075 movl ARGBASE+8(%esp),%edi # dst
30076 movl ARGBASE+12(%esp),%ecx # len
30077@@ -485,16 +522,23 @@ DST( movb %dl, (%edi) )
30078 rep; stosb
30079 jmp 7b
30080 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
30081- movl $-EFAULT, (%ebx)
30082+ movl $-EFAULT, %ss:(%ebx)
30083 jmp 7b
30084 .previous
30085
30086+#ifdef CONFIG_PAX_MEMORY_UDEREF
30087+ pushl_cfi %ss
30088+ popl_cfi %ds
30089+ pushl_cfi %ss
30090+ popl_cfi %es
30091+#endif
30092+
30093 popl_cfi_reg esi
30094 popl_cfi_reg edi
30095 popl_cfi_reg ebx
30096 ret
30097 CFI_ENDPROC
30098-ENDPROC(csum_partial_copy_generic)
30099+ENDPROC(csum_partial_copy_generic_to_user)
30100
30101 #undef ROUND
30102 #undef ROUND1
30103diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
30104index e67e579..4782449 100644
30105--- a/arch/x86/lib/clear_page_64.S
30106+++ b/arch/x86/lib/clear_page_64.S
30107@@ -23,6 +23,7 @@ ENTRY(clear_page)
30108 movl $4096/8,%ecx
30109 xorl %eax,%eax
30110 rep stosq
30111+ pax_force_retaddr
30112 ret
30113 CFI_ENDPROC
30114 ENDPROC(clear_page)
30115@@ -47,6 +48,7 @@ ENTRY(clear_page_orig)
30116 leaq 64(%rdi),%rdi
30117 jnz .Lloop
30118 nop
30119+ pax_force_retaddr
30120 ret
30121 CFI_ENDPROC
30122 ENDPROC(clear_page_orig)
30123@@ -56,6 +58,7 @@ ENTRY(clear_page_c_e)
30124 movl $4096,%ecx
30125 xorl %eax,%eax
30126 rep stosb
30127+ pax_force_retaddr
30128 ret
30129 CFI_ENDPROC
30130 ENDPROC(clear_page_c_e)
30131diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
30132index 40a1725..5d12ac4 100644
30133--- a/arch/x86/lib/cmpxchg16b_emu.S
30134+++ b/arch/x86/lib/cmpxchg16b_emu.S
30135@@ -8,6 +8,7 @@
30136 #include <linux/linkage.h>
30137 #include <asm/dwarf2.h>
30138 #include <asm/percpu.h>
30139+#include <asm/alternative-asm.h>
30140
30141 .text
30142
30143@@ -46,12 +47,14 @@ CFI_STARTPROC
30144 CFI_REMEMBER_STATE
30145 popfq_cfi
30146 mov $1, %al
30147+ pax_force_retaddr
30148 ret
30149
30150 CFI_RESTORE_STATE
30151 .Lnot_same:
30152 popfq_cfi
30153 xor %al,%al
30154+ pax_force_retaddr
30155 ret
30156
30157 CFI_ENDPROC
30158diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
30159index 8239dbc..e714d2a 100644
30160--- a/arch/x86/lib/copy_page_64.S
30161+++ b/arch/x86/lib/copy_page_64.S
30162@@ -17,6 +17,7 @@ ENTRY(copy_page)
30163 ALTERNATIVE "jmp copy_page_regs", "", X86_FEATURE_REP_GOOD
30164 movl $4096/8, %ecx
30165 rep movsq
30166+ pax_force_retaddr
30167 ret
30168 CFI_ENDPROC
30169 ENDPROC(copy_page)
30170@@ -27,8 +28,8 @@ ENTRY(copy_page_regs)
30171 CFI_ADJUST_CFA_OFFSET 2*8
30172 movq %rbx, (%rsp)
30173 CFI_REL_OFFSET rbx, 0
30174- movq %r12, 1*8(%rsp)
30175- CFI_REL_OFFSET r12, 1*8
30176+ movq %r13, 1*8(%rsp)
30177+ CFI_REL_OFFSET r13, 1*8
30178
30179 movl $(4096/64)-5, %ecx
30180 .p2align 4
30181@@ -41,7 +42,7 @@ ENTRY(copy_page_regs)
30182 movq 0x8*4(%rsi), %r9
30183 movq 0x8*5(%rsi), %r10
30184 movq 0x8*6(%rsi), %r11
30185- movq 0x8*7(%rsi), %r12
30186+ movq 0x8*7(%rsi), %r13
30187
30188 prefetcht0 5*64(%rsi)
30189
30190@@ -52,7 +53,7 @@ ENTRY(copy_page_regs)
30191 movq %r9, 0x8*4(%rdi)
30192 movq %r10, 0x8*5(%rdi)
30193 movq %r11, 0x8*6(%rdi)
30194- movq %r12, 0x8*7(%rdi)
30195+ movq %r13, 0x8*7(%rdi)
30196
30197 leaq 64 (%rsi), %rsi
30198 leaq 64 (%rdi), %rdi
30199@@ -71,7 +72,7 @@ ENTRY(copy_page_regs)
30200 movq 0x8*4(%rsi), %r9
30201 movq 0x8*5(%rsi), %r10
30202 movq 0x8*6(%rsi), %r11
30203- movq 0x8*7(%rsi), %r12
30204+ movq 0x8*7(%rsi), %r13
30205
30206 movq %rax, 0x8*0(%rdi)
30207 movq %rbx, 0x8*1(%rdi)
30208@@ -80,7 +81,7 @@ ENTRY(copy_page_regs)
30209 movq %r9, 0x8*4(%rdi)
30210 movq %r10, 0x8*5(%rdi)
30211 movq %r11, 0x8*6(%rdi)
30212- movq %r12, 0x8*7(%rdi)
30213+ movq %r13, 0x8*7(%rdi)
30214
30215 leaq 64(%rdi), %rdi
30216 leaq 64(%rsi), %rsi
30217@@ -88,10 +89,11 @@ ENTRY(copy_page_regs)
30218
30219 movq (%rsp), %rbx
30220 CFI_RESTORE rbx
30221- movq 1*8(%rsp), %r12
30222- CFI_RESTORE r12
30223+ movq 1*8(%rsp), %r13
30224+ CFI_RESTORE r13
30225 addq $2*8, %rsp
30226 CFI_ADJUST_CFA_OFFSET -2*8
30227+ pax_force_retaddr
30228 ret
30229 CFI_ENDPROC
30230 ENDPROC(copy_page_regs)
30231diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
30232index fa997df..060ab18 100644
30233--- a/arch/x86/lib/copy_user_64.S
30234+++ b/arch/x86/lib/copy_user_64.S
30235@@ -15,6 +15,7 @@
30236 #include <asm/alternative-asm.h>
30237 #include <asm/asm.h>
30238 #include <asm/smap.h>
30239+#include <asm/pgtable.h>
30240
30241 .macro ALIGN_DESTINATION
30242 /* check for bad alignment of destination */
30243@@ -40,56 +41,6 @@
30244 _ASM_EXTABLE(101b,103b)
30245 .endm
30246
30247-/* Standard copy_to_user with segment limit checking */
30248-ENTRY(_copy_to_user)
30249- CFI_STARTPROC
30250- GET_THREAD_INFO(%rax)
30251- movq %rdi,%rcx
30252- addq %rdx,%rcx
30253- jc bad_to_user
30254- cmpq TI_addr_limit(%rax),%rcx
30255- ja bad_to_user
30256- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
30257- "jmp copy_user_generic_string", \
30258- X86_FEATURE_REP_GOOD, \
30259- "jmp copy_user_enhanced_fast_string", \
30260- X86_FEATURE_ERMS
30261- CFI_ENDPROC
30262-ENDPROC(_copy_to_user)
30263-
30264-/* Standard copy_from_user with segment limit checking */
30265-ENTRY(_copy_from_user)
30266- CFI_STARTPROC
30267- GET_THREAD_INFO(%rax)
30268- movq %rsi,%rcx
30269- addq %rdx,%rcx
30270- jc bad_from_user
30271- cmpq TI_addr_limit(%rax),%rcx
30272- ja bad_from_user
30273- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
30274- "jmp copy_user_generic_string", \
30275- X86_FEATURE_REP_GOOD, \
30276- "jmp copy_user_enhanced_fast_string", \
30277- X86_FEATURE_ERMS
30278- CFI_ENDPROC
30279-ENDPROC(_copy_from_user)
30280-
30281- .section .fixup,"ax"
30282- /* must zero dest */
30283-ENTRY(bad_from_user)
30284-bad_from_user:
30285- CFI_STARTPROC
30286- movl %edx,%ecx
30287- xorl %eax,%eax
30288- rep
30289- stosb
30290-bad_to_user:
30291- movl %edx,%eax
30292- ret
30293- CFI_ENDPROC
30294-ENDPROC(bad_from_user)
30295- .previous
30296-
30297 /*
30298 * copy_user_generic_unrolled - memory copy with exception handling.
30299 * This version is for CPUs like P4 that don't have efficient micro
30300@@ -105,6 +56,7 @@ ENDPROC(bad_from_user)
30301 */
30302 ENTRY(copy_user_generic_unrolled)
30303 CFI_STARTPROC
30304+ ASM_PAX_OPEN_USERLAND
30305 ASM_STAC
30306 cmpl $8,%edx
30307 jb 20f /* less then 8 bytes, go to byte copy loop */
30308@@ -154,6 +106,8 @@ ENTRY(copy_user_generic_unrolled)
30309 jnz 21b
30310 23: xor %eax,%eax
30311 ASM_CLAC
30312+ ASM_PAX_CLOSE_USERLAND
30313+ pax_force_retaddr
30314 ret
30315
30316 .section .fixup,"ax"
30317@@ -209,6 +163,7 @@ ENDPROC(copy_user_generic_unrolled)
30318 */
30319 ENTRY(copy_user_generic_string)
30320 CFI_STARTPROC
30321+ ASM_PAX_OPEN_USERLAND
30322 ASM_STAC
30323 cmpl $8,%edx
30324 jb 2f /* less than 8 bytes, go to byte copy loop */
30325@@ -223,6 +178,8 @@ ENTRY(copy_user_generic_string)
30326 movsb
30327 xorl %eax,%eax
30328 ASM_CLAC
30329+ ASM_PAX_CLOSE_USERLAND
30330+ pax_force_retaddr
30331 ret
30332
30333 .section .fixup,"ax"
30334@@ -250,12 +207,15 @@ ENDPROC(copy_user_generic_string)
30335 */
30336 ENTRY(copy_user_enhanced_fast_string)
30337 CFI_STARTPROC
30338+ ASM_PAX_OPEN_USERLAND
30339 ASM_STAC
30340 movl %edx,%ecx
30341 1: rep
30342 movsb
30343 xorl %eax,%eax
30344 ASM_CLAC
30345+ ASM_PAX_CLOSE_USERLAND
30346+ pax_force_retaddr
30347 ret
30348
30349 .section .fixup,"ax"
30350diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30351index 6a4f43c..c70fb52 100644
30352--- a/arch/x86/lib/copy_user_nocache_64.S
30353+++ b/arch/x86/lib/copy_user_nocache_64.S
30354@@ -8,6 +8,7 @@
30355
30356 #include <linux/linkage.h>
30357 #include <asm/dwarf2.h>
30358+#include <asm/alternative-asm.h>
30359
30360 #define FIX_ALIGNMENT 1
30361
30362@@ -16,6 +17,7 @@
30363 #include <asm/thread_info.h>
30364 #include <asm/asm.h>
30365 #include <asm/smap.h>
30366+#include <asm/pgtable.h>
30367
30368 .macro ALIGN_DESTINATION
30369 #ifdef FIX_ALIGNMENT
30370@@ -49,6 +51,16 @@
30371 */
30372 ENTRY(__copy_user_nocache)
30373 CFI_STARTPROC
30374+
30375+#ifdef CONFIG_PAX_MEMORY_UDEREF
30376+ mov pax_user_shadow_base,%rcx
30377+ cmp %rcx,%rsi
30378+ jae 1f
30379+ add %rcx,%rsi
30380+1:
30381+#endif
30382+
30383+ ASM_PAX_OPEN_USERLAND
30384 ASM_STAC
30385 cmpl $8,%edx
30386 jb 20f /* less then 8 bytes, go to byte copy loop */
30387@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30388 jnz 21b
30389 23: xorl %eax,%eax
30390 ASM_CLAC
30391+ ASM_PAX_CLOSE_USERLAND
30392 sfence
30393+ pax_force_retaddr
30394 ret
30395
30396 .section .fixup,"ax"
30397diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30398index 9734182..dbee61c 100644
30399--- a/arch/x86/lib/csum-copy_64.S
30400+++ b/arch/x86/lib/csum-copy_64.S
30401@@ -9,6 +9,7 @@
30402 #include <asm/dwarf2.h>
30403 #include <asm/errno.h>
30404 #include <asm/asm.h>
30405+#include <asm/alternative-asm.h>
30406
30407 /*
30408 * Checksum copy with exception handling.
30409@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30410 CFI_ADJUST_CFA_OFFSET 7*8
30411 movq %rbx, 2*8(%rsp)
30412 CFI_REL_OFFSET rbx, 2*8
30413- movq %r12, 3*8(%rsp)
30414- CFI_REL_OFFSET r12, 3*8
30415+ movq %r15, 3*8(%rsp)
30416+ CFI_REL_OFFSET r15, 3*8
30417 movq %r14, 4*8(%rsp)
30418 CFI_REL_OFFSET r14, 4*8
30419 movq %r13, 5*8(%rsp)
30420@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30421 movl %edx, %ecx
30422
30423 xorl %r9d, %r9d
30424- movq %rcx, %r12
30425+ movq %rcx, %r15
30426
30427- shrq $6, %r12
30428+ shrq $6, %r15
30429 jz .Lhandle_tail /* < 64 */
30430
30431 clc
30432
30433 /* main loop. clear in 64 byte blocks */
30434 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30435- /* r11: temp3, rdx: temp4, r12 loopcnt */
30436+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30437 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30438 .p2align 4
30439 .Lloop:
30440@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30441 adcq %r14, %rax
30442 adcq %r13, %rax
30443
30444- decl %r12d
30445+ decl %r15d
30446
30447 dest
30448 movq %rbx, (%rsi)
30449@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30450 .Lende:
30451 movq 2*8(%rsp), %rbx
30452 CFI_RESTORE rbx
30453- movq 3*8(%rsp), %r12
30454- CFI_RESTORE r12
30455+ movq 3*8(%rsp), %r15
30456+ CFI_RESTORE r15
30457 movq 4*8(%rsp), %r14
30458 CFI_RESTORE r14
30459 movq 5*8(%rsp), %r13
30460@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30461 CFI_RESTORE rbp
30462 addq $7*8, %rsp
30463 CFI_ADJUST_CFA_OFFSET -7*8
30464+ pax_force_retaddr
30465 ret
30466 CFI_RESTORE_STATE
30467
30468diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30469index 1318f75..44c30fd 100644
30470--- a/arch/x86/lib/csum-wrappers_64.c
30471+++ b/arch/x86/lib/csum-wrappers_64.c
30472@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30473 len -= 2;
30474 }
30475 }
30476+ pax_open_userland();
30477 stac();
30478- isum = csum_partial_copy_generic((__force const void *)src,
30479+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30480 dst, len, isum, errp, NULL);
30481 clac();
30482+ pax_close_userland();
30483 if (unlikely(*errp))
30484 goto out_err;
30485
30486@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30487 }
30488
30489 *errp = 0;
30490+ pax_open_userland();
30491 stac();
30492- ret = csum_partial_copy_generic(src, (void __force *)dst,
30493+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30494 len, isum, NULL, errp);
30495 clac();
30496+ pax_close_userland();
30497 return ret;
30498 }
30499 EXPORT_SYMBOL(csum_partial_copy_to_user);
30500diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30501index a451235..a74bfa3 100644
30502--- a/arch/x86/lib/getuser.S
30503+++ b/arch/x86/lib/getuser.S
30504@@ -33,17 +33,40 @@
30505 #include <asm/thread_info.h>
30506 #include <asm/asm.h>
30507 #include <asm/smap.h>
30508+#include <asm/segment.h>
30509+#include <asm/pgtable.h>
30510+#include <asm/alternative-asm.h>
30511+
30512+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30513+#define __copyuser_seg gs;
30514+#else
30515+#define __copyuser_seg
30516+#endif
30517
30518 .text
30519 ENTRY(__get_user_1)
30520 CFI_STARTPROC
30521+
30522+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30523 GET_THREAD_INFO(%_ASM_DX)
30524 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30525 jae bad_get_user
30526+
30527+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30528+ mov pax_user_shadow_base,%_ASM_DX
30529+ cmp %_ASM_DX,%_ASM_AX
30530+ jae 1234f
30531+ add %_ASM_DX,%_ASM_AX
30532+1234:
30533+#endif
30534+
30535+#endif
30536+
30537 ASM_STAC
30538-1: movzbl (%_ASM_AX),%edx
30539+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30540 xor %eax,%eax
30541 ASM_CLAC
30542+ pax_force_retaddr
30543 ret
30544 CFI_ENDPROC
30545 ENDPROC(__get_user_1)
30546@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30547 ENTRY(__get_user_2)
30548 CFI_STARTPROC
30549 add $1,%_ASM_AX
30550+
30551+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30552 jc bad_get_user
30553 GET_THREAD_INFO(%_ASM_DX)
30554 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30555 jae bad_get_user
30556+
30557+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30558+ mov pax_user_shadow_base,%_ASM_DX
30559+ cmp %_ASM_DX,%_ASM_AX
30560+ jae 1234f
30561+ add %_ASM_DX,%_ASM_AX
30562+1234:
30563+#endif
30564+
30565+#endif
30566+
30567 ASM_STAC
30568-2: movzwl -1(%_ASM_AX),%edx
30569+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30570 xor %eax,%eax
30571 ASM_CLAC
30572+ pax_force_retaddr
30573 ret
30574 CFI_ENDPROC
30575 ENDPROC(__get_user_2)
30576@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30577 ENTRY(__get_user_4)
30578 CFI_STARTPROC
30579 add $3,%_ASM_AX
30580+
30581+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30582 jc bad_get_user
30583 GET_THREAD_INFO(%_ASM_DX)
30584 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30585 jae bad_get_user
30586+
30587+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30588+ mov pax_user_shadow_base,%_ASM_DX
30589+ cmp %_ASM_DX,%_ASM_AX
30590+ jae 1234f
30591+ add %_ASM_DX,%_ASM_AX
30592+1234:
30593+#endif
30594+
30595+#endif
30596+
30597 ASM_STAC
30598-3: movl -3(%_ASM_AX),%edx
30599+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30600 xor %eax,%eax
30601 ASM_CLAC
30602+ pax_force_retaddr
30603 ret
30604 CFI_ENDPROC
30605 ENDPROC(__get_user_4)
30606@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30607 GET_THREAD_INFO(%_ASM_DX)
30608 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30609 jae bad_get_user
30610+
30611+#ifdef CONFIG_PAX_MEMORY_UDEREF
30612+ mov pax_user_shadow_base,%_ASM_DX
30613+ cmp %_ASM_DX,%_ASM_AX
30614+ jae 1234f
30615+ add %_ASM_DX,%_ASM_AX
30616+1234:
30617+#endif
30618+
30619 ASM_STAC
30620 4: movq -7(%_ASM_AX),%rdx
30621 xor %eax,%eax
30622 ASM_CLAC
30623+ pax_force_retaddr
30624 ret
30625 #else
30626 add $7,%_ASM_AX
30627@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30628 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30629 jae bad_get_user_8
30630 ASM_STAC
30631-4: movl -7(%_ASM_AX),%edx
30632-5: movl -3(%_ASM_AX),%ecx
30633+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30634+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30635 xor %eax,%eax
30636 ASM_CLAC
30637+ pax_force_retaddr
30638 ret
30639 #endif
30640 CFI_ENDPROC
30641@@ -113,6 +175,7 @@ bad_get_user:
30642 xor %edx,%edx
30643 mov $(-EFAULT),%_ASM_AX
30644 ASM_CLAC
30645+ pax_force_retaddr
30646 ret
30647 CFI_ENDPROC
30648 END(bad_get_user)
30649@@ -124,6 +187,7 @@ bad_get_user_8:
30650 xor %ecx,%ecx
30651 mov $(-EFAULT),%_ASM_AX
30652 ASM_CLAC
30653+ pax_force_retaddr
30654 ret
30655 CFI_ENDPROC
30656 END(bad_get_user_8)
30657diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30658index 8f72b33..a43d9969 100644
30659--- a/arch/x86/lib/insn.c
30660+++ b/arch/x86/lib/insn.c
30661@@ -20,8 +20,10 @@
30662
30663 #ifdef __KERNEL__
30664 #include <linux/string.h>
30665+#include <asm/pgtable_types.h>
30666 #else
30667 #include <string.h>
30668+#define ktla_ktva(addr) addr
30669 #endif
30670 #include <asm/inat.h>
30671 #include <asm/insn.h>
30672@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30673 buf_len = MAX_INSN_SIZE;
30674
30675 memset(insn, 0, sizeof(*insn));
30676- insn->kaddr = kaddr;
30677- insn->end_kaddr = kaddr + buf_len;
30678- insn->next_byte = kaddr;
30679+ insn->kaddr = ktla_ktva(kaddr);
30680+ insn->end_kaddr = insn->kaddr + buf_len;
30681+ insn->next_byte = insn->kaddr;
30682 insn->x86_64 = x86_64 ? 1 : 0;
30683 insn->opnd_bytes = 4;
30684 if (x86_64)
30685diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30686index 05a95e7..326f2fa 100644
30687--- a/arch/x86/lib/iomap_copy_64.S
30688+++ b/arch/x86/lib/iomap_copy_64.S
30689@@ -17,6 +17,7 @@
30690
30691 #include <linux/linkage.h>
30692 #include <asm/dwarf2.h>
30693+#include <asm/alternative-asm.h>
30694
30695 /*
30696 * override generic version in lib/iomap_copy.c
30697@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30698 CFI_STARTPROC
30699 movl %edx,%ecx
30700 rep movsd
30701+ pax_force_retaddr
30702 ret
30703 CFI_ENDPROC
30704 ENDPROC(__iowrite32_copy)
30705diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30706index b046664..dec9465 100644
30707--- a/arch/x86/lib/memcpy_64.S
30708+++ b/arch/x86/lib/memcpy_64.S
30709@@ -37,6 +37,7 @@ ENTRY(memcpy)
30710 rep movsq
30711 movl %edx, %ecx
30712 rep movsb
30713+ pax_force_retaddr
30714 ret
30715 ENDPROC(memcpy)
30716 ENDPROC(__memcpy)
30717@@ -49,6 +50,7 @@ ENTRY(memcpy_erms)
30718 movq %rdi, %rax
30719 movq %rdx, %rcx
30720 rep movsb
30721+ pax_force_retaddr
30722 ret
30723 ENDPROC(memcpy_erms)
30724
30725@@ -134,6 +136,7 @@ ENTRY(memcpy_orig)
30726 movq %r9, 1*8(%rdi)
30727 movq %r10, -2*8(%rdi, %rdx)
30728 movq %r11, -1*8(%rdi, %rdx)
30729+ pax_force_retaddr
30730 retq
30731 .p2align 4
30732 .Lless_16bytes:
30733@@ -146,6 +149,7 @@ ENTRY(memcpy_orig)
30734 movq -1*8(%rsi, %rdx), %r9
30735 movq %r8, 0*8(%rdi)
30736 movq %r9, -1*8(%rdi, %rdx)
30737+ pax_force_retaddr
30738 retq
30739 .p2align 4
30740 .Lless_8bytes:
30741@@ -159,6 +163,7 @@ ENTRY(memcpy_orig)
30742 movl -4(%rsi, %rdx), %r8d
30743 movl %ecx, (%rdi)
30744 movl %r8d, -4(%rdi, %rdx)
30745+ pax_force_retaddr
30746 retq
30747 .p2align 4
30748 .Lless_3bytes:
30749@@ -177,6 +182,7 @@ ENTRY(memcpy_orig)
30750 movb %cl, (%rdi)
30751
30752 .Lend:
30753+ pax_force_retaddr
30754 retq
30755 CFI_ENDPROC
30756 ENDPROC(memcpy_orig)
30757diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30758index 0f8a0d0..f6e0ea4 100644
30759--- a/arch/x86/lib/memmove_64.S
30760+++ b/arch/x86/lib/memmove_64.S
30761@@ -43,7 +43,7 @@ ENTRY(__memmove)
30762 jg 2f
30763
30764 .Lmemmove_begin_forward:
30765- ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; retq", X86_FEATURE_ERMS
30766+ ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; pax_force_retaddr; retq", X86_FEATURE_ERMS
30767
30768 /*
30769 * movsq instruction have many startup latency
30770@@ -206,6 +206,7 @@ ENTRY(__memmove)
30771 movb (%rsi), %r11b
30772 movb %r11b, (%rdi)
30773 13:
30774+ pax_force_retaddr
30775 retq
30776 CFI_ENDPROC
30777 ENDPROC(__memmove)
30778diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30779index 93118fb..386ed2a 100644
30780--- a/arch/x86/lib/memset_64.S
30781+++ b/arch/x86/lib/memset_64.S
30782@@ -41,6 +41,7 @@ ENTRY(__memset)
30783 movl %edx,%ecx
30784 rep stosb
30785 movq %r9,%rax
30786+ pax_force_retaddr
30787 ret
30788 ENDPROC(memset)
30789 ENDPROC(__memset)
30790@@ -62,6 +63,7 @@ ENTRY(memset_erms)
30791 movq %rdx,%rcx
30792 rep stosb
30793 movq %r9,%rax
30794+ pax_force_retaddr
30795 ret
30796 ENDPROC(memset_erms)
30797
30798@@ -126,6 +128,7 @@ ENTRY(memset_orig)
30799
30800 .Lende:
30801 movq %r10,%rax
30802+ pax_force_retaddr
30803 ret
30804
30805 CFI_RESTORE_STATE
30806diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30807index c9f2d9b..e7fd2c0 100644
30808--- a/arch/x86/lib/mmx_32.c
30809+++ b/arch/x86/lib/mmx_32.c
30810@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30811 {
30812 void *p;
30813 int i;
30814+ unsigned long cr0;
30815
30816 if (unlikely(in_interrupt()))
30817 return __memcpy(to, from, len);
30818@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30819 kernel_fpu_begin();
30820
30821 __asm__ __volatile__ (
30822- "1: prefetch (%0)\n" /* This set is 28 bytes */
30823- " prefetch 64(%0)\n"
30824- " prefetch 128(%0)\n"
30825- " prefetch 192(%0)\n"
30826- " prefetch 256(%0)\n"
30827+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30828+ " prefetch 64(%1)\n"
30829+ " prefetch 128(%1)\n"
30830+ " prefetch 192(%1)\n"
30831+ " prefetch 256(%1)\n"
30832 "2: \n"
30833 ".section .fixup, \"ax\"\n"
30834- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30835+ "3: \n"
30836+
30837+#ifdef CONFIG_PAX_KERNEXEC
30838+ " movl %%cr0, %0\n"
30839+ " movl %0, %%eax\n"
30840+ " andl $0xFFFEFFFF, %%eax\n"
30841+ " movl %%eax, %%cr0\n"
30842+#endif
30843+
30844+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30845+
30846+#ifdef CONFIG_PAX_KERNEXEC
30847+ " movl %0, %%cr0\n"
30848+#endif
30849+
30850 " jmp 2b\n"
30851 ".previous\n"
30852 _ASM_EXTABLE(1b, 3b)
30853- : : "r" (from));
30854+ : "=&r" (cr0) : "r" (from) : "ax");
30855
30856 for ( ; i > 5; i--) {
30857 __asm__ __volatile__ (
30858- "1: prefetch 320(%0)\n"
30859- "2: movq (%0), %%mm0\n"
30860- " movq 8(%0), %%mm1\n"
30861- " movq 16(%0), %%mm2\n"
30862- " movq 24(%0), %%mm3\n"
30863- " movq %%mm0, (%1)\n"
30864- " movq %%mm1, 8(%1)\n"
30865- " movq %%mm2, 16(%1)\n"
30866- " movq %%mm3, 24(%1)\n"
30867- " movq 32(%0), %%mm0\n"
30868- " movq 40(%0), %%mm1\n"
30869- " movq 48(%0), %%mm2\n"
30870- " movq 56(%0), %%mm3\n"
30871- " movq %%mm0, 32(%1)\n"
30872- " movq %%mm1, 40(%1)\n"
30873- " movq %%mm2, 48(%1)\n"
30874- " movq %%mm3, 56(%1)\n"
30875+ "1: prefetch 320(%1)\n"
30876+ "2: movq (%1), %%mm0\n"
30877+ " movq 8(%1), %%mm1\n"
30878+ " movq 16(%1), %%mm2\n"
30879+ " movq 24(%1), %%mm3\n"
30880+ " movq %%mm0, (%2)\n"
30881+ " movq %%mm1, 8(%2)\n"
30882+ " movq %%mm2, 16(%2)\n"
30883+ " movq %%mm3, 24(%2)\n"
30884+ " movq 32(%1), %%mm0\n"
30885+ " movq 40(%1), %%mm1\n"
30886+ " movq 48(%1), %%mm2\n"
30887+ " movq 56(%1), %%mm3\n"
30888+ " movq %%mm0, 32(%2)\n"
30889+ " movq %%mm1, 40(%2)\n"
30890+ " movq %%mm2, 48(%2)\n"
30891+ " movq %%mm3, 56(%2)\n"
30892 ".section .fixup, \"ax\"\n"
30893- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30894+ "3:\n"
30895+
30896+#ifdef CONFIG_PAX_KERNEXEC
30897+ " movl %%cr0, %0\n"
30898+ " movl %0, %%eax\n"
30899+ " andl $0xFFFEFFFF, %%eax\n"
30900+ " movl %%eax, %%cr0\n"
30901+#endif
30902+
30903+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30904+
30905+#ifdef CONFIG_PAX_KERNEXEC
30906+ " movl %0, %%cr0\n"
30907+#endif
30908+
30909 " jmp 2b\n"
30910 ".previous\n"
30911 _ASM_EXTABLE(1b, 3b)
30912- : : "r" (from), "r" (to) : "memory");
30913+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30914
30915 from += 64;
30916 to += 64;
30917@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30918 static void fast_copy_page(void *to, void *from)
30919 {
30920 int i;
30921+ unsigned long cr0;
30922
30923 kernel_fpu_begin();
30924
30925@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30926 * but that is for later. -AV
30927 */
30928 __asm__ __volatile__(
30929- "1: prefetch (%0)\n"
30930- " prefetch 64(%0)\n"
30931- " prefetch 128(%0)\n"
30932- " prefetch 192(%0)\n"
30933- " prefetch 256(%0)\n"
30934+ "1: prefetch (%1)\n"
30935+ " prefetch 64(%1)\n"
30936+ " prefetch 128(%1)\n"
30937+ " prefetch 192(%1)\n"
30938+ " prefetch 256(%1)\n"
30939 "2: \n"
30940 ".section .fixup, \"ax\"\n"
30941- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30942+ "3: \n"
30943+
30944+#ifdef CONFIG_PAX_KERNEXEC
30945+ " movl %%cr0, %0\n"
30946+ " movl %0, %%eax\n"
30947+ " andl $0xFFFEFFFF, %%eax\n"
30948+ " movl %%eax, %%cr0\n"
30949+#endif
30950+
30951+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30952+
30953+#ifdef CONFIG_PAX_KERNEXEC
30954+ " movl %0, %%cr0\n"
30955+#endif
30956+
30957 " jmp 2b\n"
30958 ".previous\n"
30959- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30960+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30961
30962 for (i = 0; i < (4096-320)/64; i++) {
30963 __asm__ __volatile__ (
30964- "1: prefetch 320(%0)\n"
30965- "2: movq (%0), %%mm0\n"
30966- " movntq %%mm0, (%1)\n"
30967- " movq 8(%0), %%mm1\n"
30968- " movntq %%mm1, 8(%1)\n"
30969- " movq 16(%0), %%mm2\n"
30970- " movntq %%mm2, 16(%1)\n"
30971- " movq 24(%0), %%mm3\n"
30972- " movntq %%mm3, 24(%1)\n"
30973- " movq 32(%0), %%mm4\n"
30974- " movntq %%mm4, 32(%1)\n"
30975- " movq 40(%0), %%mm5\n"
30976- " movntq %%mm5, 40(%1)\n"
30977- " movq 48(%0), %%mm6\n"
30978- " movntq %%mm6, 48(%1)\n"
30979- " movq 56(%0), %%mm7\n"
30980- " movntq %%mm7, 56(%1)\n"
30981+ "1: prefetch 320(%1)\n"
30982+ "2: movq (%1), %%mm0\n"
30983+ " movntq %%mm0, (%2)\n"
30984+ " movq 8(%1), %%mm1\n"
30985+ " movntq %%mm1, 8(%2)\n"
30986+ " movq 16(%1), %%mm2\n"
30987+ " movntq %%mm2, 16(%2)\n"
30988+ " movq 24(%1), %%mm3\n"
30989+ " movntq %%mm3, 24(%2)\n"
30990+ " movq 32(%1), %%mm4\n"
30991+ " movntq %%mm4, 32(%2)\n"
30992+ " movq 40(%1), %%mm5\n"
30993+ " movntq %%mm5, 40(%2)\n"
30994+ " movq 48(%1), %%mm6\n"
30995+ " movntq %%mm6, 48(%2)\n"
30996+ " movq 56(%1), %%mm7\n"
30997+ " movntq %%mm7, 56(%2)\n"
30998 ".section .fixup, \"ax\"\n"
30999- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31000+ "3:\n"
31001+
31002+#ifdef CONFIG_PAX_KERNEXEC
31003+ " movl %%cr0, %0\n"
31004+ " movl %0, %%eax\n"
31005+ " andl $0xFFFEFFFF, %%eax\n"
31006+ " movl %%eax, %%cr0\n"
31007+#endif
31008+
31009+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31010+
31011+#ifdef CONFIG_PAX_KERNEXEC
31012+ " movl %0, %%cr0\n"
31013+#endif
31014+
31015 " jmp 2b\n"
31016 ".previous\n"
31017- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
31018+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
31019
31020 from += 64;
31021 to += 64;
31022@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
31023 static void fast_copy_page(void *to, void *from)
31024 {
31025 int i;
31026+ unsigned long cr0;
31027
31028 kernel_fpu_begin();
31029
31030 __asm__ __volatile__ (
31031- "1: prefetch (%0)\n"
31032- " prefetch 64(%0)\n"
31033- " prefetch 128(%0)\n"
31034- " prefetch 192(%0)\n"
31035- " prefetch 256(%0)\n"
31036+ "1: prefetch (%1)\n"
31037+ " prefetch 64(%1)\n"
31038+ " prefetch 128(%1)\n"
31039+ " prefetch 192(%1)\n"
31040+ " prefetch 256(%1)\n"
31041 "2: \n"
31042 ".section .fixup, \"ax\"\n"
31043- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
31044+ "3: \n"
31045+
31046+#ifdef CONFIG_PAX_KERNEXEC
31047+ " movl %%cr0, %0\n"
31048+ " movl %0, %%eax\n"
31049+ " andl $0xFFFEFFFF, %%eax\n"
31050+ " movl %%eax, %%cr0\n"
31051+#endif
31052+
31053+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
31054+
31055+#ifdef CONFIG_PAX_KERNEXEC
31056+ " movl %0, %%cr0\n"
31057+#endif
31058+
31059 " jmp 2b\n"
31060 ".previous\n"
31061- _ASM_EXTABLE(1b, 3b) : : "r" (from));
31062+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
31063
31064 for (i = 0; i < 4096/64; i++) {
31065 __asm__ __volatile__ (
31066- "1: prefetch 320(%0)\n"
31067- "2: movq (%0), %%mm0\n"
31068- " movq 8(%0), %%mm1\n"
31069- " movq 16(%0), %%mm2\n"
31070- " movq 24(%0), %%mm3\n"
31071- " movq %%mm0, (%1)\n"
31072- " movq %%mm1, 8(%1)\n"
31073- " movq %%mm2, 16(%1)\n"
31074- " movq %%mm3, 24(%1)\n"
31075- " movq 32(%0), %%mm0\n"
31076- " movq 40(%0), %%mm1\n"
31077- " movq 48(%0), %%mm2\n"
31078- " movq 56(%0), %%mm3\n"
31079- " movq %%mm0, 32(%1)\n"
31080- " movq %%mm1, 40(%1)\n"
31081- " movq %%mm2, 48(%1)\n"
31082- " movq %%mm3, 56(%1)\n"
31083+ "1: prefetch 320(%1)\n"
31084+ "2: movq (%1), %%mm0\n"
31085+ " movq 8(%1), %%mm1\n"
31086+ " movq 16(%1), %%mm2\n"
31087+ " movq 24(%1), %%mm3\n"
31088+ " movq %%mm0, (%2)\n"
31089+ " movq %%mm1, 8(%2)\n"
31090+ " movq %%mm2, 16(%2)\n"
31091+ " movq %%mm3, 24(%2)\n"
31092+ " movq 32(%1), %%mm0\n"
31093+ " movq 40(%1), %%mm1\n"
31094+ " movq 48(%1), %%mm2\n"
31095+ " movq 56(%1), %%mm3\n"
31096+ " movq %%mm0, 32(%2)\n"
31097+ " movq %%mm1, 40(%2)\n"
31098+ " movq %%mm2, 48(%2)\n"
31099+ " movq %%mm3, 56(%2)\n"
31100 ".section .fixup, \"ax\"\n"
31101- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31102+ "3:\n"
31103+
31104+#ifdef CONFIG_PAX_KERNEXEC
31105+ " movl %%cr0, %0\n"
31106+ " movl %0, %%eax\n"
31107+ " andl $0xFFFEFFFF, %%eax\n"
31108+ " movl %%eax, %%cr0\n"
31109+#endif
31110+
31111+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31112+
31113+#ifdef CONFIG_PAX_KERNEXEC
31114+ " movl %0, %%cr0\n"
31115+#endif
31116+
31117 " jmp 2b\n"
31118 ".previous\n"
31119 _ASM_EXTABLE(1b, 3b)
31120- : : "r" (from), "r" (to) : "memory");
31121+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
31122
31123 from += 64;
31124 to += 64;
31125diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
31126index 3ca5218..c2ae6bc 100644
31127--- a/arch/x86/lib/msr-reg.S
31128+++ b/arch/x86/lib/msr-reg.S
31129@@ -3,6 +3,7 @@
31130 #include <asm/dwarf2.h>
31131 #include <asm/asm.h>
31132 #include <asm/msr.h>
31133+#include <asm/alternative-asm.h>
31134
31135 #ifdef CONFIG_X86_64
31136 /*
31137@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
31138 movl %edi, 28(%r10)
31139 popq_cfi_reg rbp
31140 popq_cfi_reg rbx
31141+ pax_force_retaddr
31142 ret
31143 3:
31144 CFI_RESTORE_STATE
31145diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
31146index fc6ba17..14ad9a5 100644
31147--- a/arch/x86/lib/putuser.S
31148+++ b/arch/x86/lib/putuser.S
31149@@ -16,7 +16,9 @@
31150 #include <asm/errno.h>
31151 #include <asm/asm.h>
31152 #include <asm/smap.h>
31153-
31154+#include <asm/segment.h>
31155+#include <asm/pgtable.h>
31156+#include <asm/alternative-asm.h>
31157
31158 /*
31159 * __put_user_X
31160@@ -30,57 +32,125 @@
31161 * as they get called from within inline assembly.
31162 */
31163
31164-#define ENTER CFI_STARTPROC ; \
31165- GET_THREAD_INFO(%_ASM_BX)
31166-#define EXIT ASM_CLAC ; \
31167- ret ; \
31168+#define ENTER CFI_STARTPROC
31169+#define EXIT ASM_CLAC ; \
31170+ pax_force_retaddr ; \
31171+ ret ; \
31172 CFI_ENDPROC
31173
31174+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31175+#define _DEST %_ASM_CX,%_ASM_BX
31176+#else
31177+#define _DEST %_ASM_CX
31178+#endif
31179+
31180+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
31181+#define __copyuser_seg gs;
31182+#else
31183+#define __copyuser_seg
31184+#endif
31185+
31186 .text
31187 ENTRY(__put_user_1)
31188 ENTER
31189+
31190+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31191+ GET_THREAD_INFO(%_ASM_BX)
31192 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
31193 jae bad_put_user
31194+
31195+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31196+ mov pax_user_shadow_base,%_ASM_BX
31197+ cmp %_ASM_BX,%_ASM_CX
31198+ jb 1234f
31199+ xor %ebx,%ebx
31200+1234:
31201+#endif
31202+
31203+#endif
31204+
31205 ASM_STAC
31206-1: movb %al,(%_ASM_CX)
31207+1: __copyuser_seg movb %al,(_DEST)
31208 xor %eax,%eax
31209 EXIT
31210 ENDPROC(__put_user_1)
31211
31212 ENTRY(__put_user_2)
31213 ENTER
31214+
31215+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31216+ GET_THREAD_INFO(%_ASM_BX)
31217 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31218 sub $1,%_ASM_BX
31219 cmp %_ASM_BX,%_ASM_CX
31220 jae bad_put_user
31221+
31222+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31223+ mov pax_user_shadow_base,%_ASM_BX
31224+ cmp %_ASM_BX,%_ASM_CX
31225+ jb 1234f
31226+ xor %ebx,%ebx
31227+1234:
31228+#endif
31229+
31230+#endif
31231+
31232 ASM_STAC
31233-2: movw %ax,(%_ASM_CX)
31234+2: __copyuser_seg movw %ax,(_DEST)
31235 xor %eax,%eax
31236 EXIT
31237 ENDPROC(__put_user_2)
31238
31239 ENTRY(__put_user_4)
31240 ENTER
31241+
31242+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31243+ GET_THREAD_INFO(%_ASM_BX)
31244 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31245 sub $3,%_ASM_BX
31246 cmp %_ASM_BX,%_ASM_CX
31247 jae bad_put_user
31248+
31249+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31250+ mov pax_user_shadow_base,%_ASM_BX
31251+ cmp %_ASM_BX,%_ASM_CX
31252+ jb 1234f
31253+ xor %ebx,%ebx
31254+1234:
31255+#endif
31256+
31257+#endif
31258+
31259 ASM_STAC
31260-3: movl %eax,(%_ASM_CX)
31261+3: __copyuser_seg movl %eax,(_DEST)
31262 xor %eax,%eax
31263 EXIT
31264 ENDPROC(__put_user_4)
31265
31266 ENTRY(__put_user_8)
31267 ENTER
31268+
31269+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31270+ GET_THREAD_INFO(%_ASM_BX)
31271 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31272 sub $7,%_ASM_BX
31273 cmp %_ASM_BX,%_ASM_CX
31274 jae bad_put_user
31275+
31276+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31277+ mov pax_user_shadow_base,%_ASM_BX
31278+ cmp %_ASM_BX,%_ASM_CX
31279+ jb 1234f
31280+ xor %ebx,%ebx
31281+1234:
31282+#endif
31283+
31284+#endif
31285+
31286 ASM_STAC
31287-4: mov %_ASM_AX,(%_ASM_CX)
31288+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31289 #ifdef CONFIG_X86_32
31290-5: movl %edx,4(%_ASM_CX)
31291+5: __copyuser_seg movl %edx,4(_DEST)
31292 #endif
31293 xor %eax,%eax
31294 EXIT
31295diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31296index 2322abe..1e78a75 100644
31297--- a/arch/x86/lib/rwsem.S
31298+++ b/arch/x86/lib/rwsem.S
31299@@ -92,6 +92,7 @@ ENTRY(call_rwsem_down_read_failed)
31300 call rwsem_down_read_failed
31301 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
31302 restore_common_regs
31303+ pax_force_retaddr
31304 ret
31305 CFI_ENDPROC
31306 ENDPROC(call_rwsem_down_read_failed)
31307@@ -102,6 +103,7 @@ ENTRY(call_rwsem_down_write_failed)
31308 movq %rax,%rdi
31309 call rwsem_down_write_failed
31310 restore_common_regs
31311+ pax_force_retaddr
31312 ret
31313 CFI_ENDPROC
31314 ENDPROC(call_rwsem_down_write_failed)
31315@@ -115,7 +117,8 @@ ENTRY(call_rwsem_wake)
31316 movq %rax,%rdi
31317 call rwsem_wake
31318 restore_common_regs
31319-1: ret
31320+1: pax_force_retaddr
31321+ ret
31322 CFI_ENDPROC
31323 ENDPROC(call_rwsem_wake)
31324
31325@@ -127,6 +130,7 @@ ENTRY(call_rwsem_downgrade_wake)
31326 call rwsem_downgrade_wake
31327 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
31328 restore_common_regs
31329+ pax_force_retaddr
31330 ret
31331 CFI_ENDPROC
31332 ENDPROC(call_rwsem_downgrade_wake)
31333diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31334index f89ba4e9..512b2de 100644
31335--- a/arch/x86/lib/thunk_64.S
31336+++ b/arch/x86/lib/thunk_64.S
31337@@ -9,6 +9,7 @@
31338 #include <asm/dwarf2.h>
31339 #include <asm/calling.h>
31340 #include <asm/asm.h>
31341+#include <asm/alternative-asm.h>
31342
31343 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31344 .macro THUNK name, func, put_ret_addr_in_rdi=0
31345@@ -69,6 +70,7 @@ restore:
31346 popq_cfi_reg rdx
31347 popq_cfi_reg rsi
31348 popq_cfi_reg rdi
31349+ pax_force_retaddr
31350 ret
31351 CFI_ENDPROC
31352 _ASM_NOKPROBE(restore)
31353diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
31354index ddf9ecb..e342586 100644
31355--- a/arch/x86/lib/usercopy.c
31356+++ b/arch/x86/lib/usercopy.c
31357@@ -20,7 +20,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
31358 unsigned long ret;
31359
31360 if (__range_not_ok(from, n, TASK_SIZE))
31361- return 0;
31362+ return n;
31363
31364 /*
31365 * Even though this function is typically called from NMI/IRQ context
31366diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31367index e2f5e21..4b22130 100644
31368--- a/arch/x86/lib/usercopy_32.c
31369+++ b/arch/x86/lib/usercopy_32.c
31370@@ -42,11 +42,13 @@ do { \
31371 int __d0; \
31372 might_fault(); \
31373 __asm__ __volatile__( \
31374+ __COPYUSER_SET_ES \
31375 ASM_STAC "\n" \
31376 "0: rep; stosl\n" \
31377 " movl %2,%0\n" \
31378 "1: rep; stosb\n" \
31379 "2: " ASM_CLAC "\n" \
31380+ __COPYUSER_RESTORE_ES \
31381 ".section .fixup,\"ax\"\n" \
31382 "3: lea 0(%2,%0,4),%0\n" \
31383 " jmp 2b\n" \
31384@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31385
31386 #ifdef CONFIG_X86_INTEL_USERCOPY
31387 static unsigned long
31388-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31389+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31390 {
31391 int d0, d1;
31392 __asm__ __volatile__(
31393@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31394 " .align 2,0x90\n"
31395 "3: movl 0(%4), %%eax\n"
31396 "4: movl 4(%4), %%edx\n"
31397- "5: movl %%eax, 0(%3)\n"
31398- "6: movl %%edx, 4(%3)\n"
31399+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31400+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31401 "7: movl 8(%4), %%eax\n"
31402 "8: movl 12(%4),%%edx\n"
31403- "9: movl %%eax, 8(%3)\n"
31404- "10: movl %%edx, 12(%3)\n"
31405+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31406+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31407 "11: movl 16(%4), %%eax\n"
31408 "12: movl 20(%4), %%edx\n"
31409- "13: movl %%eax, 16(%3)\n"
31410- "14: movl %%edx, 20(%3)\n"
31411+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31412+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31413 "15: movl 24(%4), %%eax\n"
31414 "16: movl 28(%4), %%edx\n"
31415- "17: movl %%eax, 24(%3)\n"
31416- "18: movl %%edx, 28(%3)\n"
31417+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31418+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31419 "19: movl 32(%4), %%eax\n"
31420 "20: movl 36(%4), %%edx\n"
31421- "21: movl %%eax, 32(%3)\n"
31422- "22: movl %%edx, 36(%3)\n"
31423+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31424+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31425 "23: movl 40(%4), %%eax\n"
31426 "24: movl 44(%4), %%edx\n"
31427- "25: movl %%eax, 40(%3)\n"
31428- "26: movl %%edx, 44(%3)\n"
31429+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31430+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31431 "27: movl 48(%4), %%eax\n"
31432 "28: movl 52(%4), %%edx\n"
31433- "29: movl %%eax, 48(%3)\n"
31434- "30: movl %%edx, 52(%3)\n"
31435+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31436+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31437 "31: movl 56(%4), %%eax\n"
31438 "32: movl 60(%4), %%edx\n"
31439- "33: movl %%eax, 56(%3)\n"
31440- "34: movl %%edx, 60(%3)\n"
31441+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31442+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31443 " addl $-64, %0\n"
31444 " addl $64, %4\n"
31445 " addl $64, %3\n"
31446@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31447 " shrl $2, %0\n"
31448 " andl $3, %%eax\n"
31449 " cld\n"
31450+ __COPYUSER_SET_ES
31451 "99: rep; movsl\n"
31452 "36: movl %%eax, %0\n"
31453 "37: rep; movsb\n"
31454 "100:\n"
31455+ __COPYUSER_RESTORE_ES
31456+ ".section .fixup,\"ax\"\n"
31457+ "101: lea 0(%%eax,%0,4),%0\n"
31458+ " jmp 100b\n"
31459+ ".previous\n"
31460+ _ASM_EXTABLE(1b,100b)
31461+ _ASM_EXTABLE(2b,100b)
31462+ _ASM_EXTABLE(3b,100b)
31463+ _ASM_EXTABLE(4b,100b)
31464+ _ASM_EXTABLE(5b,100b)
31465+ _ASM_EXTABLE(6b,100b)
31466+ _ASM_EXTABLE(7b,100b)
31467+ _ASM_EXTABLE(8b,100b)
31468+ _ASM_EXTABLE(9b,100b)
31469+ _ASM_EXTABLE(10b,100b)
31470+ _ASM_EXTABLE(11b,100b)
31471+ _ASM_EXTABLE(12b,100b)
31472+ _ASM_EXTABLE(13b,100b)
31473+ _ASM_EXTABLE(14b,100b)
31474+ _ASM_EXTABLE(15b,100b)
31475+ _ASM_EXTABLE(16b,100b)
31476+ _ASM_EXTABLE(17b,100b)
31477+ _ASM_EXTABLE(18b,100b)
31478+ _ASM_EXTABLE(19b,100b)
31479+ _ASM_EXTABLE(20b,100b)
31480+ _ASM_EXTABLE(21b,100b)
31481+ _ASM_EXTABLE(22b,100b)
31482+ _ASM_EXTABLE(23b,100b)
31483+ _ASM_EXTABLE(24b,100b)
31484+ _ASM_EXTABLE(25b,100b)
31485+ _ASM_EXTABLE(26b,100b)
31486+ _ASM_EXTABLE(27b,100b)
31487+ _ASM_EXTABLE(28b,100b)
31488+ _ASM_EXTABLE(29b,100b)
31489+ _ASM_EXTABLE(30b,100b)
31490+ _ASM_EXTABLE(31b,100b)
31491+ _ASM_EXTABLE(32b,100b)
31492+ _ASM_EXTABLE(33b,100b)
31493+ _ASM_EXTABLE(34b,100b)
31494+ _ASM_EXTABLE(35b,100b)
31495+ _ASM_EXTABLE(36b,100b)
31496+ _ASM_EXTABLE(37b,100b)
31497+ _ASM_EXTABLE(99b,101b)
31498+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31499+ : "1"(to), "2"(from), "0"(size)
31500+ : "eax", "edx", "memory");
31501+ return size;
31502+}
31503+
31504+static unsigned long
31505+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31506+{
31507+ int d0, d1;
31508+ __asm__ __volatile__(
31509+ " .align 2,0x90\n"
31510+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31511+ " cmpl $67, %0\n"
31512+ " jbe 3f\n"
31513+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31514+ " .align 2,0x90\n"
31515+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31516+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31517+ "5: movl %%eax, 0(%3)\n"
31518+ "6: movl %%edx, 4(%3)\n"
31519+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31520+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31521+ "9: movl %%eax, 8(%3)\n"
31522+ "10: movl %%edx, 12(%3)\n"
31523+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31524+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31525+ "13: movl %%eax, 16(%3)\n"
31526+ "14: movl %%edx, 20(%3)\n"
31527+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31528+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31529+ "17: movl %%eax, 24(%3)\n"
31530+ "18: movl %%edx, 28(%3)\n"
31531+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31532+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31533+ "21: movl %%eax, 32(%3)\n"
31534+ "22: movl %%edx, 36(%3)\n"
31535+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31536+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31537+ "25: movl %%eax, 40(%3)\n"
31538+ "26: movl %%edx, 44(%3)\n"
31539+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31540+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31541+ "29: movl %%eax, 48(%3)\n"
31542+ "30: movl %%edx, 52(%3)\n"
31543+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31544+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31545+ "33: movl %%eax, 56(%3)\n"
31546+ "34: movl %%edx, 60(%3)\n"
31547+ " addl $-64, %0\n"
31548+ " addl $64, %4\n"
31549+ " addl $64, %3\n"
31550+ " cmpl $63, %0\n"
31551+ " ja 1b\n"
31552+ "35: movl %0, %%eax\n"
31553+ " shrl $2, %0\n"
31554+ " andl $3, %%eax\n"
31555+ " cld\n"
31556+ "99: rep; "__copyuser_seg" movsl\n"
31557+ "36: movl %%eax, %0\n"
31558+ "37: rep; "__copyuser_seg" movsb\n"
31559+ "100:\n"
31560 ".section .fixup,\"ax\"\n"
31561 "101: lea 0(%%eax,%0,4),%0\n"
31562 " jmp 100b\n"
31563@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31564 int d0, d1;
31565 __asm__ __volatile__(
31566 " .align 2,0x90\n"
31567- "0: movl 32(%4), %%eax\n"
31568+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31569 " cmpl $67, %0\n"
31570 " jbe 2f\n"
31571- "1: movl 64(%4), %%eax\n"
31572+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31573 " .align 2,0x90\n"
31574- "2: movl 0(%4), %%eax\n"
31575- "21: movl 4(%4), %%edx\n"
31576+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31577+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31578 " movl %%eax, 0(%3)\n"
31579 " movl %%edx, 4(%3)\n"
31580- "3: movl 8(%4), %%eax\n"
31581- "31: movl 12(%4),%%edx\n"
31582+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31583+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31584 " movl %%eax, 8(%3)\n"
31585 " movl %%edx, 12(%3)\n"
31586- "4: movl 16(%4), %%eax\n"
31587- "41: movl 20(%4), %%edx\n"
31588+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31589+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31590 " movl %%eax, 16(%3)\n"
31591 " movl %%edx, 20(%3)\n"
31592- "10: movl 24(%4), %%eax\n"
31593- "51: movl 28(%4), %%edx\n"
31594+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31595+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31596 " movl %%eax, 24(%3)\n"
31597 " movl %%edx, 28(%3)\n"
31598- "11: movl 32(%4), %%eax\n"
31599- "61: movl 36(%4), %%edx\n"
31600+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31601+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31602 " movl %%eax, 32(%3)\n"
31603 " movl %%edx, 36(%3)\n"
31604- "12: movl 40(%4), %%eax\n"
31605- "71: movl 44(%4), %%edx\n"
31606+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31607+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31608 " movl %%eax, 40(%3)\n"
31609 " movl %%edx, 44(%3)\n"
31610- "13: movl 48(%4), %%eax\n"
31611- "81: movl 52(%4), %%edx\n"
31612+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31613+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31614 " movl %%eax, 48(%3)\n"
31615 " movl %%edx, 52(%3)\n"
31616- "14: movl 56(%4), %%eax\n"
31617- "91: movl 60(%4), %%edx\n"
31618+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31619+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31620 " movl %%eax, 56(%3)\n"
31621 " movl %%edx, 60(%3)\n"
31622 " addl $-64, %0\n"
31623@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31624 " shrl $2, %0\n"
31625 " andl $3, %%eax\n"
31626 " cld\n"
31627- "6: rep; movsl\n"
31628+ "6: rep; "__copyuser_seg" movsl\n"
31629 " movl %%eax,%0\n"
31630- "7: rep; movsb\n"
31631+ "7: rep; "__copyuser_seg" movsb\n"
31632 "8:\n"
31633 ".section .fixup,\"ax\"\n"
31634 "9: lea 0(%%eax,%0,4),%0\n"
31635@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31636
31637 __asm__ __volatile__(
31638 " .align 2,0x90\n"
31639- "0: movl 32(%4), %%eax\n"
31640+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31641 " cmpl $67, %0\n"
31642 " jbe 2f\n"
31643- "1: movl 64(%4), %%eax\n"
31644+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31645 " .align 2,0x90\n"
31646- "2: movl 0(%4), %%eax\n"
31647- "21: movl 4(%4), %%edx\n"
31648+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31649+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31650 " movnti %%eax, 0(%3)\n"
31651 " movnti %%edx, 4(%3)\n"
31652- "3: movl 8(%4), %%eax\n"
31653- "31: movl 12(%4),%%edx\n"
31654+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31655+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31656 " movnti %%eax, 8(%3)\n"
31657 " movnti %%edx, 12(%3)\n"
31658- "4: movl 16(%4), %%eax\n"
31659- "41: movl 20(%4), %%edx\n"
31660+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31661+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31662 " movnti %%eax, 16(%3)\n"
31663 " movnti %%edx, 20(%3)\n"
31664- "10: movl 24(%4), %%eax\n"
31665- "51: movl 28(%4), %%edx\n"
31666+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31667+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31668 " movnti %%eax, 24(%3)\n"
31669 " movnti %%edx, 28(%3)\n"
31670- "11: movl 32(%4), %%eax\n"
31671- "61: movl 36(%4), %%edx\n"
31672+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31673+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31674 " movnti %%eax, 32(%3)\n"
31675 " movnti %%edx, 36(%3)\n"
31676- "12: movl 40(%4), %%eax\n"
31677- "71: movl 44(%4), %%edx\n"
31678+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31679+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31680 " movnti %%eax, 40(%3)\n"
31681 " movnti %%edx, 44(%3)\n"
31682- "13: movl 48(%4), %%eax\n"
31683- "81: movl 52(%4), %%edx\n"
31684+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31685+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31686 " movnti %%eax, 48(%3)\n"
31687 " movnti %%edx, 52(%3)\n"
31688- "14: movl 56(%4), %%eax\n"
31689- "91: movl 60(%4), %%edx\n"
31690+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31691+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31692 " movnti %%eax, 56(%3)\n"
31693 " movnti %%edx, 60(%3)\n"
31694 " addl $-64, %0\n"
31695@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31696 " shrl $2, %0\n"
31697 " andl $3, %%eax\n"
31698 " cld\n"
31699- "6: rep; movsl\n"
31700+ "6: rep; "__copyuser_seg" movsl\n"
31701 " movl %%eax,%0\n"
31702- "7: rep; movsb\n"
31703+ "7: rep; "__copyuser_seg" movsb\n"
31704 "8:\n"
31705 ".section .fixup,\"ax\"\n"
31706 "9: lea 0(%%eax,%0,4),%0\n"
31707@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31708
31709 __asm__ __volatile__(
31710 " .align 2,0x90\n"
31711- "0: movl 32(%4), %%eax\n"
31712+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31713 " cmpl $67, %0\n"
31714 " jbe 2f\n"
31715- "1: movl 64(%4), %%eax\n"
31716+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31717 " .align 2,0x90\n"
31718- "2: movl 0(%4), %%eax\n"
31719- "21: movl 4(%4), %%edx\n"
31720+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31721+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31722 " movnti %%eax, 0(%3)\n"
31723 " movnti %%edx, 4(%3)\n"
31724- "3: movl 8(%4), %%eax\n"
31725- "31: movl 12(%4),%%edx\n"
31726+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31727+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31728 " movnti %%eax, 8(%3)\n"
31729 " movnti %%edx, 12(%3)\n"
31730- "4: movl 16(%4), %%eax\n"
31731- "41: movl 20(%4), %%edx\n"
31732+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31733+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31734 " movnti %%eax, 16(%3)\n"
31735 " movnti %%edx, 20(%3)\n"
31736- "10: movl 24(%4), %%eax\n"
31737- "51: movl 28(%4), %%edx\n"
31738+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31739+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31740 " movnti %%eax, 24(%3)\n"
31741 " movnti %%edx, 28(%3)\n"
31742- "11: movl 32(%4), %%eax\n"
31743- "61: movl 36(%4), %%edx\n"
31744+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31745+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31746 " movnti %%eax, 32(%3)\n"
31747 " movnti %%edx, 36(%3)\n"
31748- "12: movl 40(%4), %%eax\n"
31749- "71: movl 44(%4), %%edx\n"
31750+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31751+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31752 " movnti %%eax, 40(%3)\n"
31753 " movnti %%edx, 44(%3)\n"
31754- "13: movl 48(%4), %%eax\n"
31755- "81: movl 52(%4), %%edx\n"
31756+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31757+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31758 " movnti %%eax, 48(%3)\n"
31759 " movnti %%edx, 52(%3)\n"
31760- "14: movl 56(%4), %%eax\n"
31761- "91: movl 60(%4), %%edx\n"
31762+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31763+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31764 " movnti %%eax, 56(%3)\n"
31765 " movnti %%edx, 60(%3)\n"
31766 " addl $-64, %0\n"
31767@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31768 " shrl $2, %0\n"
31769 " andl $3, %%eax\n"
31770 " cld\n"
31771- "6: rep; movsl\n"
31772+ "6: rep; "__copyuser_seg" movsl\n"
31773 " movl %%eax,%0\n"
31774- "7: rep; movsb\n"
31775+ "7: rep; "__copyuser_seg" movsb\n"
31776 "8:\n"
31777 ".section .fixup,\"ax\"\n"
31778 "9: lea 0(%%eax,%0,4),%0\n"
31779@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31780 */
31781 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31782 unsigned long size);
31783-unsigned long __copy_user_intel(void __user *to, const void *from,
31784+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31785+ unsigned long size);
31786+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31787 unsigned long size);
31788 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31789 const void __user *from, unsigned long size);
31790 #endif /* CONFIG_X86_INTEL_USERCOPY */
31791
31792 /* Generic arbitrary sized copy. */
31793-#define __copy_user(to, from, size) \
31794+#define __copy_user(to, from, size, prefix, set, restore) \
31795 do { \
31796 int __d0, __d1, __d2; \
31797 __asm__ __volatile__( \
31798+ set \
31799 " cmp $7,%0\n" \
31800 " jbe 1f\n" \
31801 " movl %1,%0\n" \
31802 " negl %0\n" \
31803 " andl $7,%0\n" \
31804 " subl %0,%3\n" \
31805- "4: rep; movsb\n" \
31806+ "4: rep; "prefix"movsb\n" \
31807 " movl %3,%0\n" \
31808 " shrl $2,%0\n" \
31809 " andl $3,%3\n" \
31810 " .align 2,0x90\n" \
31811- "0: rep; movsl\n" \
31812+ "0: rep; "prefix"movsl\n" \
31813 " movl %3,%0\n" \
31814- "1: rep; movsb\n" \
31815+ "1: rep; "prefix"movsb\n" \
31816 "2:\n" \
31817+ restore \
31818 ".section .fixup,\"ax\"\n" \
31819 "5: addl %3,%0\n" \
31820 " jmp 2b\n" \
31821@@ -538,14 +650,14 @@ do { \
31822 " negl %0\n" \
31823 " andl $7,%0\n" \
31824 " subl %0,%3\n" \
31825- "4: rep; movsb\n" \
31826+ "4: rep; "__copyuser_seg"movsb\n" \
31827 " movl %3,%0\n" \
31828 " shrl $2,%0\n" \
31829 " andl $3,%3\n" \
31830 " .align 2,0x90\n" \
31831- "0: rep; movsl\n" \
31832+ "0: rep; "__copyuser_seg"movsl\n" \
31833 " movl %3,%0\n" \
31834- "1: rep; movsb\n" \
31835+ "1: rep; "__copyuser_seg"movsb\n" \
31836 "2:\n" \
31837 ".section .fixup,\"ax\"\n" \
31838 "5: addl %3,%0\n" \
31839@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31840 {
31841 stac();
31842 if (movsl_is_ok(to, from, n))
31843- __copy_user(to, from, n);
31844+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31845 else
31846- n = __copy_user_intel(to, from, n);
31847+ n = __generic_copy_to_user_intel(to, from, n);
31848 clac();
31849 return n;
31850 }
31851@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31852 {
31853 stac();
31854 if (movsl_is_ok(to, from, n))
31855- __copy_user(to, from, n);
31856+ __copy_user(to, from, n, __copyuser_seg, "", "");
31857 else
31858- n = __copy_user_intel((void __user *)to,
31859- (const void *)from, n);
31860+ n = __generic_copy_from_user_intel(to, from, n);
31861 clac();
31862 return n;
31863 }
31864@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31865 if (n > 64 && cpu_has_xmm2)
31866 n = __copy_user_intel_nocache(to, from, n);
31867 else
31868- __copy_user(to, from, n);
31869+ __copy_user(to, from, n, __copyuser_seg, "", "");
31870 #else
31871- __copy_user(to, from, n);
31872+ __copy_user(to, from, n, __copyuser_seg, "", "");
31873 #endif
31874 clac();
31875 return n;
31876 }
31877 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31878
31879-/**
31880- * copy_to_user: - Copy a block of data into user space.
31881- * @to: Destination address, in user space.
31882- * @from: Source address, in kernel space.
31883- * @n: Number of bytes to copy.
31884- *
31885- * Context: User context only. This function may sleep.
31886- *
31887- * Copy data from kernel space to user space.
31888- *
31889- * Returns number of bytes that could not be copied.
31890- * On success, this will be zero.
31891- */
31892-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31893+#ifdef CONFIG_PAX_MEMORY_UDEREF
31894+void __set_fs(mm_segment_t x)
31895 {
31896- if (access_ok(VERIFY_WRITE, to, n))
31897- n = __copy_to_user(to, from, n);
31898- return n;
31899+ switch (x.seg) {
31900+ case 0:
31901+ loadsegment(gs, 0);
31902+ break;
31903+ case TASK_SIZE_MAX:
31904+ loadsegment(gs, __USER_DS);
31905+ break;
31906+ case -1UL:
31907+ loadsegment(gs, __KERNEL_DS);
31908+ break;
31909+ default:
31910+ BUG();
31911+ }
31912 }
31913-EXPORT_SYMBOL(_copy_to_user);
31914+EXPORT_SYMBOL(__set_fs);
31915
31916-/**
31917- * copy_from_user: - Copy a block of data from user space.
31918- * @to: Destination address, in kernel space.
31919- * @from: Source address, in user space.
31920- * @n: Number of bytes to copy.
31921- *
31922- * Context: User context only. This function may sleep.
31923- *
31924- * Copy data from user space to kernel space.
31925- *
31926- * Returns number of bytes that could not be copied.
31927- * On success, this will be zero.
31928- *
31929- * If some data could not be copied, this function will pad the copied
31930- * data to the requested size using zero bytes.
31931- */
31932-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31933+void set_fs(mm_segment_t x)
31934 {
31935- if (access_ok(VERIFY_READ, from, n))
31936- n = __copy_from_user(to, from, n);
31937- else
31938- memset(to, 0, n);
31939- return n;
31940+ current_thread_info()->addr_limit = x;
31941+ __set_fs(x);
31942 }
31943-EXPORT_SYMBOL(_copy_from_user);
31944+EXPORT_SYMBOL(set_fs);
31945+#endif
31946diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31947index 0a42327..7a82465 100644
31948--- a/arch/x86/lib/usercopy_64.c
31949+++ b/arch/x86/lib/usercopy_64.c
31950@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31951 might_fault();
31952 /* no memory constraint because it doesn't change any memory gcc knows
31953 about */
31954+ pax_open_userland();
31955 stac();
31956 asm volatile(
31957 " testq %[size8],%[size8]\n"
31958@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31959 _ASM_EXTABLE(0b,3b)
31960 _ASM_EXTABLE(1b,2b)
31961 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31962- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31963+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31964 [zero] "r" (0UL), [eight] "r" (8UL));
31965 clac();
31966+ pax_close_userland();
31967 return size;
31968 }
31969 EXPORT_SYMBOL(__clear_user);
31970@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31971 }
31972 EXPORT_SYMBOL(clear_user);
31973
31974-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31975+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31976 {
31977- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31978- return copy_user_generic((__force void *)to, (__force void *)from, len);
31979- }
31980- return len;
31981+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31982+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31983+ return len;
31984 }
31985 EXPORT_SYMBOL(copy_in_user);
31986
31987@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31988 * it is not necessary to optimize tail handling.
31989 */
31990 __visible unsigned long
31991-copy_user_handle_tail(char *to, char *from, unsigned len)
31992+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31993 {
31994+ clac();
31995+ pax_close_userland();
31996 for (; len; --len, to++) {
31997 char c;
31998
31999@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
32000 if (__put_user_nocheck(c, to, sizeof(char)))
32001 break;
32002 }
32003- clac();
32004
32005 /* If the destination is a kernel buffer, we always clear the end */
32006- if (!__addr_ok(to))
32007+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
32008 memset(to, 0, len);
32009 return len;
32010 }
32011diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
32012index a482d10..1a6edb5 100644
32013--- a/arch/x86/mm/Makefile
32014+++ b/arch/x86/mm/Makefile
32015@@ -33,3 +33,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
32016 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
32017
32018 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
32019+
32020+quote:="
32021+obj-$(CONFIG_X86_64) += uderef_64.o
32022+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) -fcall-saved-rax
32023diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
32024index 903ec1e..c4166b2 100644
32025--- a/arch/x86/mm/extable.c
32026+++ b/arch/x86/mm/extable.c
32027@@ -6,12 +6,24 @@
32028 static inline unsigned long
32029 ex_insn_addr(const struct exception_table_entry *x)
32030 {
32031- return (unsigned long)&x->insn + x->insn;
32032+ unsigned long reloc = 0;
32033+
32034+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32035+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32036+#endif
32037+
32038+ return (unsigned long)&x->insn + x->insn + reloc;
32039 }
32040 static inline unsigned long
32041 ex_fixup_addr(const struct exception_table_entry *x)
32042 {
32043- return (unsigned long)&x->fixup + x->fixup;
32044+ unsigned long reloc = 0;
32045+
32046+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32047+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32048+#endif
32049+
32050+ return (unsigned long)&x->fixup + x->fixup + reloc;
32051 }
32052
32053 int fixup_exception(struct pt_regs *regs)
32054@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
32055 unsigned long new_ip;
32056
32057 #ifdef CONFIG_PNPBIOS
32058- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
32059+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
32060 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
32061 extern u32 pnp_bios_is_utter_crap;
32062 pnp_bios_is_utter_crap = 1;
32063@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
32064 i += 4;
32065 p->fixup -= i;
32066 i += 4;
32067+
32068+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32069+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
32070+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32071+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32072+#endif
32073+
32074 }
32075 }
32076
32077diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
32078index 181c53b..d336596 100644
32079--- a/arch/x86/mm/fault.c
32080+++ b/arch/x86/mm/fault.c
32081@@ -13,12 +13,19 @@
32082 #include <linux/hugetlb.h> /* hstate_index_to_shift */
32083 #include <linux/prefetch.h> /* prefetchw */
32084 #include <linux/context_tracking.h> /* exception_enter(), ... */
32085+#include <linux/unistd.h>
32086+#include <linux/compiler.h>
32087
32088 #include <asm/traps.h> /* dotraplinkage, ... */
32089 #include <asm/pgalloc.h> /* pgd_*(), ... */
32090 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
32091 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
32092 #include <asm/vsyscall.h> /* emulate_vsyscall */
32093+#include <asm/tlbflush.h>
32094+
32095+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32096+#include <asm/stacktrace.h>
32097+#endif
32098
32099 #define CREATE_TRACE_POINTS
32100 #include <asm/trace/exceptions.h>
32101@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
32102 return !instr_lo || (instr_lo>>1) == 1;
32103 case 0x00:
32104 /* Prefetch instruction is 0x0F0D or 0x0F18 */
32105- if (probe_kernel_address(instr, opcode))
32106+ if (user_mode(regs)) {
32107+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
32108+ return 0;
32109+ } else if (probe_kernel_address(instr, opcode))
32110 return 0;
32111
32112 *prefetch = (instr_lo == 0xF) &&
32113@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
32114 while (instr < max_instr) {
32115 unsigned char opcode;
32116
32117- if (probe_kernel_address(instr, opcode))
32118+ if (user_mode(regs)) {
32119+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
32120+ break;
32121+ } else if (probe_kernel_address(instr, opcode))
32122 break;
32123
32124 instr++;
32125@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
32126 force_sig_info(si_signo, &info, tsk);
32127 }
32128
32129+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32130+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
32131+#endif
32132+
32133+#ifdef CONFIG_PAX_EMUTRAMP
32134+static int pax_handle_fetch_fault(struct pt_regs *regs);
32135+#endif
32136+
32137+#ifdef CONFIG_PAX_PAGEEXEC
32138+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
32139+{
32140+ pgd_t *pgd;
32141+ pud_t *pud;
32142+ pmd_t *pmd;
32143+
32144+ pgd = pgd_offset(mm, address);
32145+ if (!pgd_present(*pgd))
32146+ return NULL;
32147+ pud = pud_offset(pgd, address);
32148+ if (!pud_present(*pud))
32149+ return NULL;
32150+ pmd = pmd_offset(pud, address);
32151+ if (!pmd_present(*pmd))
32152+ return NULL;
32153+ return pmd;
32154+}
32155+#endif
32156+
32157 DEFINE_SPINLOCK(pgd_lock);
32158 LIST_HEAD(pgd_list);
32159
32160@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
32161 for (address = VMALLOC_START & PMD_MASK;
32162 address >= TASK_SIZE && address < FIXADDR_TOP;
32163 address += PMD_SIZE) {
32164+
32165+#ifdef CONFIG_PAX_PER_CPU_PGD
32166+ unsigned long cpu;
32167+#else
32168 struct page *page;
32169+#endif
32170
32171 spin_lock(&pgd_lock);
32172+
32173+#ifdef CONFIG_PAX_PER_CPU_PGD
32174+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32175+ pgd_t *pgd = get_cpu_pgd(cpu, user);
32176+ pmd_t *ret;
32177+
32178+ ret = vmalloc_sync_one(pgd, address);
32179+ if (!ret)
32180+ break;
32181+ pgd = get_cpu_pgd(cpu, kernel);
32182+#else
32183 list_for_each_entry(page, &pgd_list, lru) {
32184+ pgd_t *pgd;
32185 spinlock_t *pgt_lock;
32186 pmd_t *ret;
32187
32188@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
32189 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32190
32191 spin_lock(pgt_lock);
32192- ret = vmalloc_sync_one(page_address(page), address);
32193+ pgd = page_address(page);
32194+#endif
32195+
32196+ ret = vmalloc_sync_one(pgd, address);
32197+
32198+#ifndef CONFIG_PAX_PER_CPU_PGD
32199 spin_unlock(pgt_lock);
32200+#endif
32201
32202 if (!ret)
32203 break;
32204@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
32205 * an interrupt in the middle of a task switch..
32206 */
32207 pgd_paddr = read_cr3();
32208+
32209+#ifdef CONFIG_PAX_PER_CPU_PGD
32210+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32211+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32212+#endif
32213+
32214 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32215 if (!pmd_k)
32216 return -1;
32217@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32218 * happen within a race in page table update. In the later
32219 * case just flush:
32220 */
32221- pgd = pgd_offset(current->active_mm, address);
32222+
32223 pgd_ref = pgd_offset_k(address);
32224 if (pgd_none(*pgd_ref))
32225 return -1;
32226
32227+#ifdef CONFIG_PAX_PER_CPU_PGD
32228+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32229+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32230+ if (pgd_none(*pgd)) {
32231+ set_pgd(pgd, *pgd_ref);
32232+ arch_flush_lazy_mmu_mode();
32233+ } else {
32234+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32235+ }
32236+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32237+#else
32238+ pgd = pgd_offset(current->active_mm, address);
32239+#endif
32240+
32241 if (pgd_none(*pgd)) {
32242 set_pgd(pgd, *pgd_ref);
32243 arch_flush_lazy_mmu_mode();
32244@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32245 static int is_errata100(struct pt_regs *regs, unsigned long address)
32246 {
32247 #ifdef CONFIG_X86_64
32248- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32249+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32250 return 1;
32251 #endif
32252 return 0;
32253@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32254 }
32255
32256 static const char nx_warning[] = KERN_CRIT
32257-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32258+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32259 static const char smep_warning[] = KERN_CRIT
32260-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32261+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32262
32263 static void
32264 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32265@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32266 if (!oops_may_print())
32267 return;
32268
32269- if (error_code & PF_INSTR) {
32270+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32271 unsigned int level;
32272 pgd_t *pgd;
32273 pte_t *pte;
32274@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32275 pte = lookup_address_in_pgd(pgd, address, &level);
32276
32277 if (pte && pte_present(*pte) && !pte_exec(*pte))
32278- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32279+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32280 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32281 (pgd_flags(*pgd) & _PAGE_USER) &&
32282 (__read_cr4() & X86_CR4_SMEP))
32283- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32284+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32285 }
32286
32287+#ifdef CONFIG_PAX_KERNEXEC
32288+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32289+ if (current->signal->curr_ip)
32290+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32291+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32292+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32293+ else
32294+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32295+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32296+ }
32297+#endif
32298+
32299 printk(KERN_ALERT "BUG: unable to handle kernel ");
32300 if (address < PAGE_SIZE)
32301 printk(KERN_CONT "NULL pointer dereference");
32302@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32303 return;
32304 }
32305 #endif
32306+
32307+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32308+ if (pax_is_fetch_fault(regs, error_code, address)) {
32309+
32310+#ifdef CONFIG_PAX_EMUTRAMP
32311+ switch (pax_handle_fetch_fault(regs)) {
32312+ case 2:
32313+ return;
32314+ }
32315+#endif
32316+
32317+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32318+ do_group_exit(SIGKILL);
32319+ }
32320+#endif
32321+
32322 /* Kernel addresses are always protection faults: */
32323 if (address >= TASK_SIZE)
32324 error_code |= PF_PROT;
32325@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32326 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32327 printk(KERN_ERR
32328 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32329- tsk->comm, tsk->pid, address);
32330+ tsk->comm, task_pid_nr(tsk), address);
32331 code = BUS_MCEERR_AR;
32332 }
32333 #endif
32334@@ -916,6 +1028,107 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32335 return 1;
32336 }
32337
32338+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32339+static inline unsigned long get_limit(unsigned long segment)
32340+{
32341+ unsigned long __limit;
32342+
32343+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
32344+ return __limit + 1;
32345+}
32346+
32347+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32348+{
32349+ pte_t *pte;
32350+ pmd_t *pmd;
32351+ spinlock_t *ptl;
32352+ unsigned char pte_mask;
32353+
32354+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32355+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32356+ return 0;
32357+
32358+ /* PaX: it's our fault, let's handle it if we can */
32359+
32360+ /* PaX: take a look at read faults before acquiring any locks */
32361+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32362+ /* instruction fetch attempt from a protected page in user mode */
32363+ up_read(&mm->mmap_sem);
32364+
32365+#ifdef CONFIG_PAX_EMUTRAMP
32366+ switch (pax_handle_fetch_fault(regs)) {
32367+ case 2:
32368+ return 1;
32369+ }
32370+#endif
32371+
32372+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32373+ do_group_exit(SIGKILL);
32374+ }
32375+
32376+ pmd = pax_get_pmd(mm, address);
32377+ if (unlikely(!pmd))
32378+ return 0;
32379+
32380+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32381+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32382+ pte_unmap_unlock(pte, ptl);
32383+ return 0;
32384+ }
32385+
32386+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32387+ /* write attempt to a protected page in user mode */
32388+ pte_unmap_unlock(pte, ptl);
32389+ return 0;
32390+ }
32391+
32392+#ifdef CONFIG_SMP
32393+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
32394+#else
32395+ if (likely(address > get_limit(regs->cs)))
32396+#endif
32397+ {
32398+ set_pte(pte, pte_mkread(*pte));
32399+ __flush_tlb_one(address);
32400+ pte_unmap_unlock(pte, ptl);
32401+ up_read(&mm->mmap_sem);
32402+ return 1;
32403+ }
32404+
32405+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32406+
32407+ /*
32408+ * PaX: fill DTLB with user rights and retry
32409+ */
32410+ __asm__ __volatile__ (
32411+ "orb %2,(%1)\n"
32412+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32413+/*
32414+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32415+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32416+ * page fault when examined during a TLB load attempt. this is true not only
32417+ * for PTEs holding a non-present entry but also present entries that will
32418+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32419+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32420+ * for our target pages since their PTEs are simply not in the TLBs at all.
32421+
32422+ * the best thing in omitting it is that we gain around 15-20% speed in the
32423+ * fast path of the page fault handler and can get rid of tracing since we
32424+ * can no longer flush unintended entries.
32425+ */
32426+ "invlpg (%0)\n"
32427+#endif
32428+ __copyuser_seg"testb $0,(%0)\n"
32429+ "xorb %3,(%1)\n"
32430+ :
32431+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32432+ : "memory", "cc");
32433+ pte_unmap_unlock(pte, ptl);
32434+ up_read(&mm->mmap_sem);
32435+ return 1;
32436+}
32437+#endif
32438+
32439 /*
32440 * Handle a spurious fault caused by a stale TLB entry.
32441 *
32442@@ -1001,6 +1214,9 @@ int show_unhandled_signals = 1;
32443 static inline int
32444 access_error(unsigned long error_code, struct vm_area_struct *vma)
32445 {
32446+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32447+ return 1;
32448+
32449 if (error_code & PF_WRITE) {
32450 /* write, present and write, not present: */
32451 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32452@@ -1063,6 +1279,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32453 tsk = current;
32454 mm = tsk->mm;
32455
32456+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32457+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32458+ if (!search_exception_tables(regs->ip)) {
32459+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32460+ bad_area_nosemaphore(regs, error_code, address);
32461+ return;
32462+ }
32463+ if (address < pax_user_shadow_base) {
32464+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32465+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32466+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32467+ } else
32468+ address -= pax_user_shadow_base;
32469+ }
32470+#endif
32471+
32472 /*
32473 * Detect and handle instructions that would cause a page fault for
32474 * both a tracked kernel page and a userspace page.
32475@@ -1187,6 +1419,11 @@ retry:
32476 might_sleep();
32477 }
32478
32479+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32480+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32481+ return;
32482+#endif
32483+
32484 vma = find_vma(mm, address);
32485 if (unlikely(!vma)) {
32486 bad_area(regs, error_code, address);
32487@@ -1198,18 +1435,24 @@ retry:
32488 bad_area(regs, error_code, address);
32489 return;
32490 }
32491- if (error_code & PF_USER) {
32492- /*
32493- * Accessing the stack below %sp is always a bug.
32494- * The large cushion allows instructions like enter
32495- * and pusha to work. ("enter $65535, $31" pushes
32496- * 32 pointers and then decrements %sp by 65535.)
32497- */
32498- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32499- bad_area(regs, error_code, address);
32500- return;
32501- }
32502+ /*
32503+ * Accessing the stack below %sp is always a bug.
32504+ * The large cushion allows instructions like enter
32505+ * and pusha to work. ("enter $65535, $31" pushes
32506+ * 32 pointers and then decrements %sp by 65535.)
32507+ */
32508+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32509+ bad_area(regs, error_code, address);
32510+ return;
32511 }
32512+
32513+#ifdef CONFIG_PAX_SEGMEXEC
32514+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32515+ bad_area(regs, error_code, address);
32516+ return;
32517+ }
32518+#endif
32519+
32520 if (unlikely(expand_stack(vma, address))) {
32521 bad_area(regs, error_code, address);
32522 return;
32523@@ -1329,3 +1572,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32524 }
32525 NOKPROBE_SYMBOL(trace_do_page_fault);
32526 #endif /* CONFIG_TRACING */
32527+
32528+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32529+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32530+{
32531+ struct mm_struct *mm = current->mm;
32532+ unsigned long ip = regs->ip;
32533+
32534+ if (v8086_mode(regs))
32535+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32536+
32537+#ifdef CONFIG_PAX_PAGEEXEC
32538+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32539+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32540+ return true;
32541+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32542+ return true;
32543+ return false;
32544+ }
32545+#endif
32546+
32547+#ifdef CONFIG_PAX_SEGMEXEC
32548+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32549+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32550+ return true;
32551+ return false;
32552+ }
32553+#endif
32554+
32555+ return false;
32556+}
32557+#endif
32558+
32559+#ifdef CONFIG_PAX_EMUTRAMP
32560+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32561+{
32562+ int err;
32563+
32564+ do { /* PaX: libffi trampoline emulation */
32565+ unsigned char mov, jmp;
32566+ unsigned int addr1, addr2;
32567+
32568+#ifdef CONFIG_X86_64
32569+ if ((regs->ip + 9) >> 32)
32570+ break;
32571+#endif
32572+
32573+ err = get_user(mov, (unsigned char __user *)regs->ip);
32574+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32575+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32576+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32577+
32578+ if (err)
32579+ break;
32580+
32581+ if (mov == 0xB8 && jmp == 0xE9) {
32582+ regs->ax = addr1;
32583+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32584+ return 2;
32585+ }
32586+ } while (0);
32587+
32588+ do { /* PaX: gcc trampoline emulation #1 */
32589+ unsigned char mov1, mov2;
32590+ unsigned short jmp;
32591+ unsigned int addr1, addr2;
32592+
32593+#ifdef CONFIG_X86_64
32594+ if ((regs->ip + 11) >> 32)
32595+ break;
32596+#endif
32597+
32598+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32599+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32600+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32601+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32602+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32603+
32604+ if (err)
32605+ break;
32606+
32607+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32608+ regs->cx = addr1;
32609+ regs->ax = addr2;
32610+ regs->ip = addr2;
32611+ return 2;
32612+ }
32613+ } while (0);
32614+
32615+ do { /* PaX: gcc trampoline emulation #2 */
32616+ unsigned char mov, jmp;
32617+ unsigned int addr1, addr2;
32618+
32619+#ifdef CONFIG_X86_64
32620+ if ((regs->ip + 9) >> 32)
32621+ break;
32622+#endif
32623+
32624+ err = get_user(mov, (unsigned char __user *)regs->ip);
32625+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32626+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32627+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32628+
32629+ if (err)
32630+ break;
32631+
32632+ if (mov == 0xB9 && jmp == 0xE9) {
32633+ regs->cx = addr1;
32634+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32635+ return 2;
32636+ }
32637+ } while (0);
32638+
32639+ return 1; /* PaX in action */
32640+}
32641+
32642+#ifdef CONFIG_X86_64
32643+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32644+{
32645+ int err;
32646+
32647+ do { /* PaX: libffi trampoline emulation */
32648+ unsigned short mov1, mov2, jmp1;
32649+ unsigned char stcclc, jmp2;
32650+ unsigned long addr1, addr2;
32651+
32652+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32653+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32654+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32655+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32656+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32657+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32658+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32659+
32660+ if (err)
32661+ break;
32662+
32663+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32664+ regs->r11 = addr1;
32665+ regs->r10 = addr2;
32666+ if (stcclc == 0xF8)
32667+ regs->flags &= ~X86_EFLAGS_CF;
32668+ else
32669+ regs->flags |= X86_EFLAGS_CF;
32670+ regs->ip = addr1;
32671+ return 2;
32672+ }
32673+ } while (0);
32674+
32675+ do { /* PaX: gcc trampoline emulation #1 */
32676+ unsigned short mov1, mov2, jmp1;
32677+ unsigned char jmp2;
32678+ unsigned int addr1;
32679+ unsigned long addr2;
32680+
32681+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32682+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32683+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32684+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32685+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32686+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32687+
32688+ if (err)
32689+ break;
32690+
32691+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32692+ regs->r11 = addr1;
32693+ regs->r10 = addr2;
32694+ regs->ip = addr1;
32695+ return 2;
32696+ }
32697+ } while (0);
32698+
32699+ do { /* PaX: gcc trampoline emulation #2 */
32700+ unsigned short mov1, mov2, jmp1;
32701+ unsigned char jmp2;
32702+ unsigned long addr1, addr2;
32703+
32704+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32705+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32706+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32707+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32708+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32709+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32710+
32711+ if (err)
32712+ break;
32713+
32714+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32715+ regs->r11 = addr1;
32716+ regs->r10 = addr2;
32717+ regs->ip = addr1;
32718+ return 2;
32719+ }
32720+ } while (0);
32721+
32722+ return 1; /* PaX in action */
32723+}
32724+#endif
32725+
32726+/*
32727+ * PaX: decide what to do with offenders (regs->ip = fault address)
32728+ *
32729+ * returns 1 when task should be killed
32730+ * 2 when gcc trampoline was detected
32731+ */
32732+static int pax_handle_fetch_fault(struct pt_regs *regs)
32733+{
32734+ if (v8086_mode(regs))
32735+ return 1;
32736+
32737+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32738+ return 1;
32739+
32740+#ifdef CONFIG_X86_32
32741+ return pax_handle_fetch_fault_32(regs);
32742+#else
32743+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32744+ return pax_handle_fetch_fault_32(regs);
32745+ else
32746+ return pax_handle_fetch_fault_64(regs);
32747+#endif
32748+}
32749+#endif
32750+
32751+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32752+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32753+{
32754+ long i;
32755+
32756+ printk(KERN_ERR "PAX: bytes at PC: ");
32757+ for (i = 0; i < 20; i++) {
32758+ unsigned char c;
32759+ if (get_user(c, (unsigned char __force_user *)pc+i))
32760+ printk(KERN_CONT "?? ");
32761+ else
32762+ printk(KERN_CONT "%02x ", c);
32763+ }
32764+ printk("\n");
32765+
32766+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32767+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32768+ unsigned long c;
32769+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32770+#ifdef CONFIG_X86_32
32771+ printk(KERN_CONT "???????? ");
32772+#else
32773+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32774+ printk(KERN_CONT "???????? ???????? ");
32775+ else
32776+ printk(KERN_CONT "???????????????? ");
32777+#endif
32778+ } else {
32779+#ifdef CONFIG_X86_64
32780+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32781+ printk(KERN_CONT "%08x ", (unsigned int)c);
32782+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32783+ } else
32784+#endif
32785+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32786+ }
32787+ }
32788+ printk("\n");
32789+}
32790+#endif
32791+
32792+/**
32793+ * probe_kernel_write(): safely attempt to write to a location
32794+ * @dst: address to write to
32795+ * @src: pointer to the data that shall be written
32796+ * @size: size of the data chunk
32797+ *
32798+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32799+ * happens, handle that and return -EFAULT.
32800+ */
32801+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32802+{
32803+ long ret;
32804+ mm_segment_t old_fs = get_fs();
32805+
32806+ set_fs(KERNEL_DS);
32807+ pagefault_disable();
32808+ pax_open_kernel();
32809+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32810+ pax_close_kernel();
32811+ pagefault_enable();
32812+ set_fs(old_fs);
32813+
32814+ return ret ? -EFAULT : 0;
32815+}
32816diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32817index 81bf3d2..7ef25c2 100644
32818--- a/arch/x86/mm/gup.c
32819+++ b/arch/x86/mm/gup.c
32820@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32821 addr = start;
32822 len = (unsigned long) nr_pages << PAGE_SHIFT;
32823 end = start + len;
32824- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32825+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32826 (void __user *)start, len)))
32827 return 0;
32828
32829@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32830 goto slow_irqon;
32831 #endif
32832
32833+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32834+ (void __user *)start, len)))
32835+ return 0;
32836+
32837 /*
32838 * XXX: batch / limit 'nr', to avoid large irq off latency
32839 * needs some instrumenting to determine the common sizes used by
32840diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32841index 4500142..53a363c 100644
32842--- a/arch/x86/mm/highmem_32.c
32843+++ b/arch/x86/mm/highmem_32.c
32844@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32845 idx = type + KM_TYPE_NR*smp_processor_id();
32846 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32847 BUG_ON(!pte_none(*(kmap_pte-idx)));
32848+
32849+ pax_open_kernel();
32850 set_pte(kmap_pte-idx, mk_pte(page, prot));
32851+ pax_close_kernel();
32852+
32853 arch_flush_lazy_mmu_mode();
32854
32855 return (void *)vaddr;
32856diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32857index 42982b2..7168fc3 100644
32858--- a/arch/x86/mm/hugetlbpage.c
32859+++ b/arch/x86/mm/hugetlbpage.c
32860@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32861 #ifdef CONFIG_HUGETLB_PAGE
32862 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32863 unsigned long addr, unsigned long len,
32864- unsigned long pgoff, unsigned long flags)
32865+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32866 {
32867 struct hstate *h = hstate_file(file);
32868 struct vm_unmapped_area_info info;
32869-
32870+
32871 info.flags = 0;
32872 info.length = len;
32873 info.low_limit = current->mm->mmap_legacy_base;
32874 info.high_limit = TASK_SIZE;
32875 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32876 info.align_offset = 0;
32877+ info.threadstack_offset = offset;
32878 return vm_unmapped_area(&info);
32879 }
32880
32881 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32882 unsigned long addr0, unsigned long len,
32883- unsigned long pgoff, unsigned long flags)
32884+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32885 {
32886 struct hstate *h = hstate_file(file);
32887 struct vm_unmapped_area_info info;
32888@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32889 info.high_limit = current->mm->mmap_base;
32890 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32891 info.align_offset = 0;
32892+ info.threadstack_offset = offset;
32893 addr = vm_unmapped_area(&info);
32894
32895 /*
32896@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32897 VM_BUG_ON(addr != -ENOMEM);
32898 info.flags = 0;
32899 info.low_limit = TASK_UNMAPPED_BASE;
32900+
32901+#ifdef CONFIG_PAX_RANDMMAP
32902+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32903+ info.low_limit += current->mm->delta_mmap;
32904+#endif
32905+
32906 info.high_limit = TASK_SIZE;
32907 addr = vm_unmapped_area(&info);
32908 }
32909@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32910 struct hstate *h = hstate_file(file);
32911 struct mm_struct *mm = current->mm;
32912 struct vm_area_struct *vma;
32913+ unsigned long pax_task_size = TASK_SIZE;
32914+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32915
32916 if (len & ~huge_page_mask(h))
32917 return -EINVAL;
32918- if (len > TASK_SIZE)
32919+
32920+#ifdef CONFIG_PAX_SEGMEXEC
32921+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32922+ pax_task_size = SEGMEXEC_TASK_SIZE;
32923+#endif
32924+
32925+ pax_task_size -= PAGE_SIZE;
32926+
32927+ if (len > pax_task_size)
32928 return -ENOMEM;
32929
32930 if (flags & MAP_FIXED) {
32931@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32932 return addr;
32933 }
32934
32935+#ifdef CONFIG_PAX_RANDMMAP
32936+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32937+#endif
32938+
32939 if (addr) {
32940 addr = ALIGN(addr, huge_page_size(h));
32941 vma = find_vma(mm, addr);
32942- if (TASK_SIZE - len >= addr &&
32943- (!vma || addr + len <= vma->vm_start))
32944+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32945 return addr;
32946 }
32947 if (mm->get_unmapped_area == arch_get_unmapped_area)
32948 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32949- pgoff, flags);
32950+ pgoff, flags, offset);
32951 else
32952 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32953- pgoff, flags);
32954+ pgoff, flags, offset);
32955 }
32956 #endif /* CONFIG_HUGETLB_PAGE */
32957
32958diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32959index 1d55318..d58fd6a 100644
32960--- a/arch/x86/mm/init.c
32961+++ b/arch/x86/mm/init.c
32962@@ -4,6 +4,7 @@
32963 #include <linux/swap.h>
32964 #include <linux/memblock.h>
32965 #include <linux/bootmem.h> /* for max_low_pfn */
32966+#include <linux/tboot.h>
32967
32968 #include <asm/cacheflush.h>
32969 #include <asm/e820.h>
32970@@ -17,6 +18,8 @@
32971 #include <asm/proto.h>
32972 #include <asm/dma.h> /* for MAX_DMA_PFN */
32973 #include <asm/microcode.h>
32974+#include <asm/desc.h>
32975+#include <asm/bios_ebda.h>
32976
32977 /*
32978 * We need to define the tracepoints somewhere, and tlb.c
32979@@ -615,7 +618,18 @@ void __init init_mem_mapping(void)
32980 early_ioremap_page_table_range_init();
32981 #endif
32982
32983+#ifdef CONFIG_PAX_PER_CPU_PGD
32984+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32985+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32986+ KERNEL_PGD_PTRS);
32987+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32988+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32989+ KERNEL_PGD_PTRS);
32990+ load_cr3(get_cpu_pgd(0, kernel));
32991+#else
32992 load_cr3(swapper_pg_dir);
32993+#endif
32994+
32995 __flush_tlb_all();
32996
32997 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32998@@ -631,10 +645,40 @@ void __init init_mem_mapping(void)
32999 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
33000 * mmio resources as well as potential bios/acpi data regions.
33001 */
33002+
33003+#ifdef CONFIG_GRKERNSEC_KMEM
33004+static unsigned int ebda_start __read_only;
33005+static unsigned int ebda_end __read_only;
33006+#endif
33007+
33008 int devmem_is_allowed(unsigned long pagenr)
33009 {
33010- if (pagenr < 256)
33011+#ifdef CONFIG_GRKERNSEC_KMEM
33012+ /* allow BDA */
33013+ if (!pagenr)
33014 return 1;
33015+ /* allow EBDA */
33016+ if (pagenr >= ebda_start && pagenr < ebda_end)
33017+ return 1;
33018+ /* if tboot is in use, allow access to its hardcoded serial log range */
33019+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
33020+ return 1;
33021+#else
33022+ if (!pagenr)
33023+ return 1;
33024+#ifdef CONFIG_VM86
33025+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
33026+ return 1;
33027+#endif
33028+#endif
33029+
33030+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
33031+ return 1;
33032+#ifdef CONFIG_GRKERNSEC_KMEM
33033+ /* throw out everything else below 1MB */
33034+ if (pagenr <= 256)
33035+ return 0;
33036+#endif
33037 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
33038 return 0;
33039 if (!page_is_ram(pagenr))
33040@@ -680,8 +724,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
33041 #endif
33042 }
33043
33044+#ifdef CONFIG_GRKERNSEC_KMEM
33045+static inline void gr_init_ebda(void)
33046+{
33047+ unsigned int ebda_addr;
33048+ unsigned int ebda_size = 0;
33049+
33050+ ebda_addr = get_bios_ebda();
33051+ if (ebda_addr) {
33052+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
33053+ ebda_size <<= 10;
33054+ }
33055+ if (ebda_addr && ebda_size) {
33056+ ebda_start = ebda_addr >> PAGE_SHIFT;
33057+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
33058+ } else {
33059+ ebda_start = 0x9f000 >> PAGE_SHIFT;
33060+ ebda_end = 0xa0000 >> PAGE_SHIFT;
33061+ }
33062+}
33063+#else
33064+static inline void gr_init_ebda(void) { }
33065+#endif
33066+
33067 void free_initmem(void)
33068 {
33069+#ifdef CONFIG_PAX_KERNEXEC
33070+#ifdef CONFIG_X86_32
33071+ /* PaX: limit KERNEL_CS to actual size */
33072+ unsigned long addr, limit;
33073+ struct desc_struct d;
33074+ int cpu;
33075+#else
33076+ pgd_t *pgd;
33077+ pud_t *pud;
33078+ pmd_t *pmd;
33079+ unsigned long addr, end;
33080+#endif
33081+#endif
33082+
33083+ gr_init_ebda();
33084+
33085+#ifdef CONFIG_PAX_KERNEXEC
33086+#ifdef CONFIG_X86_32
33087+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
33088+ limit = (limit - 1UL) >> PAGE_SHIFT;
33089+
33090+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
33091+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
33092+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
33093+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
33094+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
33095+ }
33096+
33097+ /* PaX: make KERNEL_CS read-only */
33098+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
33099+ if (!paravirt_enabled())
33100+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
33101+/*
33102+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
33103+ pgd = pgd_offset_k(addr);
33104+ pud = pud_offset(pgd, addr);
33105+ pmd = pmd_offset(pud, addr);
33106+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33107+ }
33108+*/
33109+#ifdef CONFIG_X86_PAE
33110+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
33111+/*
33112+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
33113+ pgd = pgd_offset_k(addr);
33114+ pud = pud_offset(pgd, addr);
33115+ pmd = pmd_offset(pud, addr);
33116+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
33117+ }
33118+*/
33119+#endif
33120+
33121+#ifdef CONFIG_MODULES
33122+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
33123+#endif
33124+
33125+#else
33126+ /* PaX: make kernel code/rodata read-only, rest non-executable */
33127+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
33128+ pgd = pgd_offset_k(addr);
33129+ pud = pud_offset(pgd, addr);
33130+ pmd = pmd_offset(pud, addr);
33131+ if (!pmd_present(*pmd))
33132+ continue;
33133+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
33134+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33135+ else
33136+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
33137+ }
33138+
33139+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
33140+ end = addr + KERNEL_IMAGE_SIZE;
33141+ for (; addr < end; addr += PMD_SIZE) {
33142+ pgd = pgd_offset_k(addr);
33143+ pud = pud_offset(pgd, addr);
33144+ pmd = pmd_offset(pud, addr);
33145+ if (!pmd_present(*pmd))
33146+ continue;
33147+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
33148+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33149+ }
33150+#endif
33151+
33152+ flush_tlb_all();
33153+#endif
33154+
33155 free_init_pages("unused kernel",
33156 (unsigned long)(&__init_begin),
33157 (unsigned long)(&__init_end));
33158diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
33159index c8140e1..59257fc 100644
33160--- a/arch/x86/mm/init_32.c
33161+++ b/arch/x86/mm/init_32.c
33162@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
33163 bool __read_mostly __vmalloc_start_set = false;
33164
33165 /*
33166- * Creates a middle page table and puts a pointer to it in the
33167- * given global directory entry. This only returns the gd entry
33168- * in non-PAE compilation mode, since the middle layer is folded.
33169- */
33170-static pmd_t * __init one_md_table_init(pgd_t *pgd)
33171-{
33172- pud_t *pud;
33173- pmd_t *pmd_table;
33174-
33175-#ifdef CONFIG_X86_PAE
33176- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
33177- pmd_table = (pmd_t *)alloc_low_page();
33178- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
33179- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
33180- pud = pud_offset(pgd, 0);
33181- BUG_ON(pmd_table != pmd_offset(pud, 0));
33182-
33183- return pmd_table;
33184- }
33185-#endif
33186- pud = pud_offset(pgd, 0);
33187- pmd_table = pmd_offset(pud, 0);
33188-
33189- return pmd_table;
33190-}
33191-
33192-/*
33193 * Create a page table and place a pointer to it in a middle page
33194 * directory entry:
33195 */
33196@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
33197 pte_t *page_table = (pte_t *)alloc_low_page();
33198
33199 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33200+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33201+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33202+#else
33203 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33204+#endif
33205 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33206 }
33207
33208 return pte_offset_kernel(pmd, 0);
33209 }
33210
33211+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33212+{
33213+ pud_t *pud;
33214+ pmd_t *pmd_table;
33215+
33216+ pud = pud_offset(pgd, 0);
33217+ pmd_table = pmd_offset(pud, 0);
33218+
33219+ return pmd_table;
33220+}
33221+
33222 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33223 {
33224 int pgd_idx = pgd_index(vaddr);
33225@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33226 int pgd_idx, pmd_idx;
33227 unsigned long vaddr;
33228 pgd_t *pgd;
33229+ pud_t *pud;
33230 pmd_t *pmd;
33231 pte_t *pte = NULL;
33232 unsigned long count = page_table_range_init_count(start, end);
33233@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33234 pgd = pgd_base + pgd_idx;
33235
33236 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33237- pmd = one_md_table_init(pgd);
33238- pmd = pmd + pmd_index(vaddr);
33239+ pud = pud_offset(pgd, vaddr);
33240+ pmd = pmd_offset(pud, vaddr);
33241+
33242+#ifdef CONFIG_X86_PAE
33243+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33244+#endif
33245+
33246 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33247 pmd++, pmd_idx++) {
33248 pte = page_table_kmap_check(one_page_table_init(pmd),
33249@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33250 }
33251 }
33252
33253-static inline int is_kernel_text(unsigned long addr)
33254+static inline int is_kernel_text(unsigned long start, unsigned long end)
33255 {
33256- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33257- return 1;
33258- return 0;
33259+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33260+ end <= ktla_ktva((unsigned long)_stext)) &&
33261+ (start >= ktla_ktva((unsigned long)_einittext) ||
33262+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33263+
33264+#ifdef CONFIG_ACPI_SLEEP
33265+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33266+#endif
33267+
33268+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33269+ return 0;
33270+ return 1;
33271 }
33272
33273 /*
33274@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33275 unsigned long last_map_addr = end;
33276 unsigned long start_pfn, end_pfn;
33277 pgd_t *pgd_base = swapper_pg_dir;
33278- int pgd_idx, pmd_idx, pte_ofs;
33279+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33280 unsigned long pfn;
33281 pgd_t *pgd;
33282+ pud_t *pud;
33283 pmd_t *pmd;
33284 pte_t *pte;
33285 unsigned pages_2m, pages_4k;
33286@@ -291,8 +295,13 @@ repeat:
33287 pfn = start_pfn;
33288 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33289 pgd = pgd_base + pgd_idx;
33290- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33291- pmd = one_md_table_init(pgd);
33292+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33293+ pud = pud_offset(pgd, 0);
33294+ pmd = pmd_offset(pud, 0);
33295+
33296+#ifdef CONFIG_X86_PAE
33297+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33298+#endif
33299
33300 if (pfn >= end_pfn)
33301 continue;
33302@@ -304,14 +313,13 @@ repeat:
33303 #endif
33304 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33305 pmd++, pmd_idx++) {
33306- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33307+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33308
33309 /*
33310 * Map with big pages if possible, otherwise
33311 * create normal page tables:
33312 */
33313 if (use_pse) {
33314- unsigned int addr2;
33315 pgprot_t prot = PAGE_KERNEL_LARGE;
33316 /*
33317 * first pass will use the same initial
33318@@ -322,11 +330,7 @@ repeat:
33319 _PAGE_PSE);
33320
33321 pfn &= PMD_MASK >> PAGE_SHIFT;
33322- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33323- PAGE_OFFSET + PAGE_SIZE-1;
33324-
33325- if (is_kernel_text(addr) ||
33326- is_kernel_text(addr2))
33327+ if (is_kernel_text(address, address + PMD_SIZE))
33328 prot = PAGE_KERNEL_LARGE_EXEC;
33329
33330 pages_2m++;
33331@@ -343,7 +347,7 @@ repeat:
33332 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33333 pte += pte_ofs;
33334 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33335- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33336+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33337 pgprot_t prot = PAGE_KERNEL;
33338 /*
33339 * first pass will use the same initial
33340@@ -351,7 +355,7 @@ repeat:
33341 */
33342 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33343
33344- if (is_kernel_text(addr))
33345+ if (is_kernel_text(address, address + PAGE_SIZE))
33346 prot = PAGE_KERNEL_EXEC;
33347
33348 pages_4k++;
33349@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33350
33351 pud = pud_offset(pgd, va);
33352 pmd = pmd_offset(pud, va);
33353- if (!pmd_present(*pmd))
33354+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33355 break;
33356
33357 /* should not be large page here */
33358@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33359
33360 static void __init pagetable_init(void)
33361 {
33362- pgd_t *pgd_base = swapper_pg_dir;
33363-
33364- permanent_kmaps_init(pgd_base);
33365+ permanent_kmaps_init(swapper_pg_dir);
33366 }
33367
33368-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33369+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33370 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33371
33372 /* user-defined highmem size */
33373@@ -787,10 +789,10 @@ void __init mem_init(void)
33374 ((unsigned long)&__init_end -
33375 (unsigned long)&__init_begin) >> 10,
33376
33377- (unsigned long)&_etext, (unsigned long)&_edata,
33378- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33379+ (unsigned long)&_sdata, (unsigned long)&_edata,
33380+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33381
33382- (unsigned long)&_text, (unsigned long)&_etext,
33383+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33384 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33385
33386 /*
33387@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33388 if (!kernel_set_to_readonly)
33389 return;
33390
33391+ start = ktla_ktva(start);
33392 pr_debug("Set kernel text: %lx - %lx for read write\n",
33393 start, start+size);
33394
33395@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33396 if (!kernel_set_to_readonly)
33397 return;
33398
33399+ start = ktla_ktva(start);
33400 pr_debug("Set kernel text: %lx - %lx for read only\n",
33401 start, start+size);
33402
33403@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33404 unsigned long start = PFN_ALIGN(_text);
33405 unsigned long size = PFN_ALIGN(_etext) - start;
33406
33407+ start = ktla_ktva(start);
33408 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33409 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33410 size >> 10);
33411diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33412index 3fba623..5ee9802 100644
33413--- a/arch/x86/mm/init_64.c
33414+++ b/arch/x86/mm/init_64.c
33415@@ -136,7 +136,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
33416 * around without checking the pgd every time.
33417 */
33418
33419-pteval_t __supported_pte_mask __read_mostly = ~0;
33420+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33421 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33422
33423 int force_personality32;
33424@@ -169,7 +169,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33425
33426 for (address = start; address <= end; address += PGDIR_SIZE) {
33427 const pgd_t *pgd_ref = pgd_offset_k(address);
33428+
33429+#ifdef CONFIG_PAX_PER_CPU_PGD
33430+ unsigned long cpu;
33431+#else
33432 struct page *page;
33433+#endif
33434
33435 /*
33436 * When it is called after memory hot remove, pgd_none()
33437@@ -180,6 +185,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33438 continue;
33439
33440 spin_lock(&pgd_lock);
33441+
33442+#ifdef CONFIG_PAX_PER_CPU_PGD
33443+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33444+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33445+
33446+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33447+ BUG_ON(pgd_page_vaddr(*pgd)
33448+ != pgd_page_vaddr(*pgd_ref));
33449+
33450+ if (removed) {
33451+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33452+ pgd_clear(pgd);
33453+ } else {
33454+ if (pgd_none(*pgd))
33455+ set_pgd(pgd, *pgd_ref);
33456+ }
33457+
33458+ pgd = pgd_offset_cpu(cpu, kernel, address);
33459+#else
33460 list_for_each_entry(page, &pgd_list, lru) {
33461 pgd_t *pgd;
33462 spinlock_t *pgt_lock;
33463@@ -188,6 +212,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33464 /* the pgt_lock only for Xen */
33465 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33466 spin_lock(pgt_lock);
33467+#endif
33468
33469 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33470 BUG_ON(pgd_page_vaddr(*pgd)
33471@@ -201,7 +226,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33472 set_pgd(pgd, *pgd_ref);
33473 }
33474
33475+#ifndef CONFIG_PAX_PER_CPU_PGD
33476 spin_unlock(pgt_lock);
33477+#endif
33478+
33479 }
33480 spin_unlock(&pgd_lock);
33481 }
33482@@ -234,7 +262,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33483 {
33484 if (pgd_none(*pgd)) {
33485 pud_t *pud = (pud_t *)spp_getpage();
33486- pgd_populate(&init_mm, pgd, pud);
33487+ pgd_populate_kernel(&init_mm, pgd, pud);
33488 if (pud != pud_offset(pgd, 0))
33489 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33490 pud, pud_offset(pgd, 0));
33491@@ -246,7 +274,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33492 {
33493 if (pud_none(*pud)) {
33494 pmd_t *pmd = (pmd_t *) spp_getpage();
33495- pud_populate(&init_mm, pud, pmd);
33496+ pud_populate_kernel(&init_mm, pud, pmd);
33497 if (pmd != pmd_offset(pud, 0))
33498 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33499 pmd, pmd_offset(pud, 0));
33500@@ -275,7 +303,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33501 pmd = fill_pmd(pud, vaddr);
33502 pte = fill_pte(pmd, vaddr);
33503
33504+ pax_open_kernel();
33505 set_pte(pte, new_pte);
33506+ pax_close_kernel();
33507
33508 /*
33509 * It's enough to flush this one mapping.
33510@@ -337,14 +367,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33511 pgd = pgd_offset_k((unsigned long)__va(phys));
33512 if (pgd_none(*pgd)) {
33513 pud = (pud_t *) spp_getpage();
33514- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33515- _PAGE_USER));
33516+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33517 }
33518 pud = pud_offset(pgd, (unsigned long)__va(phys));
33519 if (pud_none(*pud)) {
33520 pmd = (pmd_t *) spp_getpage();
33521- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33522- _PAGE_USER));
33523+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33524 }
33525 pmd = pmd_offset(pud, phys);
33526 BUG_ON(!pmd_none(*pmd));
33527@@ -585,7 +613,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33528 prot);
33529
33530 spin_lock(&init_mm.page_table_lock);
33531- pud_populate(&init_mm, pud, pmd);
33532+ pud_populate_kernel(&init_mm, pud, pmd);
33533 spin_unlock(&init_mm.page_table_lock);
33534 }
33535 __flush_tlb_all();
33536@@ -626,7 +654,7 @@ kernel_physical_mapping_init(unsigned long start,
33537 page_size_mask);
33538
33539 spin_lock(&init_mm.page_table_lock);
33540- pgd_populate(&init_mm, pgd, pud);
33541+ pgd_populate_kernel(&init_mm, pgd, pud);
33542 spin_unlock(&init_mm.page_table_lock);
33543 pgd_changed = true;
33544 }
33545diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33546index 9ca35fc..4b2b7b7 100644
33547--- a/arch/x86/mm/iomap_32.c
33548+++ b/arch/x86/mm/iomap_32.c
33549@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33550 type = kmap_atomic_idx_push();
33551 idx = type + KM_TYPE_NR * smp_processor_id();
33552 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33553+
33554+ pax_open_kernel();
33555 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33556+ pax_close_kernel();
33557+
33558 arch_flush_lazy_mmu_mode();
33559
33560 return (void *)vaddr;
33561diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33562index 70e7444..75b9a13 100644
33563--- a/arch/x86/mm/ioremap.c
33564+++ b/arch/x86/mm/ioremap.c
33565@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33566 unsigned long i;
33567
33568 for (i = 0; i < nr_pages; ++i)
33569- if (pfn_valid(start_pfn + i) &&
33570- !PageReserved(pfn_to_page(start_pfn + i)))
33571+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33572+ !PageReserved(pfn_to_page(start_pfn + i))))
33573 return 1;
33574
33575 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33576@@ -288,7 +288,7 @@ EXPORT_SYMBOL(ioremap_prot);
33577 *
33578 * Caller must ensure there is only one unmapping for the same pointer.
33579 */
33580-void iounmap(volatile void __iomem *addr)
33581+void iounmap(const volatile void __iomem *addr)
33582 {
33583 struct vm_struct *p, *o;
33584
33585@@ -351,32 +351,36 @@ int arch_ioremap_pmd_supported(void)
33586 */
33587 void *xlate_dev_mem_ptr(phys_addr_t phys)
33588 {
33589- unsigned long start = phys & PAGE_MASK;
33590- unsigned long offset = phys & ~PAGE_MASK;
33591- unsigned long vaddr;
33592+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33593
33594- /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33595- if (page_is_ram(start >> PAGE_SHIFT))
33596- return __va(phys);
33597+ if (page_is_ram(pfn)) {
33598+#ifdef CONFIG_HIGHMEM
33599+ if (pfn >= max_low_pfn)
33600+ return kmap_high(pfn_to_page(pfn));
33601+ else
33602+#endif
33603+ return __va(phys);
33604+ }
33605
33606- vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
33607- /* Only add the offset on success and return NULL if the ioremap() failed: */
33608- if (vaddr)
33609- vaddr += offset;
33610-
33611- return (void *)vaddr;
33612+ return (void __force *)ioremap_cache(phys, 1);
33613 }
33614
33615 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33616 {
33617- if (page_is_ram(phys >> PAGE_SHIFT))
33618+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33619+
33620+ if (page_is_ram(pfn)) {
33621+#ifdef CONFIG_HIGHMEM
33622+ if (pfn >= max_low_pfn)
33623+ kunmap_high(pfn_to_page(pfn));
33624+#endif
33625 return;
33626+ }
33627
33628- iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33629- return;
33630+ iounmap((void __iomem __force *)addr);
33631 }
33632
33633-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33634+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33635
33636 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33637 {
33638@@ -412,8 +416,7 @@ void __init early_ioremap_init(void)
33639 early_ioremap_setup();
33640
33641 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33642- memset(bm_pte, 0, sizeof(bm_pte));
33643- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33644+ pmd_populate_user(&init_mm, pmd, bm_pte);
33645
33646 /*
33647 * The boot-ioremap range spans multiple pmds, for which
33648diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33649index b4f2e7e..96c9c3e 100644
33650--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33651+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33652@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33653 * memory (e.g. tracked pages)? For now, we need this to avoid
33654 * invoking kmemcheck for PnP BIOS calls.
33655 */
33656- if (regs->flags & X86_VM_MASK)
33657+ if (v8086_mode(regs))
33658 return false;
33659- if (regs->cs != __KERNEL_CS)
33660+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33661 return false;
33662
33663 pte = kmemcheck_pte_lookup(address);
33664diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33665index 9d518d6..8a091f5 100644
33666--- a/arch/x86/mm/mmap.c
33667+++ b/arch/x86/mm/mmap.c
33668@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33669 * Leave an at least ~128 MB hole with possible stack randomization.
33670 */
33671 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33672-#define MAX_GAP (TASK_SIZE/6*5)
33673+#define MAX_GAP (pax_task_size/6*5)
33674
33675 static int mmap_is_legacy(void)
33676 {
33677@@ -81,27 +81,40 @@ unsigned long arch_mmap_rnd(void)
33678 return rnd << PAGE_SHIFT;
33679 }
33680
33681-static unsigned long mmap_base(unsigned long rnd)
33682+static unsigned long mmap_base(struct mm_struct *mm, unsigned long rnd)
33683 {
33684 unsigned long gap = rlimit(RLIMIT_STACK);
33685+ unsigned long pax_task_size = TASK_SIZE;
33686+
33687+#ifdef CONFIG_PAX_SEGMEXEC
33688+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33689+ pax_task_size = SEGMEXEC_TASK_SIZE;
33690+#endif
33691
33692 if (gap < MIN_GAP)
33693 gap = MIN_GAP;
33694 else if (gap > MAX_GAP)
33695 gap = MAX_GAP;
33696
33697- return PAGE_ALIGN(TASK_SIZE - gap - rnd);
33698+ return PAGE_ALIGN(pax_task_size - gap - rnd);
33699 }
33700
33701 /*
33702 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33703 * does, but not when emulating X86_32
33704 */
33705-static unsigned long mmap_legacy_base(unsigned long rnd)
33706+static unsigned long mmap_legacy_base(struct mm_struct *mm, unsigned long rnd)
33707 {
33708- if (mmap_is_ia32())
33709+ if (mmap_is_ia32()) {
33710+
33711+#ifdef CONFIG_PAX_SEGMEXEC
33712+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33713+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33714+ else
33715+#endif
33716+
33717 return TASK_UNMAPPED_BASE;
33718- else
33719+ } else
33720 return TASK_UNMAPPED_BASE + rnd;
33721 }
33722
33723@@ -113,16 +126,27 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
33724 {
33725 unsigned long random_factor = 0UL;
33726
33727+#ifdef CONFIG_PAX_RANDMMAP
33728+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33729+#endif
33730 if (current->flags & PF_RANDOMIZE)
33731 random_factor = arch_mmap_rnd();
33732
33733- mm->mmap_legacy_base = mmap_legacy_base(random_factor);
33734+ mm->mmap_legacy_base = mmap_legacy_base(mm, random_factor);
33735
33736 if (mmap_is_legacy()) {
33737 mm->mmap_base = mm->mmap_legacy_base;
33738 mm->get_unmapped_area = arch_get_unmapped_area;
33739 } else {
33740- mm->mmap_base = mmap_base(random_factor);
33741+ mm->mmap_base = mmap_base(mm, random_factor);
33742 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
33743 }
33744+
33745+#ifdef CONFIG_PAX_RANDMMAP
33746+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33747+ mm->mmap_legacy_base += mm->delta_mmap;
33748+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33749+ }
33750+#endif
33751+
33752 }
33753diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33754index 0057a7a..95c7edd 100644
33755--- a/arch/x86/mm/mmio-mod.c
33756+++ b/arch/x86/mm/mmio-mod.c
33757@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33758 break;
33759 default:
33760 {
33761- unsigned char *ip = (unsigned char *)instptr;
33762+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33763 my_trace->opcode = MMIO_UNKNOWN_OP;
33764 my_trace->width = 0;
33765 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33766@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33767 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33768 void __iomem *addr)
33769 {
33770- static atomic_t next_id;
33771+ static atomic_unchecked_t next_id;
33772 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33773 /* These are page-unaligned. */
33774 struct mmiotrace_map map = {
33775@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33776 .private = trace
33777 },
33778 .phys = offset,
33779- .id = atomic_inc_return(&next_id)
33780+ .id = atomic_inc_return_unchecked(&next_id)
33781 };
33782 map.map_id = trace->id;
33783
33784@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33785 ioremap_trace_core(offset, size, addr);
33786 }
33787
33788-static void iounmap_trace_core(volatile void __iomem *addr)
33789+static void iounmap_trace_core(const volatile void __iomem *addr)
33790 {
33791 struct mmiotrace_map map = {
33792 .phys = 0,
33793@@ -328,7 +328,7 @@ not_enabled:
33794 }
33795 }
33796
33797-void mmiotrace_iounmap(volatile void __iomem *addr)
33798+void mmiotrace_iounmap(const volatile void __iomem *addr)
33799 {
33800 might_sleep();
33801 if (is_enabled()) /* recheck and proper locking in *_core() */
33802diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33803index 4053bb5..b1ad3dc 100644
33804--- a/arch/x86/mm/numa.c
33805+++ b/arch/x86/mm/numa.c
33806@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33807 }
33808 }
33809
33810-static int __init numa_register_memblks(struct numa_meminfo *mi)
33811+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33812 {
33813 unsigned long uninitialized_var(pfn_align);
33814 int i, nid;
33815diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33816index 89af288..05381957 100644
33817--- a/arch/x86/mm/pageattr.c
33818+++ b/arch/x86/mm/pageattr.c
33819@@ -260,7 +260,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33820 */
33821 #ifdef CONFIG_PCI_BIOS
33822 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33823- pgprot_val(forbidden) |= _PAGE_NX;
33824+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33825 #endif
33826
33827 /*
33828@@ -268,9 +268,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33829 * Does not cover __inittext since that is gone later on. On
33830 * 64bit we do not enforce !NX on the low mapping
33831 */
33832- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33833- pgprot_val(forbidden) |= _PAGE_NX;
33834+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33835+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33836
33837+#ifdef CONFIG_DEBUG_RODATA
33838 /*
33839 * The .rodata section needs to be read-only. Using the pfn
33840 * catches all aliases.
33841@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33842 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33843 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33844 pgprot_val(forbidden) |= _PAGE_RW;
33845+#endif
33846
33847 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33848 /*
33849@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33850 }
33851 #endif
33852
33853+#ifdef CONFIG_PAX_KERNEXEC
33854+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33855+ pgprot_val(forbidden) |= _PAGE_RW;
33856+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33857+ }
33858+#endif
33859+
33860 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33861
33862 return prot;
33863@@ -438,23 +447,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33864 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33865 {
33866 /* change init_mm */
33867+ pax_open_kernel();
33868 set_pte_atomic(kpte, pte);
33869+
33870 #ifdef CONFIG_X86_32
33871 if (!SHARED_KERNEL_PMD) {
33872+
33873+#ifdef CONFIG_PAX_PER_CPU_PGD
33874+ unsigned long cpu;
33875+#else
33876 struct page *page;
33877+#endif
33878
33879+#ifdef CONFIG_PAX_PER_CPU_PGD
33880+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33881+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33882+#else
33883 list_for_each_entry(page, &pgd_list, lru) {
33884- pgd_t *pgd;
33885+ pgd_t *pgd = (pgd_t *)page_address(page);
33886+#endif
33887+
33888 pud_t *pud;
33889 pmd_t *pmd;
33890
33891- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33892+ pgd += pgd_index(address);
33893 pud = pud_offset(pgd, address);
33894 pmd = pmd_offset(pud, address);
33895 set_pte_atomic((pte_t *)pmd, pte);
33896 }
33897 }
33898 #endif
33899+ pax_close_kernel();
33900 }
33901
33902 static int
33903diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33904index 35af677..e7bf11f 100644
33905--- a/arch/x86/mm/pat.c
33906+++ b/arch/x86/mm/pat.c
33907@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33908 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33909
33910 if (pg_flags == _PGMT_DEFAULT)
33911- return -1;
33912+ return _PAGE_CACHE_MODE_NUM;
33913 else if (pg_flags == _PGMT_WC)
33914 return _PAGE_CACHE_MODE_WC;
33915 else if (pg_flags == _PGMT_UC_MINUS)
33916@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33917
33918 page = pfn_to_page(pfn);
33919 type = get_page_memtype(page);
33920- if (type != -1) {
33921+ if (type != _PAGE_CACHE_MODE_NUM) {
33922 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33923 start, end - 1, type, req_type);
33924 if (new_type)
33925@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33926
33927 if (!entry) {
33928 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33929- current->comm, current->pid, start, end - 1);
33930+ current->comm, task_pid_nr(current), start, end - 1);
33931 return -EINVAL;
33932 }
33933
33934@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33935 page = pfn_to_page(paddr >> PAGE_SHIFT);
33936 rettype = get_page_memtype(page);
33937 /*
33938- * -1 from get_page_memtype() implies RAM page is in its
33939+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33940 * default state and not reserved, and hence of type WB
33941 */
33942- if (rettype == -1)
33943+ if (rettype == _PAGE_CACHE_MODE_NUM)
33944 rettype = _PAGE_CACHE_MODE_WB;
33945
33946 return rettype;
33947@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33948
33949 while (cursor < to) {
33950 if (!devmem_is_allowed(pfn)) {
33951- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
33952- current->comm, from, to - 1);
33953+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx), PAT prevents it\n",
33954+ current->comm, from, to - 1, cursor);
33955 return 0;
33956 }
33957 cursor += PAGE_SIZE;
33958@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33959 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33960 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33961 "for [mem %#010Lx-%#010Lx]\n",
33962- current->comm, current->pid,
33963+ current->comm, task_pid_nr(current),
33964 cattr_name(pcm),
33965 base, (unsigned long long)(base + size-1));
33966 return -EINVAL;
33967@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33968 pcm = lookup_memtype(paddr);
33969 if (want_pcm != pcm) {
33970 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33971- current->comm, current->pid,
33972+ current->comm, task_pid_nr(current),
33973 cattr_name(want_pcm),
33974 (unsigned long long)paddr,
33975 (unsigned long long)(paddr + size - 1),
33976@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33977 free_memtype(paddr, paddr + size);
33978 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33979 " for [mem %#010Lx-%#010Lx], got %s\n",
33980- current->comm, current->pid,
33981+ current->comm, task_pid_nr(current),
33982 cattr_name(want_pcm),
33983 (unsigned long long)paddr,
33984 (unsigned long long)(paddr + size - 1),
33985diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33986index 6582adc..fcc5d0b 100644
33987--- a/arch/x86/mm/pat_rbtree.c
33988+++ b/arch/x86/mm/pat_rbtree.c
33989@@ -161,7 +161,7 @@ success:
33990
33991 failure:
33992 printk(KERN_INFO "%s:%d conflicting memory types "
33993- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33994+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33995 end, cattr_name(found_type), cattr_name(match->type));
33996 return -EBUSY;
33997 }
33998diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33999index 9f0614d..92ae64a 100644
34000--- a/arch/x86/mm/pf_in.c
34001+++ b/arch/x86/mm/pf_in.c
34002@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
34003 int i;
34004 enum reason_type rv = OTHERS;
34005
34006- p = (unsigned char *)ins_addr;
34007+ p = (unsigned char *)ktla_ktva(ins_addr);
34008 p += skip_prefix(p, &prf);
34009 p += get_opcode(p, &opcode);
34010
34011@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
34012 struct prefix_bits prf;
34013 int i;
34014
34015- p = (unsigned char *)ins_addr;
34016+ p = (unsigned char *)ktla_ktva(ins_addr);
34017 p += skip_prefix(p, &prf);
34018 p += get_opcode(p, &opcode);
34019
34020@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
34021 struct prefix_bits prf;
34022 int i;
34023
34024- p = (unsigned char *)ins_addr;
34025+ p = (unsigned char *)ktla_ktva(ins_addr);
34026 p += skip_prefix(p, &prf);
34027 p += get_opcode(p, &opcode);
34028
34029@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
34030 struct prefix_bits prf;
34031 int i;
34032
34033- p = (unsigned char *)ins_addr;
34034+ p = (unsigned char *)ktla_ktva(ins_addr);
34035 p += skip_prefix(p, &prf);
34036 p += get_opcode(p, &opcode);
34037 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
34038@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
34039 struct prefix_bits prf;
34040 int i;
34041
34042- p = (unsigned char *)ins_addr;
34043+ p = (unsigned char *)ktla_ktva(ins_addr);
34044 p += skip_prefix(p, &prf);
34045 p += get_opcode(p, &opcode);
34046 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
34047diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
34048index 0b97d2c..597bb38 100644
34049--- a/arch/x86/mm/pgtable.c
34050+++ b/arch/x86/mm/pgtable.c
34051@@ -98,10 +98,75 @@ static inline void pgd_list_del(pgd_t *pgd)
34052 list_del(&page->lru);
34053 }
34054
34055-#define UNSHARED_PTRS_PER_PGD \
34056- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
34057+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
34058+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
34059
34060+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
34061+{
34062+ unsigned int count = USER_PGD_PTRS;
34063
34064+ if (!pax_user_shadow_base)
34065+ return;
34066+
34067+ while (count--)
34068+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
34069+}
34070+#endif
34071+
34072+#ifdef CONFIG_PAX_PER_CPU_PGD
34073+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
34074+{
34075+ unsigned int count = USER_PGD_PTRS;
34076+
34077+ while (count--) {
34078+ pgd_t pgd;
34079+
34080+#ifdef CONFIG_X86_64
34081+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
34082+#else
34083+ pgd = *src++;
34084+#endif
34085+
34086+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
34087+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
34088+#endif
34089+
34090+ *dst++ = pgd;
34091+ }
34092+
34093+}
34094+#endif
34095+
34096+#ifdef CONFIG_X86_64
34097+#define pxd_t pud_t
34098+#define pyd_t pgd_t
34099+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
34100+#define pgtable_pxd_page_ctor(page) true
34101+#define pgtable_pxd_page_dtor(page) do {} while (0)
34102+#define pxd_free(mm, pud) pud_free((mm), (pud))
34103+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
34104+#define pyd_offset(mm, address) pgd_offset((mm), (address))
34105+#define PYD_SIZE PGDIR_SIZE
34106+#define mm_inc_nr_pxds(mm) do {} while (0)
34107+#define mm_dec_nr_pxds(mm) do {} while (0)
34108+#else
34109+#define pxd_t pmd_t
34110+#define pyd_t pud_t
34111+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
34112+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
34113+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
34114+#define pxd_free(mm, pud) pmd_free((mm), (pud))
34115+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
34116+#define pyd_offset(mm, address) pud_offset((mm), (address))
34117+#define PYD_SIZE PUD_SIZE
34118+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
34119+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
34120+#endif
34121+
34122+#ifdef CONFIG_PAX_PER_CPU_PGD
34123+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
34124+static inline void pgd_dtor(pgd_t *pgd) {}
34125+#else
34126 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
34127 {
34128 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
34129@@ -142,6 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
34130 pgd_list_del(pgd);
34131 spin_unlock(&pgd_lock);
34132 }
34133+#endif
34134
34135 /*
34136 * List of all pgd's needed for non-PAE so it can invalidate entries
34137@@ -154,7 +220,7 @@ static void pgd_dtor(pgd_t *pgd)
34138 * -- nyc
34139 */
34140
34141-#ifdef CONFIG_X86_PAE
34142+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
34143 /*
34144 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
34145 * updating the top-level pagetable entries to guarantee the
34146@@ -166,7 +232,7 @@ static void pgd_dtor(pgd_t *pgd)
34147 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
34148 * and initialize the kernel pmds here.
34149 */
34150-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
34151+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
34152
34153 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
34154 {
34155@@ -184,46 +250,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
34156 */
34157 flush_tlb_mm(mm);
34158 }
34159+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
34160+#define PREALLOCATED_PXDS USER_PGD_PTRS
34161 #else /* !CONFIG_X86_PAE */
34162
34163 /* No need to prepopulate any pagetable entries in non-PAE modes. */
34164-#define PREALLOCATED_PMDS 0
34165+#define PREALLOCATED_PXDS 0
34166
34167 #endif /* CONFIG_X86_PAE */
34168
34169-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
34170+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
34171 {
34172 int i;
34173
34174- for(i = 0; i < PREALLOCATED_PMDS; i++)
34175- if (pmds[i]) {
34176- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
34177- free_page((unsigned long)pmds[i]);
34178- mm_dec_nr_pmds(mm);
34179+ for(i = 0; i < PREALLOCATED_PXDS; i++)
34180+ if (pxds[i]) {
34181+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
34182+ free_page((unsigned long)pxds[i]);
34183+ mm_dec_nr_pxds(mm);
34184 }
34185 }
34186
34187-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34188+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
34189 {
34190 int i;
34191 bool failed = false;
34192
34193- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34194- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
34195- if (!pmd)
34196+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34197+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
34198+ if (!pxd)
34199 failed = true;
34200- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
34201- free_page((unsigned long)pmd);
34202- pmd = NULL;
34203+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
34204+ free_page((unsigned long)pxd);
34205+ pxd = NULL;
34206 failed = true;
34207 }
34208- if (pmd)
34209- mm_inc_nr_pmds(mm);
34210- pmds[i] = pmd;
34211+ if (pxd)
34212+ mm_inc_nr_pxds(mm);
34213+ pxds[i] = pxd;
34214 }
34215
34216 if (failed) {
34217- free_pmds(mm, pmds);
34218+ free_pxds(mm, pxds);
34219 return -ENOMEM;
34220 }
34221
34222@@ -236,43 +304,47 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34223 * preallocate which never got a corresponding vma will need to be
34224 * freed manually.
34225 */
34226-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34227+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34228 {
34229 int i;
34230
34231- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34232+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34233 pgd_t pgd = pgdp[i];
34234
34235 if (pgd_val(pgd) != 0) {
34236- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34237+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34238
34239- pgdp[i] = native_make_pgd(0);
34240+ set_pgd(pgdp + i, native_make_pgd(0));
34241
34242- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34243- pmd_free(mm, pmd);
34244- mm_dec_nr_pmds(mm);
34245+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34246+ pxd_free(mm, pxd);
34247+ mm_dec_nr_pxds(mm);
34248 }
34249 }
34250 }
34251
34252-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34253+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34254 {
34255- pud_t *pud;
34256+ pyd_t *pyd;
34257 int i;
34258
34259- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34260+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34261 return;
34262
34263- pud = pud_offset(pgd, 0);
34264+#ifdef CONFIG_X86_64
34265+ pyd = pyd_offset(mm, 0L);
34266+#else
34267+ pyd = pyd_offset(pgd, 0L);
34268+#endif
34269
34270- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34271- pmd_t *pmd = pmds[i];
34272+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34273+ pxd_t *pxd = pxds[i];
34274
34275 if (i >= KERNEL_PGD_BOUNDARY)
34276- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34277- sizeof(pmd_t) * PTRS_PER_PMD);
34278+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34279+ sizeof(pxd_t) * PTRS_PER_PMD);
34280
34281- pud_populate(mm, pud, pmd);
34282+ pyd_populate(mm, pyd, pxd);
34283 }
34284 }
34285
34286@@ -354,7 +426,7 @@ static inline void _pgd_free(pgd_t *pgd)
34287 pgd_t *pgd_alloc(struct mm_struct *mm)
34288 {
34289 pgd_t *pgd;
34290- pmd_t *pmds[PREALLOCATED_PMDS];
34291+ pxd_t *pxds[PREALLOCATED_PXDS];
34292
34293 pgd = _pgd_alloc();
34294
34295@@ -363,11 +435,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34296
34297 mm->pgd = pgd;
34298
34299- if (preallocate_pmds(mm, pmds) != 0)
34300+ if (preallocate_pxds(mm, pxds) != 0)
34301 goto out_free_pgd;
34302
34303 if (paravirt_pgd_alloc(mm) != 0)
34304- goto out_free_pmds;
34305+ goto out_free_pxds;
34306
34307 /*
34308 * Make sure that pre-populating the pmds is atomic with
34309@@ -377,14 +449,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34310 spin_lock(&pgd_lock);
34311
34312 pgd_ctor(mm, pgd);
34313- pgd_prepopulate_pmd(mm, pgd, pmds);
34314+ pgd_prepopulate_pxd(mm, pgd, pxds);
34315
34316 spin_unlock(&pgd_lock);
34317
34318 return pgd;
34319
34320-out_free_pmds:
34321- free_pmds(mm, pmds);
34322+out_free_pxds:
34323+ free_pxds(mm, pxds);
34324 out_free_pgd:
34325 _pgd_free(pgd);
34326 out:
34327@@ -393,7 +465,7 @@ out:
34328
34329 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34330 {
34331- pgd_mop_up_pmds(mm, pgd);
34332+ pgd_mop_up_pxds(mm, pgd);
34333 pgd_dtor(pgd);
34334 paravirt_pgd_free(mm, pgd);
34335 _pgd_free(pgd);
34336diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34337index 75cc097..79a097f 100644
34338--- a/arch/x86/mm/pgtable_32.c
34339+++ b/arch/x86/mm/pgtable_32.c
34340@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34341 return;
34342 }
34343 pte = pte_offset_kernel(pmd, vaddr);
34344+
34345+ pax_open_kernel();
34346 if (pte_val(pteval))
34347 set_pte_at(&init_mm, vaddr, pte, pteval);
34348 else
34349 pte_clear(&init_mm, vaddr, pte);
34350+ pax_close_kernel();
34351
34352 /*
34353 * It's enough to flush this one mapping.
34354diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34355index e666cbb..61788c45 100644
34356--- a/arch/x86/mm/physaddr.c
34357+++ b/arch/x86/mm/physaddr.c
34358@@ -10,7 +10,7 @@
34359 #ifdef CONFIG_X86_64
34360
34361 #ifdef CONFIG_DEBUG_VIRTUAL
34362-unsigned long __phys_addr(unsigned long x)
34363+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34364 {
34365 unsigned long y = x - __START_KERNEL_map;
34366
34367@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34368 #else
34369
34370 #ifdef CONFIG_DEBUG_VIRTUAL
34371-unsigned long __phys_addr(unsigned long x)
34372+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34373 {
34374 unsigned long phys_addr = x - PAGE_OFFSET;
34375 /* VMALLOC_* aren't constants */
34376diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34377index 90555bf..f5f1828 100644
34378--- a/arch/x86/mm/setup_nx.c
34379+++ b/arch/x86/mm/setup_nx.c
34380@@ -5,8 +5,10 @@
34381 #include <asm/pgtable.h>
34382 #include <asm/proto.h>
34383
34384+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34385 static int disable_nx;
34386
34387+#ifndef CONFIG_PAX_PAGEEXEC
34388 /*
34389 * noexec = on|off
34390 *
34391@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34392 return 0;
34393 }
34394 early_param("noexec", noexec_setup);
34395+#endif
34396+
34397+#endif
34398
34399 void x86_configure_nx(void)
34400 {
34401+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34402 if (cpu_has_nx && !disable_nx)
34403 __supported_pte_mask |= _PAGE_NX;
34404 else
34405+#endif
34406 __supported_pte_mask &= ~_PAGE_NX;
34407 }
34408
34409diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34410index 3250f23..7a97ba2 100644
34411--- a/arch/x86/mm/tlb.c
34412+++ b/arch/x86/mm/tlb.c
34413@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34414 BUG();
34415 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34416 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34417+
34418+#ifndef CONFIG_PAX_PER_CPU_PGD
34419 load_cr3(swapper_pg_dir);
34420+#endif
34421+
34422 /*
34423 * This gets called in the idle path where RCU
34424 * functions differently. Tracing normally
34425diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34426new file mode 100644
34427index 0000000..3fda3f3
34428--- /dev/null
34429+++ b/arch/x86/mm/uderef_64.c
34430@@ -0,0 +1,37 @@
34431+#include <linux/mm.h>
34432+#include <asm/pgtable.h>
34433+#include <asm/uaccess.h>
34434+
34435+#ifdef CONFIG_PAX_MEMORY_UDEREF
34436+/* PaX: due to the special call convention these functions must
34437+ * - remain leaf functions under all configurations,
34438+ * - never be called directly, only dereferenced from the wrappers.
34439+ */
34440+void __used __pax_open_userland(void)
34441+{
34442+ unsigned int cpu;
34443+
34444+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34445+ return;
34446+
34447+ cpu = raw_get_cpu();
34448+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34449+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34450+ raw_put_cpu_no_resched();
34451+}
34452+EXPORT_SYMBOL(__pax_open_userland);
34453+
34454+void __used __pax_close_userland(void)
34455+{
34456+ unsigned int cpu;
34457+
34458+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34459+ return;
34460+
34461+ cpu = raw_get_cpu();
34462+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34463+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34464+ raw_put_cpu_no_resched();
34465+}
34466+EXPORT_SYMBOL(__pax_close_userland);
34467+#endif
34468diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34469index 6440221..f84b5c7 100644
34470--- a/arch/x86/net/bpf_jit.S
34471+++ b/arch/x86/net/bpf_jit.S
34472@@ -9,6 +9,7 @@
34473 */
34474 #include <linux/linkage.h>
34475 #include <asm/dwarf2.h>
34476+#include <asm/alternative-asm.h>
34477
34478 /*
34479 * Calling convention :
34480@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34481 jle bpf_slow_path_word
34482 mov (SKBDATA,%rsi),%eax
34483 bswap %eax /* ntohl() */
34484+ pax_force_retaddr
34485 ret
34486
34487 sk_load_half:
34488@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34489 jle bpf_slow_path_half
34490 movzwl (SKBDATA,%rsi),%eax
34491 rol $8,%ax # ntohs()
34492+ pax_force_retaddr
34493 ret
34494
34495 sk_load_byte:
34496@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34497 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34498 jle bpf_slow_path_byte
34499 movzbl (SKBDATA,%rsi),%eax
34500+ pax_force_retaddr
34501 ret
34502
34503 /* rsi contains offset and can be scratched */
34504@@ -90,6 +94,7 @@ bpf_slow_path_word:
34505 js bpf_error
34506 mov - MAX_BPF_STACK + 32(%rbp),%eax
34507 bswap %eax
34508+ pax_force_retaddr
34509 ret
34510
34511 bpf_slow_path_half:
34512@@ -98,12 +103,14 @@ bpf_slow_path_half:
34513 mov - MAX_BPF_STACK + 32(%rbp),%ax
34514 rol $8,%ax
34515 movzwl %ax,%eax
34516+ pax_force_retaddr
34517 ret
34518
34519 bpf_slow_path_byte:
34520 bpf_slow_path_common(1)
34521 js bpf_error
34522 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34523+ pax_force_retaddr
34524 ret
34525
34526 #define sk_negative_common(SIZE) \
34527@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34528 sk_negative_common(4)
34529 mov (%rax), %eax
34530 bswap %eax
34531+ pax_force_retaddr
34532 ret
34533
34534 bpf_slow_path_half_neg:
34535@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34536 mov (%rax),%ax
34537 rol $8,%ax
34538 movzwl %ax,%eax
34539+ pax_force_retaddr
34540 ret
34541
34542 bpf_slow_path_byte_neg:
34543@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34544 .globl sk_load_byte_negative_offset
34545 sk_negative_common(1)
34546 movzbl (%rax), %eax
34547+ pax_force_retaddr
34548 ret
34549
34550 bpf_error:
34551@@ -156,4 +166,5 @@ bpf_error:
34552 mov - MAX_BPF_STACK + 16(%rbp),%r14
34553 mov - MAX_BPF_STACK + 24(%rbp),%r15
34554 leaveq
34555+ pax_force_retaddr
34556 ret
34557diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34558index ddeff48..877ead6 100644
34559--- a/arch/x86/net/bpf_jit_comp.c
34560+++ b/arch/x86/net/bpf_jit_comp.c
34561@@ -13,7 +13,11 @@
34562 #include <linux/if_vlan.h>
34563 #include <asm/cacheflush.h>
34564
34565+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34566+int bpf_jit_enable __read_only;
34567+#else
34568 int bpf_jit_enable __read_mostly;
34569+#endif
34570
34571 /*
34572 * assembly code in arch/x86/net/bpf_jit.S
34573@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34574 static void jit_fill_hole(void *area, unsigned int size)
34575 {
34576 /* fill whole space with int3 instructions */
34577+ pax_open_kernel();
34578 memset(area, 0xcc, size);
34579+ pax_close_kernel();
34580 }
34581
34582 struct jit_context {
34583@@ -924,7 +930,9 @@ common_load:
34584 pr_err("bpf_jit_compile fatal error\n");
34585 return -EFAULT;
34586 }
34587+ pax_open_kernel();
34588 memcpy(image + proglen, temp, ilen);
34589+ pax_close_kernel();
34590 }
34591 proglen += ilen;
34592 addrs[i] = proglen;
34593@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34594
34595 if (image) {
34596 bpf_flush_icache(header, image + proglen);
34597- set_memory_ro((unsigned long)header, header->pages);
34598 prog->bpf_func = (void *)image;
34599 prog->jited = true;
34600 }
34601@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34602 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34603 struct bpf_binary_header *header = (void *)addr;
34604
34605- if (!fp->jited)
34606- goto free_filter;
34607+ if (fp->jited)
34608+ bpf_jit_binary_free(header);
34609
34610- set_memory_rw(addr, header->pages);
34611- bpf_jit_binary_free(header);
34612-
34613-free_filter:
34614 bpf_prog_unlock_free(fp);
34615 }
34616diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34617index 4e664bd..2beeaa2 100644
34618--- a/arch/x86/oprofile/backtrace.c
34619+++ b/arch/x86/oprofile/backtrace.c
34620@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34621 struct stack_frame_ia32 *fp;
34622 unsigned long bytes;
34623
34624- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34625+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34626 if (bytes != 0)
34627 return NULL;
34628
34629- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34630+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34631
34632 oprofile_add_trace(bufhead[0].return_address);
34633
34634@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34635 struct stack_frame bufhead[2];
34636 unsigned long bytes;
34637
34638- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34639+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34640 if (bytes != 0)
34641 return NULL;
34642
34643diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34644index 1d2e639..f6ef82a 100644
34645--- a/arch/x86/oprofile/nmi_int.c
34646+++ b/arch/x86/oprofile/nmi_int.c
34647@@ -23,6 +23,7 @@
34648 #include <asm/nmi.h>
34649 #include <asm/msr.h>
34650 #include <asm/apic.h>
34651+#include <asm/pgtable.h>
34652
34653 #include "op_counter.h"
34654 #include "op_x86_model.h"
34655@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34656 if (ret)
34657 return ret;
34658
34659- if (!model->num_virt_counters)
34660- model->num_virt_counters = model->num_counters;
34661+ if (!model->num_virt_counters) {
34662+ pax_open_kernel();
34663+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34664+ pax_close_kernel();
34665+ }
34666
34667 mux_init(ops);
34668
34669diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34670index 50d86c0..7985318 100644
34671--- a/arch/x86/oprofile/op_model_amd.c
34672+++ b/arch/x86/oprofile/op_model_amd.c
34673@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34674 num_counters = AMD64_NUM_COUNTERS;
34675 }
34676
34677- op_amd_spec.num_counters = num_counters;
34678- op_amd_spec.num_controls = num_counters;
34679- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34680+ pax_open_kernel();
34681+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34682+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34683+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34684+ pax_close_kernel();
34685
34686 return 0;
34687 }
34688diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34689index d90528e..0127e2b 100644
34690--- a/arch/x86/oprofile/op_model_ppro.c
34691+++ b/arch/x86/oprofile/op_model_ppro.c
34692@@ -19,6 +19,7 @@
34693 #include <asm/msr.h>
34694 #include <asm/apic.h>
34695 #include <asm/nmi.h>
34696+#include <asm/pgtable.h>
34697
34698 #include "op_x86_model.h"
34699 #include "op_counter.h"
34700@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34701
34702 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34703
34704- op_arch_perfmon_spec.num_counters = num_counters;
34705- op_arch_perfmon_spec.num_controls = num_counters;
34706+ pax_open_kernel();
34707+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34708+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34709+ pax_close_kernel();
34710 }
34711
34712 static int arch_perfmon_init(struct oprofile_operations *ignore)
34713diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34714index 71e8a67..6a313bb 100644
34715--- a/arch/x86/oprofile/op_x86_model.h
34716+++ b/arch/x86/oprofile/op_x86_model.h
34717@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34718 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34719 struct op_msrs const * const msrs);
34720 #endif
34721-};
34722+} __do_const;
34723
34724 struct op_counter_config;
34725
34726diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34727index 852aa4c..71613f2 100644
34728--- a/arch/x86/pci/intel_mid_pci.c
34729+++ b/arch/x86/pci/intel_mid_pci.c
34730@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34731 pci_mmcfg_late_init();
34732 pcibios_enable_irq = intel_mid_pci_irq_enable;
34733 pcibios_disable_irq = intel_mid_pci_irq_disable;
34734- pci_root_ops = intel_mid_pci_ops;
34735+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34736 pci_soc_mode = 1;
34737 /* Continue with standard init */
34738 return 1;
34739diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34740index 5dc6ca5..25c03f5 100644
34741--- a/arch/x86/pci/irq.c
34742+++ b/arch/x86/pci/irq.c
34743@@ -51,7 +51,7 @@ struct irq_router {
34744 struct irq_router_handler {
34745 u16 vendor;
34746 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34747-};
34748+} __do_const;
34749
34750 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34751 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34752@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34753 return 0;
34754 }
34755
34756-static __initdata struct irq_router_handler pirq_routers[] = {
34757+static __initconst const struct irq_router_handler pirq_routers[] = {
34758 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34759 { PCI_VENDOR_ID_AL, ali_router_probe },
34760 { PCI_VENDOR_ID_ITE, ite_router_probe },
34761@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34762 static void __init pirq_find_router(struct irq_router *r)
34763 {
34764 struct irq_routing_table *rt = pirq_table;
34765- struct irq_router_handler *h;
34766+ const struct irq_router_handler *h;
34767
34768 #ifdef CONFIG_PCI_BIOS
34769 if (!rt->signature) {
34770@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34771 return 0;
34772 }
34773
34774-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34775+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34776 {
34777 .callback = fix_broken_hp_bios_irq9,
34778 .ident = "HP Pavilion N5400 Series Laptop",
34779diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34780index 9b83b90..4112152 100644
34781--- a/arch/x86/pci/pcbios.c
34782+++ b/arch/x86/pci/pcbios.c
34783@@ -79,7 +79,7 @@ union bios32 {
34784 static struct {
34785 unsigned long address;
34786 unsigned short segment;
34787-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34788+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34789
34790 /*
34791 * Returns the entry point for the given service, NULL on error
34792@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34793 unsigned long length; /* %ecx */
34794 unsigned long entry; /* %edx */
34795 unsigned long flags;
34796+ struct desc_struct d, *gdt;
34797
34798 local_irq_save(flags);
34799- __asm__("lcall *(%%edi); cld"
34800+
34801+ gdt = get_cpu_gdt_table(smp_processor_id());
34802+
34803+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34804+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34805+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34806+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34807+
34808+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34809 : "=a" (return_code),
34810 "=b" (address),
34811 "=c" (length),
34812 "=d" (entry)
34813 : "0" (service),
34814 "1" (0),
34815- "D" (&bios32_indirect));
34816+ "D" (&bios32_indirect),
34817+ "r"(__PCIBIOS_DS)
34818+ : "memory");
34819+
34820+ pax_open_kernel();
34821+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34822+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34823+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34824+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34825+ pax_close_kernel();
34826+
34827 local_irq_restore(flags);
34828
34829 switch (return_code) {
34830- case 0:
34831- return address + entry;
34832- case 0x80: /* Not present */
34833- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34834- return 0;
34835- default: /* Shouldn't happen */
34836- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34837- service, return_code);
34838+ case 0: {
34839+ int cpu;
34840+ unsigned char flags;
34841+
34842+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34843+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34844+ printk(KERN_WARNING "bios32_service: not valid\n");
34845 return 0;
34846+ }
34847+ address = address + PAGE_OFFSET;
34848+ length += 16UL; /* some BIOSs underreport this... */
34849+ flags = 4;
34850+ if (length >= 64*1024*1024) {
34851+ length >>= PAGE_SHIFT;
34852+ flags |= 8;
34853+ }
34854+
34855+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34856+ gdt = get_cpu_gdt_table(cpu);
34857+ pack_descriptor(&d, address, length, 0x9b, flags);
34858+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34859+ pack_descriptor(&d, address, length, 0x93, flags);
34860+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34861+ }
34862+ return entry;
34863+ }
34864+ case 0x80: /* Not present */
34865+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34866+ return 0;
34867+ default: /* Shouldn't happen */
34868+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34869+ service, return_code);
34870+ return 0;
34871 }
34872 }
34873
34874 static struct {
34875 unsigned long address;
34876 unsigned short segment;
34877-} pci_indirect = { 0, __KERNEL_CS };
34878+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34879
34880-static int pci_bios_present;
34881+static int pci_bios_present __read_only;
34882
34883 static int __init check_pcibios(void)
34884 {
34885@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34886 unsigned long flags, pcibios_entry;
34887
34888 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34889- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34890+ pci_indirect.address = pcibios_entry;
34891
34892 local_irq_save(flags);
34893- __asm__(
34894- "lcall *(%%edi); cld\n\t"
34895+ __asm__("movw %w6, %%ds\n\t"
34896+ "lcall *%%ss:(%%edi); cld\n\t"
34897+ "push %%ss\n\t"
34898+ "pop %%ds\n\t"
34899 "jc 1f\n\t"
34900 "xor %%ah, %%ah\n"
34901 "1:"
34902@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34903 "=b" (ebx),
34904 "=c" (ecx)
34905 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34906- "D" (&pci_indirect)
34907+ "D" (&pci_indirect),
34908+ "r" (__PCIBIOS_DS)
34909 : "memory");
34910 local_irq_restore(flags);
34911
34912@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34913
34914 switch (len) {
34915 case 1:
34916- __asm__("lcall *(%%esi); cld\n\t"
34917+ __asm__("movw %w6, %%ds\n\t"
34918+ "lcall *%%ss:(%%esi); cld\n\t"
34919+ "push %%ss\n\t"
34920+ "pop %%ds\n\t"
34921 "jc 1f\n\t"
34922 "xor %%ah, %%ah\n"
34923 "1:"
34924@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34925 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34926 "b" (bx),
34927 "D" ((long)reg),
34928- "S" (&pci_indirect));
34929+ "S" (&pci_indirect),
34930+ "r" (__PCIBIOS_DS));
34931 /*
34932 * Zero-extend the result beyond 8 bits, do not trust the
34933 * BIOS having done it:
34934@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34935 *value &= 0xff;
34936 break;
34937 case 2:
34938- __asm__("lcall *(%%esi); cld\n\t"
34939+ __asm__("movw %w6, %%ds\n\t"
34940+ "lcall *%%ss:(%%esi); cld\n\t"
34941+ "push %%ss\n\t"
34942+ "pop %%ds\n\t"
34943 "jc 1f\n\t"
34944 "xor %%ah, %%ah\n"
34945 "1:"
34946@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34947 : "1" (PCIBIOS_READ_CONFIG_WORD),
34948 "b" (bx),
34949 "D" ((long)reg),
34950- "S" (&pci_indirect));
34951+ "S" (&pci_indirect),
34952+ "r" (__PCIBIOS_DS));
34953 /*
34954 * Zero-extend the result beyond 16 bits, do not trust the
34955 * BIOS having done it:
34956@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34957 *value &= 0xffff;
34958 break;
34959 case 4:
34960- __asm__("lcall *(%%esi); cld\n\t"
34961+ __asm__("movw %w6, %%ds\n\t"
34962+ "lcall *%%ss:(%%esi); cld\n\t"
34963+ "push %%ss\n\t"
34964+ "pop %%ds\n\t"
34965 "jc 1f\n\t"
34966 "xor %%ah, %%ah\n"
34967 "1:"
34968@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34969 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34970 "b" (bx),
34971 "D" ((long)reg),
34972- "S" (&pci_indirect));
34973+ "S" (&pci_indirect),
34974+ "r" (__PCIBIOS_DS));
34975 break;
34976 }
34977
34978@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34979
34980 switch (len) {
34981 case 1:
34982- __asm__("lcall *(%%esi); cld\n\t"
34983+ __asm__("movw %w6, %%ds\n\t"
34984+ "lcall *%%ss:(%%esi); cld\n\t"
34985+ "push %%ss\n\t"
34986+ "pop %%ds\n\t"
34987 "jc 1f\n\t"
34988 "xor %%ah, %%ah\n"
34989 "1:"
34990@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34991 "c" (value),
34992 "b" (bx),
34993 "D" ((long)reg),
34994- "S" (&pci_indirect));
34995+ "S" (&pci_indirect),
34996+ "r" (__PCIBIOS_DS));
34997 break;
34998 case 2:
34999- __asm__("lcall *(%%esi); cld\n\t"
35000+ __asm__("movw %w6, %%ds\n\t"
35001+ "lcall *%%ss:(%%esi); cld\n\t"
35002+ "push %%ss\n\t"
35003+ "pop %%ds\n\t"
35004 "jc 1f\n\t"
35005 "xor %%ah, %%ah\n"
35006 "1:"
35007@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
35008 "c" (value),
35009 "b" (bx),
35010 "D" ((long)reg),
35011- "S" (&pci_indirect));
35012+ "S" (&pci_indirect),
35013+ "r" (__PCIBIOS_DS));
35014 break;
35015 case 4:
35016- __asm__("lcall *(%%esi); cld\n\t"
35017+ __asm__("movw %w6, %%ds\n\t"
35018+ "lcall *%%ss:(%%esi); cld\n\t"
35019+ "push %%ss\n\t"
35020+ "pop %%ds\n\t"
35021 "jc 1f\n\t"
35022 "xor %%ah, %%ah\n"
35023 "1:"
35024@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
35025 "c" (value),
35026 "b" (bx),
35027 "D" ((long)reg),
35028- "S" (&pci_indirect));
35029+ "S" (&pci_indirect),
35030+ "r" (__PCIBIOS_DS));
35031 break;
35032 }
35033
35034@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
35035
35036 DBG("PCI: Fetching IRQ routing table... ");
35037 __asm__("push %%es\n\t"
35038+ "movw %w8, %%ds\n\t"
35039 "push %%ds\n\t"
35040 "pop %%es\n\t"
35041- "lcall *(%%esi); cld\n\t"
35042+ "lcall *%%ss:(%%esi); cld\n\t"
35043 "pop %%es\n\t"
35044+ "push %%ss\n\t"
35045+ "pop %%ds\n"
35046 "jc 1f\n\t"
35047 "xor %%ah, %%ah\n"
35048 "1:"
35049@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
35050 "1" (0),
35051 "D" ((long) &opt),
35052 "S" (&pci_indirect),
35053- "m" (opt)
35054+ "m" (opt),
35055+ "r" (__PCIBIOS_DS)
35056 : "memory");
35057 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
35058 if (ret & 0xff00)
35059@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
35060 {
35061 int ret;
35062
35063- __asm__("lcall *(%%esi); cld\n\t"
35064+ __asm__("movw %w5, %%ds\n\t"
35065+ "lcall *%%ss:(%%esi); cld\n\t"
35066+ "push %%ss\n\t"
35067+ "pop %%ds\n"
35068 "jc 1f\n\t"
35069 "xor %%ah, %%ah\n"
35070 "1:"
35071@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
35072 : "0" (PCIBIOS_SET_PCI_HW_INT),
35073 "b" ((dev->bus->number << 8) | dev->devfn),
35074 "c" ((irq << 8) | (pin + 10)),
35075- "S" (&pci_indirect));
35076+ "S" (&pci_indirect),
35077+ "r" (__PCIBIOS_DS));
35078 return !(ret & 0xff00);
35079 }
35080 EXPORT_SYMBOL(pcibios_set_irq_routing);
35081diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
35082index ed5b673..24d2d53 100644
35083--- a/arch/x86/platform/efi/efi_32.c
35084+++ b/arch/x86/platform/efi/efi_32.c
35085@@ -61,11 +61,27 @@ pgd_t * __init efi_call_phys_prolog(void)
35086 struct desc_ptr gdt_descr;
35087 pgd_t *save_pgd;
35088
35089+#ifdef CONFIG_PAX_KERNEXEC
35090+ struct desc_struct d;
35091+#endif
35092+
35093 /* Current pgd is swapper_pg_dir, we'll restore it later: */
35094+#ifdef CONFIG_PAX_PER_CPU_PGD
35095+ save_pgd = get_cpu_pgd(smp_processor_id(), kernel);
35096+#else
35097 save_pgd = swapper_pg_dir;
35098+#endif
35099+
35100 load_cr3(initial_page_table);
35101 __flush_tlb_all();
35102
35103+#ifdef CONFIG_PAX_KERNEXEC
35104+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
35105+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
35106+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
35107+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
35108+#endif
35109+
35110 gdt_descr.address = __pa(get_cpu_gdt_table(0));
35111 gdt_descr.size = GDT_SIZE - 1;
35112 load_gdt(&gdt_descr);
35113@@ -77,6 +93,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
35114 {
35115 struct desc_ptr gdt_descr;
35116
35117+#ifdef CONFIG_PAX_KERNEXEC
35118+ struct desc_struct d;
35119+
35120+ memset(&d, 0, sizeof d);
35121+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
35122+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
35123+#endif
35124+
35125 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
35126 gdt_descr.size = GDT_SIZE - 1;
35127 load_gdt(&gdt_descr);
35128diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
35129index a0ac0f9..f41d324 100644
35130--- a/arch/x86/platform/efi/efi_64.c
35131+++ b/arch/x86/platform/efi/efi_64.c
35132@@ -96,6 +96,11 @@ pgd_t * __init efi_call_phys_prolog(void)
35133 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
35134 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
35135 }
35136+
35137+#ifdef CONFIG_PAX_PER_CPU_PGD
35138+ load_cr3(swapper_pg_dir);
35139+#endif
35140+
35141 __flush_tlb_all();
35142
35143 return save_pgd;
35144@@ -119,6 +124,10 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
35145
35146 kfree(save_pgd);
35147
35148+#ifdef CONFIG_PAX_PER_CPU_PGD
35149+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
35150+#endif
35151+
35152 __flush_tlb_all();
35153 early_code_mapping_set_exec(0);
35154 }
35155@@ -148,8 +157,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
35156 unsigned npages;
35157 pgd_t *pgd;
35158
35159- if (efi_enabled(EFI_OLD_MEMMAP))
35160+ if (efi_enabled(EFI_OLD_MEMMAP)) {
35161+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
35162+ * able to execute the EFI services.
35163+ */
35164+ if (__supported_pte_mask & _PAGE_NX) {
35165+ unsigned long addr = (unsigned long) __va(0);
35166+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
35167+
35168+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
35169+#ifdef CONFIG_PAX_PER_CPU_PGD
35170+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
35171+#endif
35172+ set_pgd(pgd_offset_k(addr), pe);
35173+ }
35174+
35175 return 0;
35176+ }
35177
35178 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
35179 pgd = __va(efi_scratch.efi_pgt);
35180diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
35181index 040192b..7d3300f 100644
35182--- a/arch/x86/platform/efi/efi_stub_32.S
35183+++ b/arch/x86/platform/efi/efi_stub_32.S
35184@@ -6,7 +6,9 @@
35185 */
35186
35187 #include <linux/linkage.h>
35188+#include <linux/init.h>
35189 #include <asm/page_types.h>
35190+#include <asm/segment.h>
35191
35192 /*
35193 * efi_call_phys(void *, ...) is a function with variable parameters.
35194@@ -20,7 +22,7 @@
35195 * service functions will comply with gcc calling convention, too.
35196 */
35197
35198-.text
35199+__INIT
35200 ENTRY(efi_call_phys)
35201 /*
35202 * 0. The function can only be called in Linux kernel. So CS has been
35203@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
35204 * The mapping of lower virtual memory has been created in prolog and
35205 * epilog.
35206 */
35207- movl $1f, %edx
35208- subl $__PAGE_OFFSET, %edx
35209- jmp *%edx
35210+#ifdef CONFIG_PAX_KERNEXEC
35211+ movl $(__KERNEXEC_EFI_DS), %edx
35212+ mov %edx, %ds
35213+ mov %edx, %es
35214+ mov %edx, %ss
35215+ addl $2f,(1f)
35216+ ljmp *(1f)
35217+
35218+__INITDATA
35219+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35220+.previous
35221+
35222+2:
35223+ subl $2b,(1b)
35224+#else
35225+ jmp 1f-__PAGE_OFFSET
35226 1:
35227+#endif
35228
35229 /*
35230 * 2. Now on the top of stack is the return
35231@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35232 * parameter 2, ..., param n. To make things easy, we save the return
35233 * address of efi_call_phys in a global variable.
35234 */
35235- popl %edx
35236- movl %edx, saved_return_addr
35237- /* get the function pointer into ECX*/
35238- popl %ecx
35239- movl %ecx, efi_rt_function_ptr
35240- movl $2f, %edx
35241- subl $__PAGE_OFFSET, %edx
35242- pushl %edx
35243+ popl (saved_return_addr)
35244+ popl (efi_rt_function_ptr)
35245
35246 /*
35247 * 3. Clear PG bit in %CR0.
35248@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35249 /*
35250 * 5. Call the physical function.
35251 */
35252- jmp *%ecx
35253+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35254
35255-2:
35256 /*
35257 * 6. After EFI runtime service returns, control will return to
35258 * following instruction. We'd better readjust stack pointer first.
35259@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35260 movl %cr0, %edx
35261 orl $0x80000000, %edx
35262 movl %edx, %cr0
35263- jmp 1f
35264-1:
35265+
35266 /*
35267 * 8. Now restore the virtual mode from flat mode by
35268 * adding EIP with PAGE_OFFSET.
35269 */
35270- movl $1f, %edx
35271- jmp *%edx
35272+#ifdef CONFIG_PAX_KERNEXEC
35273+ movl $(__KERNEL_DS), %edx
35274+ mov %edx, %ds
35275+ mov %edx, %es
35276+ mov %edx, %ss
35277+ ljmp $(__KERNEL_CS),$1f
35278+#else
35279+ jmp 1f+__PAGE_OFFSET
35280+#endif
35281 1:
35282
35283 /*
35284 * 9. Balance the stack. And because EAX contain the return value,
35285 * we'd better not clobber it.
35286 */
35287- leal efi_rt_function_ptr, %edx
35288- movl (%edx), %ecx
35289- pushl %ecx
35290+ pushl (efi_rt_function_ptr)
35291
35292 /*
35293- * 10. Push the saved return address onto the stack and return.
35294+ * 10. Return to the saved return address.
35295 */
35296- leal saved_return_addr, %edx
35297- movl (%edx), %ecx
35298- pushl %ecx
35299- ret
35300+ jmpl *(saved_return_addr)
35301 ENDPROC(efi_call_phys)
35302 .previous
35303
35304-.data
35305+__INITDATA
35306 saved_return_addr:
35307 .long 0
35308 efi_rt_function_ptr:
35309diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35310index 86d0f9e..6d499f4 100644
35311--- a/arch/x86/platform/efi/efi_stub_64.S
35312+++ b/arch/x86/platform/efi/efi_stub_64.S
35313@@ -11,6 +11,7 @@
35314 #include <asm/msr.h>
35315 #include <asm/processor-flags.h>
35316 #include <asm/page_types.h>
35317+#include <asm/alternative-asm.h>
35318
35319 #define SAVE_XMM \
35320 mov %rsp, %rax; \
35321@@ -88,6 +89,7 @@ ENTRY(efi_call)
35322 RESTORE_PGT
35323 addq $48, %rsp
35324 RESTORE_XMM
35325+ pax_force_retaddr 0, 1
35326 ret
35327 ENDPROC(efi_call)
35328
35329diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35330index 3005f0c..d06aeb0 100644
35331--- a/arch/x86/platform/intel-mid/intel-mid.c
35332+++ b/arch/x86/platform/intel-mid/intel-mid.c
35333@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35334 /* intel_mid_ops to store sub arch ops */
35335 struct intel_mid_ops *intel_mid_ops;
35336 /* getter function for sub arch ops*/
35337-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35338+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35339 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35340 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35341
35342@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35343 {
35344 };
35345
35346-static void intel_mid_reboot(void)
35347+static void __noreturn intel_mid_reboot(void)
35348 {
35349 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35350+ BUG();
35351 }
35352
35353 static unsigned long __init intel_mid_calibrate_tsc(void)
35354diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35355index 3c1c386..59a68ed 100644
35356--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35357+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35358@@ -13,6 +13,6 @@
35359 /* For every CPU addition a new get_<cpuname>_ops interface needs
35360 * to be added.
35361 */
35362-extern void *get_penwell_ops(void);
35363-extern void *get_cloverview_ops(void);
35364-extern void *get_tangier_ops(void);
35365+extern const void *get_penwell_ops(void);
35366+extern const void *get_cloverview_ops(void);
35367+extern const void *get_tangier_ops(void);
35368diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35369index 23381d2..8ddc10e 100644
35370--- a/arch/x86/platform/intel-mid/mfld.c
35371+++ b/arch/x86/platform/intel-mid/mfld.c
35372@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35373 pm_power_off = mfld_power_off;
35374 }
35375
35376-void *get_penwell_ops(void)
35377+const void *get_penwell_ops(void)
35378 {
35379 return &penwell_ops;
35380 }
35381
35382-void *get_cloverview_ops(void)
35383+const void *get_cloverview_ops(void)
35384 {
35385 return &penwell_ops;
35386 }
35387diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35388index aaca917..66eadbc 100644
35389--- a/arch/x86/platform/intel-mid/mrfl.c
35390+++ b/arch/x86/platform/intel-mid/mrfl.c
35391@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35392 .arch_setup = tangier_arch_setup,
35393 };
35394
35395-void *get_tangier_ops(void)
35396+const void *get_tangier_ops(void)
35397 {
35398 return &tangier_ops;
35399 }
35400diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35401index 278e4da..55e8d8a 100644
35402--- a/arch/x86/platform/intel-quark/imr_selftest.c
35403+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35404@@ -55,7 +55,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35405 */
35406 static void __init imr_self_test(void)
35407 {
35408- phys_addr_t base = virt_to_phys(&_text);
35409+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35410 size_t size = virt_to_phys(&__end_rodata) - base;
35411 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35412 int ret;
35413diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35414index d6ee929..3637cb5 100644
35415--- a/arch/x86/platform/olpc/olpc_dt.c
35416+++ b/arch/x86/platform/olpc/olpc_dt.c
35417@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35418 return res;
35419 }
35420
35421-static struct of_pdt_ops prom_olpc_ops __initdata = {
35422+static struct of_pdt_ops prom_olpc_ops __initconst = {
35423 .nextprop = olpc_dt_nextprop,
35424 .getproplen = olpc_dt_getproplen,
35425 .getproperty = olpc_dt_getproperty,
35426diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35427index 757678f..9895d9b 100644
35428--- a/arch/x86/power/cpu.c
35429+++ b/arch/x86/power/cpu.c
35430@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35431 static void fix_processor_context(void)
35432 {
35433 int cpu = smp_processor_id();
35434- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
35435-#ifdef CONFIG_X86_64
35436- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35437- tss_desc tss;
35438-#endif
35439+ struct tss_struct *t = cpu_tss + cpu;
35440+
35441 set_tss_desc(cpu, t); /*
35442 * This just modifies memory; should not be
35443 * necessary. But... This is necessary, because
35444@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35445 */
35446
35447 #ifdef CONFIG_X86_64
35448- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35449- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35450- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35451-
35452 syscall_init(); /* This sets MSR_*STAR and related */
35453 #endif
35454 load_TR_desc(); /* This does ltr */
35455diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35456index 0b7a63d..0d0f2c2 100644
35457--- a/arch/x86/realmode/init.c
35458+++ b/arch/x86/realmode/init.c
35459@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35460 __va(real_mode_header->trampoline_header);
35461
35462 #ifdef CONFIG_X86_32
35463- trampoline_header->start = __pa_symbol(startup_32_smp);
35464+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35465+
35466+#ifdef CONFIG_PAX_KERNEXEC
35467+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35468+#endif
35469+
35470+ trampoline_header->boot_cs = __BOOT_CS;
35471 trampoline_header->gdt_limit = __BOOT_DS + 7;
35472 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35473 #else
35474@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35475 *trampoline_cr4_features = __read_cr4();
35476
35477 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35478- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35479+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35480 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35481 #endif
35482 }
35483diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35484index 2730d77..2e4cd19 100644
35485--- a/arch/x86/realmode/rm/Makefile
35486+++ b/arch/x86/realmode/rm/Makefile
35487@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35488
35489 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35490 -I$(srctree)/arch/x86/boot
35491+ifdef CONSTIFY_PLUGIN
35492+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35493+endif
35494 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35495 GCOV_PROFILE := n
35496diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35497index a28221d..93c40f1 100644
35498--- a/arch/x86/realmode/rm/header.S
35499+++ b/arch/x86/realmode/rm/header.S
35500@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35501 #endif
35502 /* APM/BIOS reboot */
35503 .long pa_machine_real_restart_asm
35504-#ifdef CONFIG_X86_64
35505+#ifdef CONFIG_X86_32
35506+ .long __KERNEL_CS
35507+#else
35508 .long __KERNEL32_CS
35509 #endif
35510 END(real_mode_header)
35511diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35512index d66c607..3def845 100644
35513--- a/arch/x86/realmode/rm/reboot.S
35514+++ b/arch/x86/realmode/rm/reboot.S
35515@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35516 lgdtl pa_tr_gdt
35517
35518 /* Disable paging to drop us out of long mode */
35519+ movl %cr4, %eax
35520+ andl $~X86_CR4_PCIDE, %eax
35521+ movl %eax, %cr4
35522+
35523 movl %cr0, %eax
35524 andl $~X86_CR0_PG, %eax
35525 movl %eax, %cr0
35526diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35527index 48ddd76..c26749f 100644
35528--- a/arch/x86/realmode/rm/trampoline_32.S
35529+++ b/arch/x86/realmode/rm/trampoline_32.S
35530@@ -24,6 +24,12 @@
35531 #include <asm/page_types.h>
35532 #include "realmode.h"
35533
35534+#ifdef CONFIG_PAX_KERNEXEC
35535+#define ta(X) (X)
35536+#else
35537+#define ta(X) (pa_ ## X)
35538+#endif
35539+
35540 .text
35541 .code16
35542
35543@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35544
35545 cli # We should be safe anyway
35546
35547- movl tr_start, %eax # where we need to go
35548-
35549 movl $0xA5A5A5A5, trampoline_status
35550 # write marker for master knows we're running
35551
35552@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35553 movw $1, %dx # protected mode (PE) bit
35554 lmsw %dx # into protected mode
35555
35556- ljmpl $__BOOT_CS, $pa_startup_32
35557+ ljmpl *(trampoline_header)
35558
35559 .section ".text32","ax"
35560 .code32
35561@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35562 .balign 8
35563 GLOBAL(trampoline_header)
35564 tr_start: .space 4
35565- tr_gdt_pad: .space 2
35566+ tr_boot_cs: .space 2
35567 tr_gdt: .space 6
35568 END(trampoline_header)
35569
35570diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35571index dac7b20..72dbaca 100644
35572--- a/arch/x86/realmode/rm/trampoline_64.S
35573+++ b/arch/x86/realmode/rm/trampoline_64.S
35574@@ -93,6 +93,7 @@ ENTRY(startup_32)
35575 movl %edx, %gs
35576
35577 movl pa_tr_cr4, %eax
35578+ andl $~X86_CR4_PCIDE, %eax
35579 movl %eax, %cr4 # Enable PAE mode
35580
35581 # Setup trampoline 4 level pagetables
35582@@ -106,7 +107,7 @@ ENTRY(startup_32)
35583 wrmsr
35584
35585 # Enable paging and in turn activate Long Mode
35586- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35587+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35588 movl %eax, %cr0
35589
35590 /*
35591diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35592index 9e7e147..25a4158 100644
35593--- a/arch/x86/realmode/rm/wakeup_asm.S
35594+++ b/arch/x86/realmode/rm/wakeup_asm.S
35595@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35596 lgdtl pmode_gdt
35597
35598 /* This really couldn't... */
35599- movl pmode_entry, %eax
35600 movl pmode_cr0, %ecx
35601 movl %ecx, %cr0
35602- ljmpl $__KERNEL_CS, $pa_startup_32
35603- /* -> jmp *%eax in trampoline_32.S */
35604+
35605+ ljmpl *pmode_entry
35606 #else
35607 jmp trampoline_start
35608 #endif
35609diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35610index 604a37e..e49702a 100644
35611--- a/arch/x86/tools/Makefile
35612+++ b/arch/x86/tools/Makefile
35613@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35614
35615 $(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
35616
35617-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35618+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35619 hostprogs-y += relocs
35620 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35621 PHONY += relocs
35622diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35623index 0c2fae8..88036b7 100644
35624--- a/arch/x86/tools/relocs.c
35625+++ b/arch/x86/tools/relocs.c
35626@@ -1,5 +1,7 @@
35627 /* This is included from relocs_32/64.c */
35628
35629+#include "../../../include/generated/autoconf.h"
35630+
35631 #define ElfW(type) _ElfW(ELF_BITS, type)
35632 #define _ElfW(bits, type) __ElfW(bits, type)
35633 #define __ElfW(bits, type) Elf##bits##_##type
35634@@ -11,6 +13,7 @@
35635 #define Elf_Sym ElfW(Sym)
35636
35637 static Elf_Ehdr ehdr;
35638+static Elf_Phdr *phdr;
35639
35640 struct relocs {
35641 uint32_t *offset;
35642@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35643 }
35644 }
35645
35646+static void read_phdrs(FILE *fp)
35647+{
35648+ unsigned int i;
35649+
35650+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35651+ if (!phdr) {
35652+ die("Unable to allocate %d program headers\n",
35653+ ehdr.e_phnum);
35654+ }
35655+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35656+ die("Seek to %d failed: %s\n",
35657+ ehdr.e_phoff, strerror(errno));
35658+ }
35659+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35660+ die("Cannot read ELF program headers: %s\n",
35661+ strerror(errno));
35662+ }
35663+ for(i = 0; i < ehdr.e_phnum; i++) {
35664+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35665+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35666+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35667+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35668+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35669+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35670+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35671+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35672+ }
35673+
35674+}
35675+
35676 static void read_shdrs(FILE *fp)
35677 {
35678- int i;
35679+ unsigned int i;
35680 Elf_Shdr shdr;
35681
35682 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35683@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35684
35685 static void read_strtabs(FILE *fp)
35686 {
35687- int i;
35688+ unsigned int i;
35689 for (i = 0; i < ehdr.e_shnum; i++) {
35690 struct section *sec = &secs[i];
35691 if (sec->shdr.sh_type != SHT_STRTAB) {
35692@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35693
35694 static void read_symtabs(FILE *fp)
35695 {
35696- int i,j;
35697+ unsigned int i,j;
35698 for (i = 0; i < ehdr.e_shnum; i++) {
35699 struct section *sec = &secs[i];
35700 if (sec->shdr.sh_type != SHT_SYMTAB) {
35701@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35702 }
35703
35704
35705-static void read_relocs(FILE *fp)
35706+static void read_relocs(FILE *fp, int use_real_mode)
35707 {
35708- int i,j;
35709+ unsigned int i,j;
35710+ uint32_t base;
35711+
35712 for (i = 0; i < ehdr.e_shnum; i++) {
35713 struct section *sec = &secs[i];
35714 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35715@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35716 die("Cannot read symbol table: %s\n",
35717 strerror(errno));
35718 }
35719+ base = 0;
35720+
35721+#ifdef CONFIG_X86_32
35722+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35723+ if (phdr[j].p_type != PT_LOAD )
35724+ continue;
35725+ 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)
35726+ continue;
35727+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35728+ break;
35729+ }
35730+#endif
35731+
35732 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35733 Elf_Rel *rel = &sec->reltab[j];
35734- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35735+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35736 rel->r_info = elf_xword_to_cpu(rel->r_info);
35737 #if (SHT_REL_TYPE == SHT_RELA)
35738 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35739@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35740
35741 static void print_absolute_symbols(void)
35742 {
35743- int i;
35744+ unsigned int i;
35745 const char *format;
35746
35747 if (ELF_BITS == 64)
35748@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35749 for (i = 0; i < ehdr.e_shnum; i++) {
35750 struct section *sec = &secs[i];
35751 char *sym_strtab;
35752- int j;
35753+ unsigned int j;
35754
35755 if (sec->shdr.sh_type != SHT_SYMTAB) {
35756 continue;
35757@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35758
35759 static void print_absolute_relocs(void)
35760 {
35761- int i, printed = 0;
35762+ unsigned int i, printed = 0;
35763 const char *format;
35764
35765 if (ELF_BITS == 64)
35766@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35767 struct section *sec_applies, *sec_symtab;
35768 char *sym_strtab;
35769 Elf_Sym *sh_symtab;
35770- int j;
35771+ unsigned int j;
35772 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35773 continue;
35774 }
35775@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35776 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35777 Elf_Sym *sym, const char *symname))
35778 {
35779- int i;
35780+ unsigned int i;
35781 /* Walk through the relocations */
35782 for (i = 0; i < ehdr.e_shnum; i++) {
35783 char *sym_strtab;
35784 Elf_Sym *sh_symtab;
35785 struct section *sec_applies, *sec_symtab;
35786- int j;
35787+ unsigned int j;
35788 struct section *sec = &secs[i];
35789
35790 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35791@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35792 {
35793 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35794 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35795+ char *sym_strtab = sec->link->link->strtab;
35796+
35797+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35798+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35799+ return 0;
35800+
35801+#ifdef CONFIG_PAX_KERNEXEC
35802+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35803+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35804+ return 0;
35805+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35806+ return 0;
35807+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35808+ return 0;
35809+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35810+ return 0;
35811+#endif
35812
35813 switch (r_type) {
35814 case R_386_NONE:
35815@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35816
35817 static void emit_relocs(int as_text, int use_real_mode)
35818 {
35819- int i;
35820+ unsigned int i;
35821 int (*write_reloc)(uint32_t, FILE *) = write32;
35822 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35823 const char *symname);
35824@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35825 {
35826 regex_init(use_real_mode);
35827 read_ehdr(fp);
35828+ read_phdrs(fp);
35829 read_shdrs(fp);
35830 read_strtabs(fp);
35831 read_symtabs(fp);
35832- read_relocs(fp);
35833+ read_relocs(fp, use_real_mode);
35834 if (ELF_BITS == 64)
35835 percpu_init();
35836 if (show_absolute_syms) {
35837diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35838index f40281e..92728c9 100644
35839--- a/arch/x86/um/mem_32.c
35840+++ b/arch/x86/um/mem_32.c
35841@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35842 gate_vma.vm_start = FIXADDR_USER_START;
35843 gate_vma.vm_end = FIXADDR_USER_END;
35844 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35845- gate_vma.vm_page_prot = __P101;
35846+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35847
35848 return 0;
35849 }
35850diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35851index 80ffa5b..a33bd15 100644
35852--- a/arch/x86/um/tls_32.c
35853+++ b/arch/x86/um/tls_32.c
35854@@ -260,7 +260,7 @@ out:
35855 if (unlikely(task == current &&
35856 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35857 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35858- "without flushed TLS.", current->pid);
35859+ "without flushed TLS.", task_pid_nr(current));
35860 }
35861
35862 return 0;
35863diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35864index e970320..c006fea 100644
35865--- a/arch/x86/vdso/Makefile
35866+++ b/arch/x86/vdso/Makefile
35867@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35868 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35869 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35870
35871-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35872+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35873 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35874 GCOV_PROFILE := n
35875
35876diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35877index 0224987..c7d65a5 100644
35878--- a/arch/x86/vdso/vdso2c.h
35879+++ b/arch/x86/vdso/vdso2c.h
35880@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35881 unsigned long load_size = -1; /* Work around bogus warning */
35882 unsigned long mapping_size;
35883 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35884- int i;
35885+ unsigned int i;
35886 unsigned long j;
35887 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35888 *alt_sec = NULL;
35889diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35890index e904c27..b9eaa03 100644
35891--- a/arch/x86/vdso/vdso32-setup.c
35892+++ b/arch/x86/vdso/vdso32-setup.c
35893@@ -14,6 +14,7 @@
35894 #include <asm/cpufeature.h>
35895 #include <asm/processor.h>
35896 #include <asm/vdso.h>
35897+#include <asm/mman.h>
35898
35899 #ifdef CONFIG_COMPAT_VDSO
35900 #define VDSO_DEFAULT 0
35901diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35902index 1c9f750..cfddb1a 100644
35903--- a/arch/x86/vdso/vma.c
35904+++ b/arch/x86/vdso/vma.c
35905@@ -19,10 +19,7 @@
35906 #include <asm/page.h>
35907 #include <asm/hpet.h>
35908 #include <asm/desc.h>
35909-
35910-#if defined(CONFIG_X86_64)
35911-unsigned int __read_mostly vdso64_enabled = 1;
35912-#endif
35913+#include <asm/mman.h>
35914
35915 void __init init_vdso_image(const struct vdso_image *image)
35916 {
35917@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35918 .pages = no_pages,
35919 };
35920
35921+#ifdef CONFIG_PAX_RANDMMAP
35922+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35923+ calculate_addr = false;
35924+#endif
35925+
35926 if (calculate_addr) {
35927 addr = vdso_addr(current->mm->start_stack,
35928 image->size - image->sym_vvar_start);
35929@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35930 down_write(&mm->mmap_sem);
35931
35932 addr = get_unmapped_area(NULL, addr,
35933- image->size - image->sym_vvar_start, 0, 0);
35934+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35935 if (IS_ERR_VALUE(addr)) {
35936 ret = addr;
35937 goto up_fail;
35938 }
35939
35940 text_start = addr - image->sym_vvar_start;
35941- current->mm->context.vdso = (void __user *)text_start;
35942+ mm->context.vdso = text_start;
35943
35944 /*
35945 * MAYWRITE to allow gdb to COW and set breakpoints
35946@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35947 hpet_address >> PAGE_SHIFT,
35948 PAGE_SIZE,
35949 pgprot_noncached(PAGE_READONLY));
35950-
35951- if (ret)
35952- goto up_fail;
35953 }
35954 #endif
35955
35956 up_fail:
35957 if (ret)
35958- current->mm->context.vdso = NULL;
35959+ current->mm->context.vdso = 0;
35960
35961 up_write(&mm->mmap_sem);
35962 return ret;
35963@@ -191,8 +190,8 @@ static int load_vdso32(void)
35964
35965 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35966 current_thread_info()->sysenter_return =
35967- current->mm->context.vdso +
35968- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35969+ (void __force_user *)(current->mm->context.vdso +
35970+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35971
35972 return 0;
35973 }
35974@@ -201,9 +200,6 @@ static int load_vdso32(void)
35975 #ifdef CONFIG_X86_64
35976 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35977 {
35978- if (!vdso64_enabled)
35979- return 0;
35980-
35981 return map_vdso(&vdso_image_64, true);
35982 }
35983
35984@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35985 int uses_interp)
35986 {
35987 #ifdef CONFIG_X86_X32_ABI
35988- if (test_thread_flag(TIF_X32)) {
35989- if (!vdso64_enabled)
35990- return 0;
35991-
35992+ if (test_thread_flag(TIF_X32))
35993 return map_vdso(&vdso_image_x32, true);
35994- }
35995 #endif
35996
35997 return load_vdso32();
35998@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35999 #endif
36000
36001 #ifdef CONFIG_X86_64
36002-static __init int vdso_setup(char *s)
36003-{
36004- vdso64_enabled = simple_strtoul(s, NULL, 0);
36005- return 0;
36006-}
36007-__setup("vdso=", vdso_setup);
36008-#endif
36009-
36010-#ifdef CONFIG_X86_64
36011 static void vgetcpu_cpu_init(void *arg)
36012 {
36013 int cpu = smp_processor_id();
36014diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
36015index e88fda8..76ce7ce 100644
36016--- a/arch/x86/xen/Kconfig
36017+++ b/arch/x86/xen/Kconfig
36018@@ -9,6 +9,7 @@ config XEN
36019 select XEN_HAVE_PVMMU
36020 depends on X86_64 || (X86_32 && X86_PAE)
36021 depends on X86_TSC
36022+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
36023 help
36024 This is the Linux Xen port. Enabling this will allow the
36025 kernel to boot in a paravirtualized environment under the
36026diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
36027index 46957ea..ef7b714 100644
36028--- a/arch/x86/xen/enlighten.c
36029+++ b/arch/x86/xen/enlighten.c
36030@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
36031
36032 struct shared_info xen_dummy_shared_info;
36033
36034-void *xen_initial_gdt;
36035-
36036 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
36037 __read_mostly int xen_have_vector_callback;
36038 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
36039@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
36040 {
36041 unsigned long va = dtr->address;
36042 unsigned int size = dtr->size + 1;
36043- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
36044- unsigned long frames[pages];
36045+ unsigned long frames[65536 / PAGE_SIZE];
36046 int f;
36047
36048 /*
36049@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
36050 {
36051 unsigned long va = dtr->address;
36052 unsigned int size = dtr->size + 1;
36053- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
36054- unsigned long frames[pages];
36055+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
36056 int f;
36057
36058 /*
36059@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
36060 * 8-byte entries, or 16 4k pages..
36061 */
36062
36063- BUG_ON(size > 65536);
36064+ BUG_ON(size > GDT_SIZE);
36065 BUG_ON(va & ~PAGE_MASK);
36066
36067 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
36068@@ -1223,30 +1219,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
36069 #endif
36070 };
36071
36072-static void xen_reboot(int reason)
36073+static __noreturn void xen_reboot(int reason)
36074 {
36075 struct sched_shutdown r = { .reason = reason };
36076
36077- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
36078- BUG();
36079+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
36080+ BUG();
36081 }
36082
36083-static void xen_restart(char *msg)
36084+static __noreturn void xen_restart(char *msg)
36085 {
36086 xen_reboot(SHUTDOWN_reboot);
36087 }
36088
36089-static void xen_emergency_restart(void)
36090+static __noreturn void xen_emergency_restart(void)
36091 {
36092 xen_reboot(SHUTDOWN_reboot);
36093 }
36094
36095-static void xen_machine_halt(void)
36096+static __noreturn void xen_machine_halt(void)
36097 {
36098 xen_reboot(SHUTDOWN_poweroff);
36099 }
36100
36101-static void xen_machine_power_off(void)
36102+static __noreturn void xen_machine_power_off(void)
36103 {
36104 if (pm_power_off)
36105 pm_power_off();
36106@@ -1399,8 +1395,11 @@ static void __ref xen_setup_gdt(int cpu)
36107 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
36108 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
36109
36110- setup_stack_canary_segment(0);
36111- switch_to_new_gdt(0);
36112+ setup_stack_canary_segment(cpu);
36113+#ifdef CONFIG_X86_64
36114+ load_percpu_segment(cpu);
36115+#endif
36116+ switch_to_new_gdt(cpu);
36117
36118 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
36119 pv_cpu_ops.load_gdt = xen_load_gdt;
36120@@ -1515,7 +1514,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
36121 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
36122
36123 /* Work out if we support NX */
36124- x86_configure_nx();
36125+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
36126+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
36127+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
36128+ unsigned l, h;
36129+
36130+ __supported_pte_mask |= _PAGE_NX;
36131+ rdmsr(MSR_EFER, l, h);
36132+ l |= EFER_NX;
36133+ wrmsr(MSR_EFER, l, h);
36134+ }
36135+#endif
36136
36137 /* Get mfn list */
36138 xen_build_dynamic_phys_to_machine();
36139@@ -1543,13 +1552,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
36140
36141 machine_ops = xen_machine_ops;
36142
36143- /*
36144- * The only reliable way to retain the initial address of the
36145- * percpu gdt_page is to remember it here, so we can go and
36146- * mark it RW later, when the initial percpu area is freed.
36147- */
36148- xen_initial_gdt = &per_cpu(gdt_page, 0);
36149-
36150 xen_smp_init();
36151
36152 #ifdef CONFIG_ACPI_NUMA
36153diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
36154index dd151b2..d5ab952 100644
36155--- a/arch/x86/xen/mmu.c
36156+++ b/arch/x86/xen/mmu.c
36157@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
36158 return val;
36159 }
36160
36161-static pteval_t pte_pfn_to_mfn(pteval_t val)
36162+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
36163 {
36164 if (val & _PAGE_PRESENT) {
36165 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
36166@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36167 * L3_k[511] -> level2_fixmap_pgt */
36168 convert_pfn_mfn(level3_kernel_pgt);
36169
36170+ convert_pfn_mfn(level3_vmalloc_start_pgt);
36171+ convert_pfn_mfn(level3_vmalloc_end_pgt);
36172+ convert_pfn_mfn(level3_vmemmap_pgt);
36173 /* L3_k[511][506] -> level1_fixmap_pgt */
36174+ /* L3_k[511][507] -> level1_vsyscall_pgt */
36175 convert_pfn_mfn(level2_fixmap_pgt);
36176 }
36177 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
36178@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36179 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
36180 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
36181 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
36182+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
36183+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
36184+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
36185 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
36186 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
36187+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
36188 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
36189 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
36190- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
36191+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
36192+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
36193+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
36194+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
36195
36196 /* Pin down new L4 */
36197 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
36198@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
36199 pv_mmu_ops.set_pud = xen_set_pud;
36200 #if CONFIG_PGTABLE_LEVELS == 4
36201 pv_mmu_ops.set_pgd = xen_set_pgd;
36202+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
36203 #endif
36204
36205 /* This will work as long as patching hasn't happened yet
36206@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
36207 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
36208 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
36209 .set_pgd = xen_set_pgd_hyper,
36210+ .set_pgd_batched = xen_set_pgd_hyper,
36211
36212 .alloc_pud = xen_alloc_pmd_init,
36213 .release_pud = xen_release_pmd_init,
36214diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
36215index 8648438..18bac20 100644
36216--- a/arch/x86/xen/smp.c
36217+++ b/arch/x86/xen/smp.c
36218@@ -284,17 +284,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36219
36220 if (xen_pv_domain()) {
36221 if (!xen_feature(XENFEAT_writable_page_tables))
36222- /* We've switched to the "real" per-cpu gdt, so make
36223- * sure the old memory can be recycled. */
36224- make_lowmem_page_readwrite(xen_initial_gdt);
36225-
36226 #ifdef CONFIG_X86_32
36227 /*
36228 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36229 * expects __USER_DS
36230 */
36231- loadsegment(ds, __USER_DS);
36232- loadsegment(es, __USER_DS);
36233+ loadsegment(ds, __KERNEL_DS);
36234+ loadsegment(es, __KERNEL_DS);
36235 #endif
36236
36237 xen_filter_cpu_maps();
36238@@ -375,7 +371,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36239 #ifdef CONFIG_X86_32
36240 /* Note: PVH is not yet supported on x86_32. */
36241 ctxt->user_regs.fs = __KERNEL_PERCPU;
36242- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36243+ savesegment(gs, ctxt->user_regs.gs);
36244 #endif
36245 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36246
36247@@ -383,8 +379,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36248 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36249 ctxt->flags = VGCF_IN_KERNEL;
36250 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36251- ctxt->user_regs.ds = __USER_DS;
36252- ctxt->user_regs.es = __USER_DS;
36253+ ctxt->user_regs.ds = __KERNEL_DS;
36254+ ctxt->user_regs.es = __KERNEL_DS;
36255 ctxt->user_regs.ss = __KERNEL_DS;
36256
36257 xen_copy_trap_info(ctxt->trap_ctxt);
36258@@ -720,7 +716,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36259
36260 void __init xen_smp_init(void)
36261 {
36262- smp_ops = xen_smp_ops;
36263+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36264 xen_fill_possible_map();
36265 }
36266
36267diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36268index fd92a64..1f72641 100644
36269--- a/arch/x86/xen/xen-asm_32.S
36270+++ b/arch/x86/xen/xen-asm_32.S
36271@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36272 pushw %fs
36273 movl $(__KERNEL_PERCPU), %eax
36274 movl %eax, %fs
36275- movl %fs:xen_vcpu, %eax
36276+ mov PER_CPU_VAR(xen_vcpu), %eax
36277 POP_FS
36278 #else
36279 movl %ss:xen_vcpu, %eax
36280diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36281index 8afdfcc..79239db 100644
36282--- a/arch/x86/xen/xen-head.S
36283+++ b/arch/x86/xen/xen-head.S
36284@@ -41,6 +41,17 @@ ENTRY(startup_xen)
36285 #ifdef CONFIG_X86_32
36286 mov %esi,xen_start_info
36287 mov $init_thread_union+THREAD_SIZE,%esp
36288+#ifdef CONFIG_SMP
36289+ movl $cpu_gdt_table,%edi
36290+ movl $__per_cpu_load,%eax
36291+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36292+ rorl $16,%eax
36293+ movb %al,__KERNEL_PERCPU + 4(%edi)
36294+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36295+ movl $__per_cpu_end - 1,%eax
36296+ subl $__per_cpu_start,%eax
36297+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36298+#endif
36299 #else
36300 mov %rsi,xen_start_info
36301 mov $init_thread_union+THREAD_SIZE,%rsp
36302diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36303index 9e195c6..523ed36 100644
36304--- a/arch/x86/xen/xen-ops.h
36305+++ b/arch/x86/xen/xen-ops.h
36306@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36307 void xen_syscall32_target(void);
36308 #endif
36309
36310-extern void *xen_initial_gdt;
36311-
36312 struct trap_info;
36313 void xen_copy_trap_info(struct trap_info *traps);
36314
36315diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36316index 525bd3d..ef888b1 100644
36317--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36318+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36319@@ -119,9 +119,9 @@
36320 ----------------------------------------------------------------------*/
36321
36322 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36323-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36324 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36325 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36326+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36327
36328 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36329 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36330diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36331index 2f33760..835e50a 100644
36332--- a/arch/xtensa/variants/fsf/include/variant/core.h
36333+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36334@@ -11,6 +11,7 @@
36335 #ifndef _XTENSA_CORE_H
36336 #define _XTENSA_CORE_H
36337
36338+#include <linux/const.h>
36339
36340 /****************************************************************************
36341 Parameters Useful for Any Code, USER or PRIVILEGED
36342@@ -112,9 +113,9 @@
36343 ----------------------------------------------------------------------*/
36344
36345 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36346-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36347 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36348 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36349+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36350
36351 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36352 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36353diff --git a/block/bio.c b/block/bio.c
36354index f66a4ea..73ddf55 100644
36355--- a/block/bio.c
36356+++ b/block/bio.c
36357@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36358 /*
36359 * Overflow, abort
36360 */
36361- if (end < start)
36362+ if (end < start || end - start > INT_MAX - nr_pages)
36363 return ERR_PTR(-EINVAL);
36364
36365 nr_pages += end - start;
36366@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36367 /*
36368 * Overflow, abort
36369 */
36370- if (end < start)
36371+ if (end < start || end - start > INT_MAX - nr_pages)
36372 return ERR_PTR(-EINVAL);
36373
36374 nr_pages += end - start;
36375diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36376index 0736729..2ec3b48 100644
36377--- a/block/blk-iopoll.c
36378+++ b/block/blk-iopoll.c
36379@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36380 }
36381 EXPORT_SYMBOL(blk_iopoll_complete);
36382
36383-static void blk_iopoll_softirq(struct softirq_action *h)
36384+static __latent_entropy void blk_iopoll_softirq(void)
36385 {
36386 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36387 int rearm = 0, budget = blk_iopoll_budget;
36388diff --git a/block/blk-map.c b/block/blk-map.c
36389index da310a1..213b5c9 100644
36390--- a/block/blk-map.c
36391+++ b/block/blk-map.c
36392@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36393 if (!len || !kbuf)
36394 return -EINVAL;
36395
36396- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36397+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36398 if (do_copy)
36399 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36400 else
36401diff --git a/block/blk-mq.c b/block/blk-mq.c
36402index 594eea0..2dc1fd6 100644
36403--- a/block/blk-mq.c
36404+++ b/block/blk-mq.c
36405@@ -1968,7 +1968,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
36406 goto err_hctxs;
36407
36408 setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);
36409- blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000);
36410+ blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ);
36411
36412 q->nr_queues = nr_cpu_ids;
36413 q->nr_hw_queues = set->nr_hw_queues;
36414diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36415index 53b1737..08177d2e 100644
36416--- a/block/blk-softirq.c
36417+++ b/block/blk-softirq.c
36418@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36419 * Softirq action handler - move entries to local list and loop over them
36420 * while passing them to the queue registered handler.
36421 */
36422-static void blk_done_softirq(struct softirq_action *h)
36423+static __latent_entropy void blk_done_softirq(void)
36424 {
36425 struct list_head *cpu_list, local_list;
36426
36427diff --git a/block/bsg.c b/block/bsg.c
36428index d214e92..9649863 100644
36429--- a/block/bsg.c
36430+++ b/block/bsg.c
36431@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36432 struct sg_io_v4 *hdr, struct bsg_device *bd,
36433 fmode_t has_write_perm)
36434 {
36435+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36436+ unsigned char *cmdptr;
36437+
36438 if (hdr->request_len > BLK_MAX_CDB) {
36439 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36440 if (!rq->cmd)
36441 return -ENOMEM;
36442- }
36443+ cmdptr = rq->cmd;
36444+ } else
36445+ cmdptr = tmpcmd;
36446
36447- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36448+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36449 hdr->request_len))
36450 return -EFAULT;
36451
36452+ if (cmdptr != rq->cmd)
36453+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36454+
36455 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36456 if (blk_verify_command(rq->cmd, has_write_perm))
36457 return -EPERM;
36458diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36459index f678c73..f35aa18 100644
36460--- a/block/compat_ioctl.c
36461+++ b/block/compat_ioctl.c
36462@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36463 cgc = compat_alloc_user_space(sizeof(*cgc));
36464 cgc32 = compat_ptr(arg);
36465
36466- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36467+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36468 get_user(data, &cgc32->buffer) ||
36469 put_user(compat_ptr(data), &cgc->buffer) ||
36470 copy_in_user(&cgc->buflen, &cgc32->buflen,
36471@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36472 err |= __get_user(f->spec1, &uf->spec1);
36473 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36474 err |= __get_user(name, &uf->name);
36475- f->name = compat_ptr(name);
36476+ f->name = (void __force_kernel *)compat_ptr(name);
36477 if (err) {
36478 err = -EFAULT;
36479 goto out;
36480diff --git a/block/genhd.c b/block/genhd.c
36481index ea982ea..86e0f9e 100644
36482--- a/block/genhd.c
36483+++ b/block/genhd.c
36484@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36485
36486 /*
36487 * Register device numbers dev..(dev+range-1)
36488- * range must be nonzero
36489+ * Noop if @range is zero.
36490 * The hash chain is sorted on range, so that subranges can override.
36491 */
36492 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36493 struct kobject *(*probe)(dev_t, int *, void *),
36494 int (*lock)(dev_t, void *), void *data)
36495 {
36496- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36497+ if (range)
36498+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36499 }
36500
36501 EXPORT_SYMBOL(blk_register_region);
36502
36503+/* undo blk_register_region(), noop if @range is zero */
36504 void blk_unregister_region(dev_t devt, unsigned long range)
36505 {
36506- kobj_unmap(bdev_map, devt, range);
36507+ if (range)
36508+ kobj_unmap(bdev_map, devt, range);
36509 }
36510
36511 EXPORT_SYMBOL(blk_unregister_region);
36512diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36513index 26cb624..a49c3a5 100644
36514--- a/block/partitions/efi.c
36515+++ b/block/partitions/efi.c
36516@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36517 if (!gpt)
36518 return NULL;
36519
36520+ if (!le32_to_cpu(gpt->num_partition_entries))
36521+ return NULL;
36522+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36523+ if (!pte)
36524+ return NULL;
36525+
36526 count = le32_to_cpu(gpt->num_partition_entries) *
36527 le32_to_cpu(gpt->sizeof_partition_entry);
36528- if (!count)
36529- return NULL;
36530- pte = kmalloc(count, GFP_KERNEL);
36531- if (!pte)
36532- return NULL;
36533-
36534 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36535 (u8 *) pte, count) < count) {
36536 kfree(pte);
36537diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36538index 55b6f15..b602c9a 100644
36539--- a/block/scsi_ioctl.c
36540+++ b/block/scsi_ioctl.c
36541@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36542 return put_user(0, p);
36543 }
36544
36545-static int sg_get_timeout(struct request_queue *q)
36546+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36547 {
36548 return jiffies_to_clock_t(q->sg_timeout);
36549 }
36550@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36551 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36552 struct sg_io_hdr *hdr, fmode_t mode)
36553 {
36554- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36555+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36556+ unsigned char *cmdptr;
36557+
36558+ if (rq->cmd != rq->__cmd)
36559+ cmdptr = rq->cmd;
36560+ else
36561+ cmdptr = tmpcmd;
36562+
36563+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36564 return -EFAULT;
36565+
36566+ if (cmdptr != rq->cmd)
36567+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36568+
36569 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36570 return -EPERM;
36571
36572@@ -420,6 +432,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36573 int err;
36574 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36575 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36576+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36577+ unsigned char *cmdptr;
36578
36579 if (!sic)
36580 return -EINVAL;
36581@@ -458,9 +472,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36582 */
36583 err = -EFAULT;
36584 rq->cmd_len = cmdlen;
36585- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36586+
36587+ if (rq->cmd != rq->__cmd)
36588+ cmdptr = rq->cmd;
36589+ else
36590+ cmdptr = tmpcmd;
36591+
36592+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36593 goto error;
36594
36595+ if (rq->cmd != cmdptr)
36596+ memcpy(rq->cmd, cmdptr, cmdlen);
36597+
36598 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36599 goto error;
36600
36601diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36602index b0602ba..fb71850 100644
36603--- a/crypto/cryptd.c
36604+++ b/crypto/cryptd.c
36605@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36606
36607 struct cryptd_blkcipher_request_ctx {
36608 crypto_completion_t complete;
36609-};
36610+} __no_const;
36611
36612 struct cryptd_hash_ctx {
36613 struct crypto_shash *child;
36614@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36615
36616 struct cryptd_aead_request_ctx {
36617 crypto_completion_t complete;
36618-};
36619+} __no_const;
36620
36621 static void cryptd_queue_worker(struct work_struct *work);
36622
36623diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36624index c305d41..a96de79 100644
36625--- a/crypto/pcrypt.c
36626+++ b/crypto/pcrypt.c
36627@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36628 int ret;
36629
36630 pinst->kobj.kset = pcrypt_kset;
36631- ret = kobject_add(&pinst->kobj, NULL, name);
36632+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36633 if (!ret)
36634 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36635
36636diff --git a/crypto/zlib.c b/crypto/zlib.c
36637index 0eefa9d..0fa3d29 100644
36638--- a/crypto/zlib.c
36639+++ b/crypto/zlib.c
36640@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36641 zlib_comp_exit(ctx);
36642
36643 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36644- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36645+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36646 : MAX_WBITS;
36647 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36648- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36649+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36650 : DEF_MEM_LEVEL;
36651
36652 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36653diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36654index 3b37676..898edfa 100644
36655--- a/drivers/acpi/acpica/hwxfsleep.c
36656+++ b/drivers/acpi/acpica/hwxfsleep.c
36657@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36658 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36659
36660 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36661- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36662- acpi_hw_extended_sleep},
36663- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36664- acpi_hw_extended_wake_prep},
36665- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36666+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36667+ .extended_function = acpi_hw_extended_sleep},
36668+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36669+ .extended_function = acpi_hw_extended_wake_prep},
36670+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36671+ .extended_function = acpi_hw_extended_wake}
36672 };
36673
36674 /*
36675diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36676index 16129c7..8b675cd 100644
36677--- a/drivers/acpi/apei/apei-internal.h
36678+++ b/drivers/acpi/apei/apei-internal.h
36679@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36680 struct apei_exec_ins_type {
36681 u32 flags;
36682 apei_exec_ins_func_t run;
36683-};
36684+} __do_const;
36685
36686 struct apei_exec_context {
36687 u32 ip;
36688diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36689index e82d097..0c855c1 100644
36690--- a/drivers/acpi/apei/ghes.c
36691+++ b/drivers/acpi/apei/ghes.c
36692@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36693 const struct acpi_hest_generic *generic,
36694 const struct acpi_hest_generic_status *estatus)
36695 {
36696- static atomic_t seqno;
36697+ static atomic_unchecked_t seqno;
36698 unsigned int curr_seqno;
36699 char pfx_seq[64];
36700
36701@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36702 else
36703 pfx = KERN_ERR;
36704 }
36705- curr_seqno = atomic_inc_return(&seqno);
36706+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36707 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36708 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36709 pfx_seq, generic->header.source_id);
36710diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36711index a83e3c6..c3d617f 100644
36712--- a/drivers/acpi/bgrt.c
36713+++ b/drivers/acpi/bgrt.c
36714@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36715 if (!bgrt_image)
36716 return -ENODEV;
36717
36718- bin_attr_image.private = bgrt_image;
36719- bin_attr_image.size = bgrt_image_size;
36720+ pax_open_kernel();
36721+ *(void **)&bin_attr_image.private = bgrt_image;
36722+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36723+ pax_close_kernel();
36724
36725 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36726 if (!bgrt_kobj)
36727diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36728index 1d17919..315e955 100644
36729--- a/drivers/acpi/blacklist.c
36730+++ b/drivers/acpi/blacklist.c
36731@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36732 u32 is_critical_error;
36733 };
36734
36735-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36736+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36737
36738 /*
36739 * POLICY: If *anything* doesn't work, put it on the blacklist.
36740@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36741 return 0;
36742 }
36743
36744-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36745+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36746 {
36747 .callback = dmi_disable_osi_vista,
36748 .ident = "Fujitsu Siemens",
36749diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36750index 513e7230e..802015a 100644
36751--- a/drivers/acpi/bus.c
36752+++ b/drivers/acpi/bus.c
36753@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36754 }
36755 #endif
36756
36757-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36758+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36759 /*
36760 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36761 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36762@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36763 {}
36764 };
36765 #else
36766-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36767+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36768 {}
36769 };
36770 #endif
36771diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36772index c68e724..e863008 100644
36773--- a/drivers/acpi/custom_method.c
36774+++ b/drivers/acpi/custom_method.c
36775@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36776 struct acpi_table_header table;
36777 acpi_status status;
36778
36779+#ifdef CONFIG_GRKERNSEC_KMEM
36780+ return -EPERM;
36781+#endif
36782+
36783 if (!(*ppos)) {
36784 /* parse the table header to get the table length */
36785 if (count <= sizeof(struct acpi_table_header))
36786diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36787index 8217e0b..3294cb6 100644
36788--- a/drivers/acpi/device_pm.c
36789+++ b/drivers/acpi/device_pm.c
36790@@ -1026,6 +1026,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36791
36792 #endif /* CONFIG_PM_SLEEP */
36793
36794+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36795+
36796 static struct dev_pm_domain acpi_general_pm_domain = {
36797 .ops = {
36798 .runtime_suspend = acpi_subsys_runtime_suspend,
36799@@ -1042,6 +1044,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36800 .restore_early = acpi_subsys_resume_early,
36801 #endif
36802 },
36803+ .detach = acpi_dev_pm_detach
36804 };
36805
36806 /**
36807@@ -1111,7 +1114,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36808 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36809 }
36810
36811- dev->pm_domain->detach = acpi_dev_pm_detach;
36812 return 0;
36813 }
36814 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36815diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36816index 5e8fed4..d9bb545 100644
36817--- a/drivers/acpi/ec.c
36818+++ b/drivers/acpi/ec.c
36819@@ -1293,7 +1293,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36820 return 0;
36821 }
36822
36823-static struct dmi_system_id ec_dmi_table[] __initdata = {
36824+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36825 {
36826 ec_skip_dsdt_scan, "Compal JFL92", {
36827 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36828diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36829index 139d9e4..9a9d799 100644
36830--- a/drivers/acpi/pci_slot.c
36831+++ b/drivers/acpi/pci_slot.c
36832@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36833 return 0;
36834 }
36835
36836-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36837+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36838 /*
36839 * Fujitsu Primequest machines will return 1023 to indicate an
36840 * error if the _SUN method is evaluated on SxFy objects that
36841diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36842index d9f7158..168e742 100644
36843--- a/drivers/acpi/processor_driver.c
36844+++ b/drivers/acpi/processor_driver.c
36845@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36846 return NOTIFY_OK;
36847 }
36848
36849-static struct notifier_block __refdata acpi_cpu_notifier = {
36850+static struct notifier_block __refconst acpi_cpu_notifier = {
36851 .notifier_call = acpi_cpu_soft_notify,
36852 };
36853
36854diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36855index 39e0c8e..b5ae20c 100644
36856--- a/drivers/acpi/processor_idle.c
36857+++ b/drivers/acpi/processor_idle.c
36858@@ -910,7 +910,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36859 {
36860 int i, count = CPUIDLE_DRIVER_STATE_START;
36861 struct acpi_processor_cx *cx;
36862- struct cpuidle_state *state;
36863+ cpuidle_state_no_const *state;
36864 struct cpuidle_driver *drv = &acpi_idle_driver;
36865
36866 if (!pr->flags.power_setup_done)
36867diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36868index e5dd808..1eceed1 100644
36869--- a/drivers/acpi/processor_pdc.c
36870+++ b/drivers/acpi/processor_pdc.c
36871@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36872 return 0;
36873 }
36874
36875-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36876+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36877 {
36878 set_no_mwait, "Extensa 5220", {
36879 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36880diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36881index 2f0d4db..b9e9b15 100644
36882--- a/drivers/acpi/sleep.c
36883+++ b/drivers/acpi/sleep.c
36884@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36885 return 0;
36886 }
36887
36888-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36889+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36890 {
36891 .callback = init_old_suspend_ordering,
36892 .ident = "Abit KN9 (nForce4 variant)",
36893diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36894index 0876d77b..3ba0127 100644
36895--- a/drivers/acpi/sysfs.c
36896+++ b/drivers/acpi/sysfs.c
36897@@ -423,11 +423,11 @@ static u32 num_counters;
36898 static struct attribute **all_attrs;
36899 static u32 acpi_gpe_count;
36900
36901-static struct attribute_group interrupt_stats_attr_group = {
36902+static attribute_group_no_const interrupt_stats_attr_group = {
36903 .name = "interrupts",
36904 };
36905
36906-static struct kobj_attribute *counter_attrs;
36907+static kobj_attribute_no_const *counter_attrs;
36908
36909 static void delete_gpe_attr_array(void)
36910 {
36911diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36912index d24fa19..782f1e6 100644
36913--- a/drivers/acpi/thermal.c
36914+++ b/drivers/acpi/thermal.c
36915@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36916 return 0;
36917 }
36918
36919-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36920+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36921 /*
36922 * Award BIOS on this AOpen makes thermal control almost worthless.
36923 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36924diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36925index cc79d3f..28adb33 100644
36926--- a/drivers/acpi/video.c
36927+++ b/drivers/acpi/video.c
36928@@ -431,7 +431,7 @@ static int __init video_enable_native_backlight(const struct dmi_system_id *d)
36929 return 0;
36930 }
36931
36932-static struct dmi_system_id video_dmi_table[] __initdata = {
36933+static const struct dmi_system_id video_dmi_table[] __initconst = {
36934 /*
36935 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36936 */
36937diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36938index 287c4ba..6a600bc 100644
36939--- a/drivers/ata/libahci.c
36940+++ b/drivers/ata/libahci.c
36941@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36942 }
36943 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36944
36945-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36946+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36947 struct ata_taskfile *tf, int is_cmd, u16 flags,
36948 unsigned long timeout_msec)
36949 {
36950diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36951index 577849c..920847c 100644
36952--- a/drivers/ata/libata-core.c
36953+++ b/drivers/ata/libata-core.c
36954@@ -102,7 +102,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36955 static void ata_dev_xfermask(struct ata_device *dev);
36956 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36957
36958-atomic_t ata_print_id = ATOMIC_INIT(0);
36959+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36960
36961 struct ata_force_param {
36962 const char *name;
36963@@ -4801,7 +4801,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36964 struct ata_port *ap;
36965 unsigned int tag;
36966
36967- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36968+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36969 ap = qc->ap;
36970
36971 qc->flags = 0;
36972@@ -4818,7 +4818,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36973 struct ata_port *ap;
36974 struct ata_link *link;
36975
36976- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36977+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36978 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36979 ap = qc->ap;
36980 link = qc->dev->link;
36981@@ -5925,6 +5925,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36982 return;
36983
36984 spin_lock(&lock);
36985+ pax_open_kernel();
36986
36987 for (cur = ops->inherits; cur; cur = cur->inherits) {
36988 void **inherit = (void **)cur;
36989@@ -5938,8 +5939,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36990 if (IS_ERR(*pp))
36991 *pp = NULL;
36992
36993- ops->inherits = NULL;
36994+ *(struct ata_port_operations **)&ops->inherits = NULL;
36995
36996+ pax_close_kernel();
36997 spin_unlock(&lock);
36998 }
36999
37000@@ -6135,7 +6137,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
37001
37002 /* give ports names and add SCSI hosts */
37003 for (i = 0; i < host->n_ports; i++) {
37004- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
37005+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
37006 host->ports[i]->local_port_no = i + 1;
37007 }
37008
37009diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
37010index 3131adc..93e7aa0 100644
37011--- a/drivers/ata/libata-scsi.c
37012+++ b/drivers/ata/libata-scsi.c
37013@@ -4209,7 +4209,7 @@ int ata_sas_port_init(struct ata_port *ap)
37014
37015 if (rc)
37016 return rc;
37017- ap->print_id = atomic_inc_return(&ata_print_id);
37018+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
37019 return 0;
37020 }
37021 EXPORT_SYMBOL_GPL(ata_sas_port_init);
37022diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
37023index a998a17..8de4bf4 100644
37024--- a/drivers/ata/libata.h
37025+++ b/drivers/ata/libata.h
37026@@ -53,7 +53,7 @@ enum {
37027 ATA_DNXFER_QUIET = (1 << 31),
37028 };
37029
37030-extern atomic_t ata_print_id;
37031+extern atomic_unchecked_t ata_print_id;
37032 extern int atapi_passthru16;
37033 extern int libata_fua;
37034 extern int libata_noacpi;
37035diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
37036index a9b0c82..207d97d 100644
37037--- a/drivers/ata/pata_arasan_cf.c
37038+++ b/drivers/ata/pata_arasan_cf.c
37039@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
37040 /* Handle platform specific quirks */
37041 if (quirk) {
37042 if (quirk & CF_BROKEN_PIO) {
37043- ap->ops->set_piomode = NULL;
37044+ pax_open_kernel();
37045+ *(void **)&ap->ops->set_piomode = NULL;
37046+ pax_close_kernel();
37047 ap->pio_mask = 0;
37048 }
37049 if (quirk & CF_BROKEN_MWDMA)
37050diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
37051index f9b983a..887b9d8 100644
37052--- a/drivers/atm/adummy.c
37053+++ b/drivers/atm/adummy.c
37054@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
37055 vcc->pop(vcc, skb);
37056 else
37057 dev_kfree_skb_any(skb);
37058- atomic_inc(&vcc->stats->tx);
37059+ atomic_inc_unchecked(&vcc->stats->tx);
37060
37061 return 0;
37062 }
37063diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
37064index f1a9198..f466a4a 100644
37065--- a/drivers/atm/ambassador.c
37066+++ b/drivers/atm/ambassador.c
37067@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
37068 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
37069
37070 // VC layer stats
37071- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37072+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37073
37074 // free the descriptor
37075 kfree (tx_descr);
37076@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
37077 dump_skb ("<<<", vc, skb);
37078
37079 // VC layer stats
37080- atomic_inc(&atm_vcc->stats->rx);
37081+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37082 __net_timestamp(skb);
37083 // end of our responsibility
37084 atm_vcc->push (atm_vcc, skb);
37085@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
37086 } else {
37087 PRINTK (KERN_INFO, "dropped over-size frame");
37088 // should we count this?
37089- atomic_inc(&atm_vcc->stats->rx_drop);
37090+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37091 }
37092
37093 } else {
37094@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
37095 }
37096
37097 if (check_area (skb->data, skb->len)) {
37098- atomic_inc(&atm_vcc->stats->tx_err);
37099+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
37100 return -ENOMEM; // ?
37101 }
37102
37103diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
37104index 480fa6f..947067c 100644
37105--- a/drivers/atm/atmtcp.c
37106+++ b/drivers/atm/atmtcp.c
37107@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37108 if (vcc->pop) vcc->pop(vcc,skb);
37109 else dev_kfree_skb(skb);
37110 if (dev_data) return 0;
37111- atomic_inc(&vcc->stats->tx_err);
37112+ atomic_inc_unchecked(&vcc->stats->tx_err);
37113 return -ENOLINK;
37114 }
37115 size = skb->len+sizeof(struct atmtcp_hdr);
37116@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37117 if (!new_skb) {
37118 if (vcc->pop) vcc->pop(vcc,skb);
37119 else dev_kfree_skb(skb);
37120- atomic_inc(&vcc->stats->tx_err);
37121+ atomic_inc_unchecked(&vcc->stats->tx_err);
37122 return -ENOBUFS;
37123 }
37124 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
37125@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37126 if (vcc->pop) vcc->pop(vcc,skb);
37127 else dev_kfree_skb(skb);
37128 out_vcc->push(out_vcc,new_skb);
37129- atomic_inc(&vcc->stats->tx);
37130- atomic_inc(&out_vcc->stats->rx);
37131+ atomic_inc_unchecked(&vcc->stats->tx);
37132+ atomic_inc_unchecked(&out_vcc->stats->rx);
37133 return 0;
37134 }
37135
37136@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37137 read_unlock(&vcc_sklist_lock);
37138 if (!out_vcc) {
37139 result = -EUNATCH;
37140- atomic_inc(&vcc->stats->tx_err);
37141+ atomic_inc_unchecked(&vcc->stats->tx_err);
37142 goto done;
37143 }
37144 skb_pull(skb,sizeof(struct atmtcp_hdr));
37145@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37146 __net_timestamp(new_skb);
37147 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
37148 out_vcc->push(out_vcc,new_skb);
37149- atomic_inc(&vcc->stats->tx);
37150- atomic_inc(&out_vcc->stats->rx);
37151+ atomic_inc_unchecked(&vcc->stats->tx);
37152+ atomic_inc_unchecked(&out_vcc->stats->rx);
37153 done:
37154 if (vcc->pop) vcc->pop(vcc,skb);
37155 else dev_kfree_skb(skb);
37156diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
37157index 6339efd..2b441d5 100644
37158--- a/drivers/atm/eni.c
37159+++ b/drivers/atm/eni.c
37160@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
37161 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
37162 vcc->dev->number);
37163 length = 0;
37164- atomic_inc(&vcc->stats->rx_err);
37165+ atomic_inc_unchecked(&vcc->stats->rx_err);
37166 }
37167 else {
37168 length = ATM_CELL_SIZE-1; /* no HEC */
37169@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37170 size);
37171 }
37172 eff = length = 0;
37173- atomic_inc(&vcc->stats->rx_err);
37174+ atomic_inc_unchecked(&vcc->stats->rx_err);
37175 }
37176 else {
37177 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
37178@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37179 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
37180 vcc->dev->number,vcc->vci,length,size << 2,descr);
37181 length = eff = 0;
37182- atomic_inc(&vcc->stats->rx_err);
37183+ atomic_inc_unchecked(&vcc->stats->rx_err);
37184 }
37185 }
37186 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
37187@@ -770,7 +770,7 @@ rx_dequeued++;
37188 vcc->push(vcc,skb);
37189 pushed++;
37190 }
37191- atomic_inc(&vcc->stats->rx);
37192+ atomic_inc_unchecked(&vcc->stats->rx);
37193 }
37194 wake_up(&eni_dev->rx_wait);
37195 }
37196@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
37197 DMA_TO_DEVICE);
37198 if (vcc->pop) vcc->pop(vcc,skb);
37199 else dev_kfree_skb_irq(skb);
37200- atomic_inc(&vcc->stats->tx);
37201+ atomic_inc_unchecked(&vcc->stats->tx);
37202 wake_up(&eni_dev->tx_wait);
37203 dma_complete++;
37204 }
37205diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37206index 82f2ae0..f205c02 100644
37207--- a/drivers/atm/firestream.c
37208+++ b/drivers/atm/firestream.c
37209@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37210 }
37211 }
37212
37213- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37214+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37215
37216 fs_dprintk (FS_DEBUG_TXMEM, "i");
37217 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37218@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37219 #endif
37220 skb_put (skb, qe->p1 & 0xffff);
37221 ATM_SKB(skb)->vcc = atm_vcc;
37222- atomic_inc(&atm_vcc->stats->rx);
37223+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37224 __net_timestamp(skb);
37225 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37226 atm_vcc->push (atm_vcc, skb);
37227@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37228 kfree (pe);
37229 }
37230 if (atm_vcc)
37231- atomic_inc(&atm_vcc->stats->rx_drop);
37232+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37233 break;
37234 case 0x1f: /* Reassembly abort: no buffers. */
37235 /* Silently increment error counter. */
37236 if (atm_vcc)
37237- atomic_inc(&atm_vcc->stats->rx_drop);
37238+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37239 break;
37240 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37241 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37242diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37243index 75dde90..4309ead 100644
37244--- a/drivers/atm/fore200e.c
37245+++ b/drivers/atm/fore200e.c
37246@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37247 #endif
37248 /* check error condition */
37249 if (*entry->status & STATUS_ERROR)
37250- atomic_inc(&vcc->stats->tx_err);
37251+ atomic_inc_unchecked(&vcc->stats->tx_err);
37252 else
37253- atomic_inc(&vcc->stats->tx);
37254+ atomic_inc_unchecked(&vcc->stats->tx);
37255 }
37256 }
37257
37258@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37259 if (skb == NULL) {
37260 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37261
37262- atomic_inc(&vcc->stats->rx_drop);
37263+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37264 return -ENOMEM;
37265 }
37266
37267@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37268
37269 dev_kfree_skb_any(skb);
37270
37271- atomic_inc(&vcc->stats->rx_drop);
37272+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37273 return -ENOMEM;
37274 }
37275
37276 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37277
37278 vcc->push(vcc, skb);
37279- atomic_inc(&vcc->stats->rx);
37280+ atomic_inc_unchecked(&vcc->stats->rx);
37281
37282 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37283
37284@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37285 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37286 fore200e->atm_dev->number,
37287 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37288- atomic_inc(&vcc->stats->rx_err);
37289+ atomic_inc_unchecked(&vcc->stats->rx_err);
37290 }
37291 }
37292
37293@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37294 goto retry_here;
37295 }
37296
37297- atomic_inc(&vcc->stats->tx_err);
37298+ atomic_inc_unchecked(&vcc->stats->tx_err);
37299
37300 fore200e->tx_sat++;
37301 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37302diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37303index 93dca2e..c5daa69 100644
37304--- a/drivers/atm/he.c
37305+++ b/drivers/atm/he.c
37306@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37307
37308 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37309 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37310- atomic_inc(&vcc->stats->rx_drop);
37311+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37312 goto return_host_buffers;
37313 }
37314
37315@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37316 RBRQ_LEN_ERR(he_dev->rbrq_head)
37317 ? "LEN_ERR" : "",
37318 vcc->vpi, vcc->vci);
37319- atomic_inc(&vcc->stats->rx_err);
37320+ atomic_inc_unchecked(&vcc->stats->rx_err);
37321 goto return_host_buffers;
37322 }
37323
37324@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37325 vcc->push(vcc, skb);
37326 spin_lock(&he_dev->global_lock);
37327
37328- atomic_inc(&vcc->stats->rx);
37329+ atomic_inc_unchecked(&vcc->stats->rx);
37330
37331 return_host_buffers:
37332 ++pdus_assembled;
37333@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37334 tpd->vcc->pop(tpd->vcc, tpd->skb);
37335 else
37336 dev_kfree_skb_any(tpd->skb);
37337- atomic_inc(&tpd->vcc->stats->tx_err);
37338+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37339 }
37340 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37341 return;
37342@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37343 vcc->pop(vcc, skb);
37344 else
37345 dev_kfree_skb_any(skb);
37346- atomic_inc(&vcc->stats->tx_err);
37347+ atomic_inc_unchecked(&vcc->stats->tx_err);
37348 return -EINVAL;
37349 }
37350
37351@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37352 vcc->pop(vcc, skb);
37353 else
37354 dev_kfree_skb_any(skb);
37355- atomic_inc(&vcc->stats->tx_err);
37356+ atomic_inc_unchecked(&vcc->stats->tx_err);
37357 return -EINVAL;
37358 }
37359 #endif
37360@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37361 vcc->pop(vcc, skb);
37362 else
37363 dev_kfree_skb_any(skb);
37364- atomic_inc(&vcc->stats->tx_err);
37365+ atomic_inc_unchecked(&vcc->stats->tx_err);
37366 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37367 return -ENOMEM;
37368 }
37369@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37370 vcc->pop(vcc, skb);
37371 else
37372 dev_kfree_skb_any(skb);
37373- atomic_inc(&vcc->stats->tx_err);
37374+ atomic_inc_unchecked(&vcc->stats->tx_err);
37375 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37376 return -ENOMEM;
37377 }
37378@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37379 __enqueue_tpd(he_dev, tpd, cid);
37380 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37381
37382- atomic_inc(&vcc->stats->tx);
37383+ atomic_inc_unchecked(&vcc->stats->tx);
37384
37385 return 0;
37386 }
37387diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37388index 527bbd5..96570c8 100644
37389--- a/drivers/atm/horizon.c
37390+++ b/drivers/atm/horizon.c
37391@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37392 {
37393 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37394 // VC layer stats
37395- atomic_inc(&vcc->stats->rx);
37396+ atomic_inc_unchecked(&vcc->stats->rx);
37397 __net_timestamp(skb);
37398 // end of our responsibility
37399 vcc->push (vcc, skb);
37400@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37401 dev->tx_iovec = NULL;
37402
37403 // VC layer stats
37404- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37405+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37406
37407 // free the skb
37408 hrz_kfree_skb (skb);
37409diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37410index 074616b..d6b3d5f 100644
37411--- a/drivers/atm/idt77252.c
37412+++ b/drivers/atm/idt77252.c
37413@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37414 else
37415 dev_kfree_skb(skb);
37416
37417- atomic_inc(&vcc->stats->tx);
37418+ atomic_inc_unchecked(&vcc->stats->tx);
37419 }
37420
37421 atomic_dec(&scq->used);
37422@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37423 if ((sb = dev_alloc_skb(64)) == NULL) {
37424 printk("%s: Can't allocate buffers for aal0.\n",
37425 card->name);
37426- atomic_add(i, &vcc->stats->rx_drop);
37427+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37428 break;
37429 }
37430 if (!atm_charge(vcc, sb->truesize)) {
37431 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37432 card->name);
37433- atomic_add(i - 1, &vcc->stats->rx_drop);
37434+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37435 dev_kfree_skb(sb);
37436 break;
37437 }
37438@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37439 ATM_SKB(sb)->vcc = vcc;
37440 __net_timestamp(sb);
37441 vcc->push(vcc, sb);
37442- atomic_inc(&vcc->stats->rx);
37443+ atomic_inc_unchecked(&vcc->stats->rx);
37444
37445 cell += ATM_CELL_PAYLOAD;
37446 }
37447@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37448 "(CDC: %08x)\n",
37449 card->name, len, rpp->len, readl(SAR_REG_CDC));
37450 recycle_rx_pool_skb(card, rpp);
37451- atomic_inc(&vcc->stats->rx_err);
37452+ atomic_inc_unchecked(&vcc->stats->rx_err);
37453 return;
37454 }
37455 if (stat & SAR_RSQE_CRC) {
37456 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37457 recycle_rx_pool_skb(card, rpp);
37458- atomic_inc(&vcc->stats->rx_err);
37459+ atomic_inc_unchecked(&vcc->stats->rx_err);
37460 return;
37461 }
37462 if (skb_queue_len(&rpp->queue) > 1) {
37463@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37464 RXPRINTK("%s: Can't alloc RX skb.\n",
37465 card->name);
37466 recycle_rx_pool_skb(card, rpp);
37467- atomic_inc(&vcc->stats->rx_err);
37468+ atomic_inc_unchecked(&vcc->stats->rx_err);
37469 return;
37470 }
37471 if (!atm_charge(vcc, skb->truesize)) {
37472@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37473 __net_timestamp(skb);
37474
37475 vcc->push(vcc, skb);
37476- atomic_inc(&vcc->stats->rx);
37477+ atomic_inc_unchecked(&vcc->stats->rx);
37478
37479 return;
37480 }
37481@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37482 __net_timestamp(skb);
37483
37484 vcc->push(vcc, skb);
37485- atomic_inc(&vcc->stats->rx);
37486+ atomic_inc_unchecked(&vcc->stats->rx);
37487
37488 if (skb->truesize > SAR_FB_SIZE_3)
37489 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37490@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37491 if (vcc->qos.aal != ATM_AAL0) {
37492 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37493 card->name, vpi, vci);
37494- atomic_inc(&vcc->stats->rx_drop);
37495+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37496 goto drop;
37497 }
37498
37499 if ((sb = dev_alloc_skb(64)) == NULL) {
37500 printk("%s: Can't allocate buffers for AAL0.\n",
37501 card->name);
37502- atomic_inc(&vcc->stats->rx_err);
37503+ atomic_inc_unchecked(&vcc->stats->rx_err);
37504 goto drop;
37505 }
37506
37507@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37508 ATM_SKB(sb)->vcc = vcc;
37509 __net_timestamp(sb);
37510 vcc->push(vcc, sb);
37511- atomic_inc(&vcc->stats->rx);
37512+ atomic_inc_unchecked(&vcc->stats->rx);
37513
37514 drop:
37515 skb_pull(queue, 64);
37516@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37517
37518 if (vc == NULL) {
37519 printk("%s: NULL connection in send().\n", card->name);
37520- atomic_inc(&vcc->stats->tx_err);
37521+ atomic_inc_unchecked(&vcc->stats->tx_err);
37522 dev_kfree_skb(skb);
37523 return -EINVAL;
37524 }
37525 if (!test_bit(VCF_TX, &vc->flags)) {
37526 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37527- atomic_inc(&vcc->stats->tx_err);
37528+ atomic_inc_unchecked(&vcc->stats->tx_err);
37529 dev_kfree_skb(skb);
37530 return -EINVAL;
37531 }
37532@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37533 break;
37534 default:
37535 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37536- atomic_inc(&vcc->stats->tx_err);
37537+ atomic_inc_unchecked(&vcc->stats->tx_err);
37538 dev_kfree_skb(skb);
37539 return -EINVAL;
37540 }
37541
37542 if (skb_shinfo(skb)->nr_frags != 0) {
37543 printk("%s: No scatter-gather yet.\n", card->name);
37544- atomic_inc(&vcc->stats->tx_err);
37545+ atomic_inc_unchecked(&vcc->stats->tx_err);
37546 dev_kfree_skb(skb);
37547 return -EINVAL;
37548 }
37549@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37550
37551 err = queue_skb(card, vc, skb, oam);
37552 if (err) {
37553- atomic_inc(&vcc->stats->tx_err);
37554+ atomic_inc_unchecked(&vcc->stats->tx_err);
37555 dev_kfree_skb(skb);
37556 return err;
37557 }
37558@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37559 skb = dev_alloc_skb(64);
37560 if (!skb) {
37561 printk("%s: Out of memory in send_oam().\n", card->name);
37562- atomic_inc(&vcc->stats->tx_err);
37563+ atomic_inc_unchecked(&vcc->stats->tx_err);
37564 return -ENOMEM;
37565 }
37566 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37567diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37568index 924f8e2..3375a3e 100644
37569--- a/drivers/atm/iphase.c
37570+++ b/drivers/atm/iphase.c
37571@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37572 status = (u_short) (buf_desc_ptr->desc_mode);
37573 if (status & (RX_CER | RX_PTE | RX_OFL))
37574 {
37575- atomic_inc(&vcc->stats->rx_err);
37576+ atomic_inc_unchecked(&vcc->stats->rx_err);
37577 IF_ERR(printk("IA: bad packet, dropping it");)
37578 if (status & RX_CER) {
37579 IF_ERR(printk(" cause: packet CRC error\n");)
37580@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37581 len = dma_addr - buf_addr;
37582 if (len > iadev->rx_buf_sz) {
37583 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37584- atomic_inc(&vcc->stats->rx_err);
37585+ atomic_inc_unchecked(&vcc->stats->rx_err);
37586 goto out_free_desc;
37587 }
37588
37589@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37590 ia_vcc = INPH_IA_VCC(vcc);
37591 if (ia_vcc == NULL)
37592 {
37593- atomic_inc(&vcc->stats->rx_err);
37594+ atomic_inc_unchecked(&vcc->stats->rx_err);
37595 atm_return(vcc, skb->truesize);
37596 dev_kfree_skb_any(skb);
37597 goto INCR_DLE;
37598@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37599 if ((length > iadev->rx_buf_sz) || (length >
37600 (skb->len - sizeof(struct cpcs_trailer))))
37601 {
37602- atomic_inc(&vcc->stats->rx_err);
37603+ atomic_inc_unchecked(&vcc->stats->rx_err);
37604 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37605 length, skb->len);)
37606 atm_return(vcc, skb->truesize);
37607@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37608
37609 IF_RX(printk("rx_dle_intr: skb push");)
37610 vcc->push(vcc,skb);
37611- atomic_inc(&vcc->stats->rx);
37612+ atomic_inc_unchecked(&vcc->stats->rx);
37613 iadev->rx_pkt_cnt++;
37614 }
37615 INCR_DLE:
37616@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37617 {
37618 struct k_sonet_stats *stats;
37619 stats = &PRIV(_ia_dev[board])->sonet_stats;
37620- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37621- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37622- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37623- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37624- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37625- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37626- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37627- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37628- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37629+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37630+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37631+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37632+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37633+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37634+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37635+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37636+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37637+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37638 }
37639 ia_cmds.status = 0;
37640 break;
37641@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37642 if ((desc == 0) || (desc > iadev->num_tx_desc))
37643 {
37644 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37645- atomic_inc(&vcc->stats->tx);
37646+ atomic_inc_unchecked(&vcc->stats->tx);
37647 if (vcc->pop)
37648 vcc->pop(vcc, skb);
37649 else
37650@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37651 ATM_DESC(skb) = vcc->vci;
37652 skb_queue_tail(&iadev->tx_dma_q, skb);
37653
37654- atomic_inc(&vcc->stats->tx);
37655+ atomic_inc_unchecked(&vcc->stats->tx);
37656 iadev->tx_pkt_cnt++;
37657 /* Increment transaction counter */
37658 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37659
37660 #if 0
37661 /* add flow control logic */
37662- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37663+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37664 if (iavcc->vc_desc_cnt > 10) {
37665 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37666 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37667diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37668index ce43ae3..969de38 100644
37669--- a/drivers/atm/lanai.c
37670+++ b/drivers/atm/lanai.c
37671@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37672 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37673 lanai_endtx(lanai, lvcc);
37674 lanai_free_skb(lvcc->tx.atmvcc, skb);
37675- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37676+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37677 }
37678
37679 /* Try to fill the buffer - don't call unless there is backlog */
37680@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37681 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37682 __net_timestamp(skb);
37683 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37684- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37685+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37686 out:
37687 lvcc->rx.buf.ptr = end;
37688 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37689@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37690 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37691 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37692 lanai->stats.service_rxnotaal5++;
37693- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37694+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37695 return 0;
37696 }
37697 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37698@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37699 int bytes;
37700 read_unlock(&vcc_sklist_lock);
37701 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37702- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37703+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37704 lvcc->stats.x.aal5.service_trash++;
37705 bytes = (SERVICE_GET_END(s) * 16) -
37706 (((unsigned long) lvcc->rx.buf.ptr) -
37707@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37708 }
37709 if (s & SERVICE_STREAM) {
37710 read_unlock(&vcc_sklist_lock);
37711- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37712+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37713 lvcc->stats.x.aal5.service_stream++;
37714 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37715 "PDU on VCI %d!\n", lanai->number, vci);
37716@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37717 return 0;
37718 }
37719 DPRINTK("got rx crc error on vci %d\n", vci);
37720- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37721+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37722 lvcc->stats.x.aal5.service_rxcrc++;
37723 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37724 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37725diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37726index ddc4ceb..36e29aa 100644
37727--- a/drivers/atm/nicstar.c
37728+++ b/drivers/atm/nicstar.c
37729@@ -1632,7 +1632,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37730 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37731 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37732 card->index);
37733- atomic_inc(&vcc->stats->tx_err);
37734+ atomic_inc_unchecked(&vcc->stats->tx_err);
37735 dev_kfree_skb_any(skb);
37736 return -EINVAL;
37737 }
37738@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37739 if (!vc->tx) {
37740 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37741 card->index);
37742- atomic_inc(&vcc->stats->tx_err);
37743+ atomic_inc_unchecked(&vcc->stats->tx_err);
37744 dev_kfree_skb_any(skb);
37745 return -EINVAL;
37746 }
37747@@ -1648,14 +1648,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37748 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37749 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37750 card->index);
37751- atomic_inc(&vcc->stats->tx_err);
37752+ atomic_inc_unchecked(&vcc->stats->tx_err);
37753 dev_kfree_skb_any(skb);
37754 return -EINVAL;
37755 }
37756
37757 if (skb_shinfo(skb)->nr_frags != 0) {
37758 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37759- atomic_inc(&vcc->stats->tx_err);
37760+ atomic_inc_unchecked(&vcc->stats->tx_err);
37761 dev_kfree_skb_any(skb);
37762 return -EINVAL;
37763 }
37764@@ -1703,11 +1703,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37765 }
37766
37767 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37768- atomic_inc(&vcc->stats->tx_err);
37769+ atomic_inc_unchecked(&vcc->stats->tx_err);
37770 dev_kfree_skb_any(skb);
37771 return -EIO;
37772 }
37773- atomic_inc(&vcc->stats->tx);
37774+ atomic_inc_unchecked(&vcc->stats->tx);
37775
37776 return 0;
37777 }
37778@@ -2024,14 +2024,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37779 printk
37780 ("nicstar%d: Can't allocate buffers for aal0.\n",
37781 card->index);
37782- atomic_add(i, &vcc->stats->rx_drop);
37783+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37784 break;
37785 }
37786 if (!atm_charge(vcc, sb->truesize)) {
37787 RXPRINTK
37788 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37789 card->index);
37790- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37791+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37792 dev_kfree_skb_any(sb);
37793 break;
37794 }
37795@@ -2046,7 +2046,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37796 ATM_SKB(sb)->vcc = vcc;
37797 __net_timestamp(sb);
37798 vcc->push(vcc, sb);
37799- atomic_inc(&vcc->stats->rx);
37800+ atomic_inc_unchecked(&vcc->stats->rx);
37801 cell += ATM_CELL_PAYLOAD;
37802 }
37803
37804@@ -2063,7 +2063,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37805 if (iovb == NULL) {
37806 printk("nicstar%d: Out of iovec buffers.\n",
37807 card->index);
37808- atomic_inc(&vcc->stats->rx_drop);
37809+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37810 recycle_rx_buf(card, skb);
37811 return;
37812 }
37813@@ -2087,7 +2087,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37814 small or large buffer itself. */
37815 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37816 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37817- atomic_inc(&vcc->stats->rx_err);
37818+ atomic_inc_unchecked(&vcc->stats->rx_err);
37819 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37820 NS_MAX_IOVECS);
37821 NS_PRV_IOVCNT(iovb) = 0;
37822@@ -2107,7 +2107,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37823 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37824 card->index);
37825 which_list(card, skb);
37826- atomic_inc(&vcc->stats->rx_err);
37827+ atomic_inc_unchecked(&vcc->stats->rx_err);
37828 recycle_rx_buf(card, skb);
37829 vc->rx_iov = NULL;
37830 recycle_iov_buf(card, iovb);
37831@@ -2120,7 +2120,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37832 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37833 card->index);
37834 which_list(card, skb);
37835- atomic_inc(&vcc->stats->rx_err);
37836+ atomic_inc_unchecked(&vcc->stats->rx_err);
37837 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37838 NS_PRV_IOVCNT(iovb));
37839 vc->rx_iov = NULL;
37840@@ -2143,7 +2143,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37841 printk(" - PDU size mismatch.\n");
37842 else
37843 printk(".\n");
37844- atomic_inc(&vcc->stats->rx_err);
37845+ atomic_inc_unchecked(&vcc->stats->rx_err);
37846 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37847 NS_PRV_IOVCNT(iovb));
37848 vc->rx_iov = NULL;
37849@@ -2157,14 +2157,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37850 /* skb points to a small buffer */
37851 if (!atm_charge(vcc, skb->truesize)) {
37852 push_rxbufs(card, skb);
37853- atomic_inc(&vcc->stats->rx_drop);
37854+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37855 } else {
37856 skb_put(skb, len);
37857 dequeue_sm_buf(card, skb);
37858 ATM_SKB(skb)->vcc = vcc;
37859 __net_timestamp(skb);
37860 vcc->push(vcc, skb);
37861- atomic_inc(&vcc->stats->rx);
37862+ atomic_inc_unchecked(&vcc->stats->rx);
37863 }
37864 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37865 struct sk_buff *sb;
37866@@ -2175,14 +2175,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37867 if (len <= NS_SMBUFSIZE) {
37868 if (!atm_charge(vcc, sb->truesize)) {
37869 push_rxbufs(card, sb);
37870- atomic_inc(&vcc->stats->rx_drop);
37871+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37872 } else {
37873 skb_put(sb, len);
37874 dequeue_sm_buf(card, sb);
37875 ATM_SKB(sb)->vcc = vcc;
37876 __net_timestamp(sb);
37877 vcc->push(vcc, sb);
37878- atomic_inc(&vcc->stats->rx);
37879+ atomic_inc_unchecked(&vcc->stats->rx);
37880 }
37881
37882 push_rxbufs(card, skb);
37883@@ -2191,7 +2191,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37884
37885 if (!atm_charge(vcc, skb->truesize)) {
37886 push_rxbufs(card, skb);
37887- atomic_inc(&vcc->stats->rx_drop);
37888+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37889 } else {
37890 dequeue_lg_buf(card, skb);
37891 skb_push(skb, NS_SMBUFSIZE);
37892@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37893 ATM_SKB(skb)->vcc = vcc;
37894 __net_timestamp(skb);
37895 vcc->push(vcc, skb);
37896- atomic_inc(&vcc->stats->rx);
37897+ atomic_inc_unchecked(&vcc->stats->rx);
37898 }
37899
37900 push_rxbufs(card, sb);
37901@@ -2222,7 +2222,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37902 printk
37903 ("nicstar%d: Out of huge buffers.\n",
37904 card->index);
37905- atomic_inc(&vcc->stats->rx_drop);
37906+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37907 recycle_iovec_rx_bufs(card,
37908 (struct iovec *)
37909 iovb->data,
37910@@ -2273,7 +2273,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37911 card->hbpool.count++;
37912 } else
37913 dev_kfree_skb_any(hb);
37914- atomic_inc(&vcc->stats->rx_drop);
37915+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37916 } else {
37917 /* Copy the small buffer to the huge buffer */
37918 sb = (struct sk_buff *)iov->iov_base;
37919@@ -2307,7 +2307,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37920 ATM_SKB(hb)->vcc = vcc;
37921 __net_timestamp(hb);
37922 vcc->push(vcc, hb);
37923- atomic_inc(&vcc->stats->rx);
37924+ atomic_inc_unchecked(&vcc->stats->rx);
37925 }
37926 }
37927
37928diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37929index 74e18b0..f16afa0 100644
37930--- a/drivers/atm/solos-pci.c
37931+++ b/drivers/atm/solos-pci.c
37932@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37933 }
37934 atm_charge(vcc, skb->truesize);
37935 vcc->push(vcc, skb);
37936- atomic_inc(&vcc->stats->rx);
37937+ atomic_inc_unchecked(&vcc->stats->rx);
37938 break;
37939
37940 case PKT_STATUS:
37941@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37942 vcc = SKB_CB(oldskb)->vcc;
37943
37944 if (vcc) {
37945- atomic_inc(&vcc->stats->tx);
37946+ atomic_inc_unchecked(&vcc->stats->tx);
37947 solos_pop(vcc, oldskb);
37948 } else {
37949 dev_kfree_skb_irq(oldskb);
37950diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37951index 0215934..ce9f5b1 100644
37952--- a/drivers/atm/suni.c
37953+++ b/drivers/atm/suni.c
37954@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37955
37956
37957 #define ADD_LIMITED(s,v) \
37958- atomic_add((v),&stats->s); \
37959- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37960+ atomic_add_unchecked((v),&stats->s); \
37961+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37962
37963
37964 static void suni_hz(unsigned long from_timer)
37965diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37966index 5120a96..e2572bd 100644
37967--- a/drivers/atm/uPD98402.c
37968+++ b/drivers/atm/uPD98402.c
37969@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37970 struct sonet_stats tmp;
37971 int error = 0;
37972
37973- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37974+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37975 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37976 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37977 if (zero && !error) {
37978@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37979
37980
37981 #define ADD_LIMITED(s,v) \
37982- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37983- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37984- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37985+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37986+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37987+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37988
37989
37990 static void stat_event(struct atm_dev *dev)
37991@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37992 if (reason & uPD98402_INT_PFM) stat_event(dev);
37993 if (reason & uPD98402_INT_PCO) {
37994 (void) GET(PCOCR); /* clear interrupt cause */
37995- atomic_add(GET(HECCT),
37996+ atomic_add_unchecked(GET(HECCT),
37997 &PRIV(dev)->sonet_stats.uncorr_hcs);
37998 }
37999 if ((reason & uPD98402_INT_RFO) &&
38000@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
38001 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
38002 uPD98402_INT_LOS),PIMR); /* enable them */
38003 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
38004- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
38005- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
38006- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
38007+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
38008+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
38009+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
38010 return 0;
38011 }
38012
38013diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
38014index cecfb94..87009ec 100644
38015--- a/drivers/atm/zatm.c
38016+++ b/drivers/atm/zatm.c
38017@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
38018 }
38019 if (!size) {
38020 dev_kfree_skb_irq(skb);
38021- if (vcc) atomic_inc(&vcc->stats->rx_err);
38022+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
38023 continue;
38024 }
38025 if (!atm_charge(vcc,skb->truesize)) {
38026@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
38027 skb->len = size;
38028 ATM_SKB(skb)->vcc = vcc;
38029 vcc->push(vcc,skb);
38030- atomic_inc(&vcc->stats->rx);
38031+ atomic_inc_unchecked(&vcc->stats->rx);
38032 }
38033 zout(pos & 0xffff,MTA(mbx));
38034 #if 0 /* probably a stupid idea */
38035@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
38036 skb_queue_head(&zatm_vcc->backlog,skb);
38037 break;
38038 }
38039- atomic_inc(&vcc->stats->tx);
38040+ atomic_inc_unchecked(&vcc->stats->tx);
38041 wake_up(&zatm_vcc->tx_wait);
38042 }
38043
38044diff --git a/drivers/base/bus.c b/drivers/base/bus.c
38045index 79bc203..fa3945b 100644
38046--- a/drivers/base/bus.c
38047+++ b/drivers/base/bus.c
38048@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
38049 return -EINVAL;
38050
38051 mutex_lock(&subsys->p->mutex);
38052- list_add_tail(&sif->node, &subsys->p->interfaces);
38053+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
38054 if (sif->add_dev) {
38055 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
38056 while ((dev = subsys_dev_iter_next(&iter)))
38057@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
38058 subsys = sif->subsys;
38059
38060 mutex_lock(&subsys->p->mutex);
38061- list_del_init(&sif->node);
38062+ pax_list_del_init((struct list_head *)&sif->node);
38063 if (sif->remove_dev) {
38064 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
38065 while ((dev = subsys_dev_iter_next(&iter)))
38066diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
38067index 68f0314..ca2a609 100644
38068--- a/drivers/base/devtmpfs.c
38069+++ b/drivers/base/devtmpfs.c
38070@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
38071 if (!thread)
38072 return 0;
38073
38074- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
38075+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
38076 if (err)
38077 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
38078 else
38079@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
38080 *err = sys_unshare(CLONE_NEWNS);
38081 if (*err)
38082 goto out;
38083- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
38084+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
38085 if (*err)
38086 goto out;
38087- sys_chdir("/.."); /* will traverse into overmounted root */
38088- sys_chroot(".");
38089+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
38090+ sys_chroot((char __force_user *)".");
38091 complete(&setup_done);
38092 while (1) {
38093 spin_lock(&req_lock);
38094diff --git a/drivers/base/node.c b/drivers/base/node.c
38095index a2aa65b..8831326 100644
38096--- a/drivers/base/node.c
38097+++ b/drivers/base/node.c
38098@@ -613,7 +613,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
38099 struct node_attr {
38100 struct device_attribute attr;
38101 enum node_states state;
38102-};
38103+} __do_const;
38104
38105 static ssize_t show_node_state(struct device *dev,
38106 struct device_attribute *attr, char *buf)
38107diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
38108index 2327613..211d7f5 100644
38109--- a/drivers/base/power/domain.c
38110+++ b/drivers/base/power/domain.c
38111@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
38112 {
38113 struct cpuidle_driver *cpuidle_drv;
38114 struct gpd_cpuidle_data *cpuidle_data;
38115- struct cpuidle_state *idle_state;
38116+ cpuidle_state_no_const *idle_state;
38117 int ret = 0;
38118
38119 if (IS_ERR_OR_NULL(genpd) || state < 0)
38120@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
38121 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
38122 {
38123 struct gpd_cpuidle_data *cpuidle_data;
38124- struct cpuidle_state *idle_state;
38125+ cpuidle_state_no_const *idle_state;
38126 int ret = 0;
38127
38128 if (IS_ERR_OR_NULL(genpd))
38129@@ -2222,8 +2222,11 @@ int genpd_dev_pm_attach(struct device *dev)
38130 return ret;
38131 }
38132
38133- dev->pm_domain->detach = genpd_dev_pm_detach;
38134- dev->pm_domain->sync = genpd_dev_pm_sync;
38135+ pax_open_kernel();
38136+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
38137+ *(void **)&dev->pm_domain->sync = genpd_dev_pm_sync;
38138+ pax_close_kernel();
38139+
38140 pm_genpd_poweron(pd);
38141
38142 return 0;
38143diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
38144index d2be3f9..0a3167a 100644
38145--- a/drivers/base/power/sysfs.c
38146+++ b/drivers/base/power/sysfs.c
38147@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
38148 return -EIO;
38149 }
38150 }
38151- return sprintf(buf, p);
38152+ return sprintf(buf, "%s", p);
38153 }
38154
38155 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
38156diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
38157index 7726200..a417da7 100644
38158--- a/drivers/base/power/wakeup.c
38159+++ b/drivers/base/power/wakeup.c
38160@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
38161 * They need to be modified together atomically, so it's better to use one
38162 * atomic variable to hold them both.
38163 */
38164-static atomic_t combined_event_count = ATOMIC_INIT(0);
38165+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
38166
38167 #define IN_PROGRESS_BITS (sizeof(int) * 4)
38168 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
38169
38170 static void split_counters(unsigned int *cnt, unsigned int *inpr)
38171 {
38172- unsigned int comb = atomic_read(&combined_event_count);
38173+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
38174
38175 *cnt = (comb >> IN_PROGRESS_BITS);
38176 *inpr = comb & MAX_IN_PROGRESS;
38177@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
38178 ws->start_prevent_time = ws->last_time;
38179
38180 /* Increment the counter of events in progress. */
38181- cec = atomic_inc_return(&combined_event_count);
38182+ cec = atomic_inc_return_unchecked(&combined_event_count);
38183
38184 trace_wakeup_source_activate(ws->name, cec);
38185 }
38186@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
38187 * Increment the counter of registered wakeup events and decrement the
38188 * couter of wakeup events in progress simultaneously.
38189 */
38190- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
38191+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
38192 trace_wakeup_source_deactivate(ws->name, cec);
38193
38194 split_counters(&cnt, &inpr);
38195diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
38196index 8d98a32..61d3165 100644
38197--- a/drivers/base/syscore.c
38198+++ b/drivers/base/syscore.c
38199@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38200 void register_syscore_ops(struct syscore_ops *ops)
38201 {
38202 mutex_lock(&syscore_ops_lock);
38203- list_add_tail(&ops->node, &syscore_ops_list);
38204+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38205 mutex_unlock(&syscore_ops_lock);
38206 }
38207 EXPORT_SYMBOL_GPL(register_syscore_ops);
38208@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38209 void unregister_syscore_ops(struct syscore_ops *ops)
38210 {
38211 mutex_lock(&syscore_ops_lock);
38212- list_del(&ops->node);
38213+ pax_list_del((struct list_head *)&ops->node);
38214 mutex_unlock(&syscore_ops_lock);
38215 }
38216 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38217diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38218index ff20f19..018f1da 100644
38219--- a/drivers/block/cciss.c
38220+++ b/drivers/block/cciss.c
38221@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38222 while (!list_empty(&h->reqQ)) {
38223 c = list_entry(h->reqQ.next, CommandList_struct, list);
38224 /* can't do anything if fifo is full */
38225- if ((h->access.fifo_full(h))) {
38226+ if ((h->access->fifo_full(h))) {
38227 dev_warn(&h->pdev->dev, "fifo full\n");
38228 break;
38229 }
38230@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38231 h->Qdepth--;
38232
38233 /* Tell the controller execute command */
38234- h->access.submit_command(h, c);
38235+ h->access->submit_command(h, c);
38236
38237 /* Put job onto the completed Q */
38238 addQ(&h->cmpQ, c);
38239@@ -3444,17 +3444,17 @@ startio:
38240
38241 static inline unsigned long get_next_completion(ctlr_info_t *h)
38242 {
38243- return h->access.command_completed(h);
38244+ return h->access->command_completed(h);
38245 }
38246
38247 static inline int interrupt_pending(ctlr_info_t *h)
38248 {
38249- return h->access.intr_pending(h);
38250+ return h->access->intr_pending(h);
38251 }
38252
38253 static inline long interrupt_not_for_us(ctlr_info_t *h)
38254 {
38255- return ((h->access.intr_pending(h) == 0) ||
38256+ return ((h->access->intr_pending(h) == 0) ||
38257 (h->interrupts_enabled == 0));
38258 }
38259
38260@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38261 u32 a;
38262
38263 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38264- return h->access.command_completed(h);
38265+ return h->access->command_completed(h);
38266
38267 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38268 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38269@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38270 trans_support & CFGTBL_Trans_use_short_tags);
38271
38272 /* Change the access methods to the performant access methods */
38273- h->access = SA5_performant_access;
38274+ h->access = &SA5_performant_access;
38275 h->transMethod = CFGTBL_Trans_Performant;
38276
38277 return;
38278@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38279 if (prod_index < 0)
38280 return -ENODEV;
38281 h->product_name = products[prod_index].product_name;
38282- h->access = *(products[prod_index].access);
38283+ h->access = products[prod_index].access;
38284
38285 if (cciss_board_disabled(h)) {
38286 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38287@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38288 }
38289
38290 /* make sure the board interrupts are off */
38291- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38292+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38293 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38294 if (rc)
38295 goto clean2;
38296@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38297 * fake ones to scoop up any residual completions.
38298 */
38299 spin_lock_irqsave(&h->lock, flags);
38300- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38301+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38302 spin_unlock_irqrestore(&h->lock, flags);
38303 free_irq(h->intr[h->intr_mode], h);
38304 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38305@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38306 dev_info(&h->pdev->dev, "Board READY.\n");
38307 dev_info(&h->pdev->dev,
38308 "Waiting for stale completions to drain.\n");
38309- h->access.set_intr_mask(h, CCISS_INTR_ON);
38310+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38311 msleep(10000);
38312- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38313+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38314
38315 rc = controller_reset_failed(h->cfgtable);
38316 if (rc)
38317@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38318 cciss_scsi_setup(h);
38319
38320 /* Turn the interrupts on so we can service requests */
38321- h->access.set_intr_mask(h, CCISS_INTR_ON);
38322+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38323
38324 /* Get the firmware version */
38325 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38326@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38327 kfree(flush_buf);
38328 if (return_code != IO_OK)
38329 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38330- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38331+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38332 free_irq(h->intr[h->intr_mode], h);
38333 }
38334
38335diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38336index 7fda30e..2f27946 100644
38337--- a/drivers/block/cciss.h
38338+++ b/drivers/block/cciss.h
38339@@ -101,7 +101,7 @@ struct ctlr_info
38340 /* information about each logical volume */
38341 drive_info_struct *drv[CISS_MAX_LUN];
38342
38343- struct access_method access;
38344+ struct access_method *access;
38345
38346 /* queue and queue Info */
38347 struct list_head reqQ;
38348@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38349 }
38350
38351 static struct access_method SA5_access = {
38352- SA5_submit_command,
38353- SA5_intr_mask,
38354- SA5_fifo_full,
38355- SA5_intr_pending,
38356- SA5_completed,
38357+ .submit_command = SA5_submit_command,
38358+ .set_intr_mask = SA5_intr_mask,
38359+ .fifo_full = SA5_fifo_full,
38360+ .intr_pending = SA5_intr_pending,
38361+ .command_completed = SA5_completed,
38362 };
38363
38364 static struct access_method SA5B_access = {
38365- SA5_submit_command,
38366- SA5B_intr_mask,
38367- SA5_fifo_full,
38368- SA5B_intr_pending,
38369- SA5_completed,
38370+ .submit_command = SA5_submit_command,
38371+ .set_intr_mask = SA5B_intr_mask,
38372+ .fifo_full = SA5_fifo_full,
38373+ .intr_pending = SA5B_intr_pending,
38374+ .command_completed = SA5_completed,
38375 };
38376
38377 static struct access_method SA5_performant_access = {
38378- SA5_submit_command,
38379- SA5_performant_intr_mask,
38380- SA5_fifo_full,
38381- SA5_performant_intr_pending,
38382- SA5_performant_completed,
38383+ .submit_command = SA5_submit_command,
38384+ .set_intr_mask = SA5_performant_intr_mask,
38385+ .fifo_full = SA5_fifo_full,
38386+ .intr_pending = SA5_performant_intr_pending,
38387+ .command_completed = SA5_performant_completed,
38388 };
38389
38390 struct board_type {
38391diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38392index f749df9..5f8b9c4 100644
38393--- a/drivers/block/cpqarray.c
38394+++ b/drivers/block/cpqarray.c
38395@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38396 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38397 goto Enomem4;
38398 }
38399- hba[i]->access.set_intr_mask(hba[i], 0);
38400+ hba[i]->access->set_intr_mask(hba[i], 0);
38401 if (request_irq(hba[i]->intr, do_ida_intr, IRQF_SHARED,
38402 hba[i]->devname, hba[i]))
38403 {
38404@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38405 add_timer(&hba[i]->timer);
38406
38407 /* Enable IRQ now that spinlock and rate limit timer are set up */
38408- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38409+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38410
38411 for(j=0; j<NWD; j++) {
38412 struct gendisk *disk = ida_gendisk[i][j];
38413@@ -694,7 +694,7 @@ DBGINFO(
38414 for(i=0; i<NR_PRODUCTS; i++) {
38415 if (board_id == products[i].board_id) {
38416 c->product_name = products[i].product_name;
38417- c->access = *(products[i].access);
38418+ c->access = products[i].access;
38419 break;
38420 }
38421 }
38422@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38423 hba[ctlr]->intr = intr;
38424 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38425 hba[ctlr]->product_name = products[j].product_name;
38426- hba[ctlr]->access = *(products[j].access);
38427+ hba[ctlr]->access = products[j].access;
38428 hba[ctlr]->ctlr = ctlr;
38429 hba[ctlr]->board_id = board_id;
38430 hba[ctlr]->pci_dev = NULL; /* not PCI */
38431@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38432
38433 while((c = h->reqQ) != NULL) {
38434 /* Can't do anything if we're busy */
38435- if (h->access.fifo_full(h) == 0)
38436+ if (h->access->fifo_full(h) == 0)
38437 return;
38438
38439 /* Get the first entry from the request Q */
38440@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38441 h->Qdepth--;
38442
38443 /* Tell the controller to do our bidding */
38444- h->access.submit_command(h, c);
38445+ h->access->submit_command(h, c);
38446
38447 /* Get onto the completion Q */
38448 addQ(&h->cmpQ, c);
38449@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38450 unsigned long flags;
38451 __u32 a,a1;
38452
38453- istat = h->access.intr_pending(h);
38454+ istat = h->access->intr_pending(h);
38455 /* Is this interrupt for us? */
38456 if (istat == 0)
38457 return IRQ_NONE;
38458@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38459 */
38460 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38461 if (istat & FIFO_NOT_EMPTY) {
38462- while((a = h->access.command_completed(h))) {
38463+ while((a = h->access->command_completed(h))) {
38464 a1 = a; a &= ~3;
38465 if ((c = h->cmpQ) == NULL)
38466 {
38467@@ -1448,11 +1448,11 @@ static int sendcmd(
38468 /*
38469 * Disable interrupt
38470 */
38471- info_p->access.set_intr_mask(info_p, 0);
38472+ info_p->access->set_intr_mask(info_p, 0);
38473 /* Make sure there is room in the command FIFO */
38474 /* Actually it should be completely empty at this time. */
38475 for (i = 200000; i > 0; i--) {
38476- temp = info_p->access.fifo_full(info_p);
38477+ temp = info_p->access->fifo_full(info_p);
38478 if (temp != 0) {
38479 break;
38480 }
38481@@ -1465,7 +1465,7 @@ DBG(
38482 /*
38483 * Send the cmd
38484 */
38485- info_p->access.submit_command(info_p, c);
38486+ info_p->access->submit_command(info_p, c);
38487 complete = pollcomplete(ctlr);
38488
38489 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38490@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38491 * we check the new geometry. Then turn interrupts back on when
38492 * we're done.
38493 */
38494- host->access.set_intr_mask(host, 0);
38495+ host->access->set_intr_mask(host, 0);
38496 getgeometry(ctlr);
38497- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38498+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38499
38500 for(i=0; i<NWD; i++) {
38501 struct gendisk *disk = ida_gendisk[ctlr][i];
38502@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38503 /* Wait (up to 2 seconds) for a command to complete */
38504
38505 for (i = 200000; i > 0; i--) {
38506- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38507+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38508 if (done == 0) {
38509 udelay(10); /* a short fixed delay */
38510 } else
38511diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38512index be73e9d..7fbf140 100644
38513--- a/drivers/block/cpqarray.h
38514+++ b/drivers/block/cpqarray.h
38515@@ -99,7 +99,7 @@ struct ctlr_info {
38516 drv_info_t drv[NWD];
38517 struct proc_dir_entry *proc;
38518
38519- struct access_method access;
38520+ struct access_method *access;
38521
38522 cmdlist_t *reqQ;
38523 cmdlist_t *cmpQ;
38524diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38525index 434c77d..6d3219a 100644
38526--- a/drivers/block/drbd/drbd_bitmap.c
38527+++ b/drivers/block/drbd/drbd_bitmap.c
38528@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38529 submit_bio(rw, bio);
38530 /* this should not count as user activity and cause the
38531 * resync to throttle -- see drbd_rs_should_slow_down(). */
38532- atomic_add(len >> 9, &device->rs_sect_ev);
38533+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38534 }
38535 }
38536
38537diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38538index b905e98..0812ed8 100644
38539--- a/drivers/block/drbd/drbd_int.h
38540+++ b/drivers/block/drbd/drbd_int.h
38541@@ -385,7 +385,7 @@ struct drbd_epoch {
38542 struct drbd_connection *connection;
38543 struct list_head list;
38544 unsigned int barrier_nr;
38545- atomic_t epoch_size; /* increased on every request added. */
38546+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38547 atomic_t active; /* increased on every req. added, and dec on every finished. */
38548 unsigned long flags;
38549 };
38550@@ -946,7 +946,7 @@ struct drbd_device {
38551 unsigned int al_tr_number;
38552 int al_tr_cycle;
38553 wait_queue_head_t seq_wait;
38554- atomic_t packet_seq;
38555+ atomic_unchecked_t packet_seq;
38556 unsigned int peer_seq;
38557 spinlock_t peer_seq_lock;
38558 unsigned long comm_bm_set; /* communicated number of set bits. */
38559@@ -955,8 +955,8 @@ struct drbd_device {
38560 struct mutex own_state_mutex;
38561 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38562 char congestion_reason; /* Why we where congested... */
38563- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38564- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38565+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38566+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38567 int rs_last_sect_ev; /* counter to compare with */
38568 int rs_last_events; /* counter of read or write "events" (unit sectors)
38569 * on the lower level device when we last looked. */
38570diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38571index 81fde9e..9948c05 100644
38572--- a/drivers/block/drbd/drbd_main.c
38573+++ b/drivers/block/drbd/drbd_main.c
38574@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38575 p->sector = sector;
38576 p->block_id = block_id;
38577 p->blksize = blksize;
38578- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38579+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38580 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38581 }
38582
38583@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38584 return -EIO;
38585 p->sector = cpu_to_be64(req->i.sector);
38586 p->block_id = (unsigned long)req;
38587- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38588+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38589 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38590 if (device->state.conn >= C_SYNC_SOURCE &&
38591 device->state.conn <= C_PAUSED_SYNC_T)
38592@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38593 atomic_set(&device->unacked_cnt, 0);
38594 atomic_set(&device->local_cnt, 0);
38595 atomic_set(&device->pp_in_use_by_net, 0);
38596- atomic_set(&device->rs_sect_in, 0);
38597- atomic_set(&device->rs_sect_ev, 0);
38598+ atomic_set_unchecked(&device->rs_sect_in, 0);
38599+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38600 atomic_set(&device->ap_in_flight, 0);
38601 atomic_set(&device->md_io.in_use, 0);
38602
38603@@ -2683,8 +2683,8 @@ void drbd_destroy_connection(struct kref *kref)
38604 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38605 struct drbd_resource *resource = connection->resource;
38606
38607- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38608- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38609+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38610+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38611 kfree(connection->current_epoch);
38612
38613 idr_destroy(&connection->peer_devices);
38614diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38615index 74df8cf..e41fc24 100644
38616--- a/drivers/block/drbd/drbd_nl.c
38617+++ b/drivers/block/drbd/drbd_nl.c
38618@@ -3637,13 +3637,13 @@ finish:
38619
38620 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38621 {
38622- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38623+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38624 struct sk_buff *msg;
38625 struct drbd_genlmsghdr *d_out;
38626 unsigned seq;
38627 int err = -ENOMEM;
38628
38629- seq = atomic_inc_return(&drbd_genl_seq);
38630+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38631 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38632 if (!msg)
38633 goto failed;
38634diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38635index cee2035..22f66bd 100644
38636--- a/drivers/block/drbd/drbd_receiver.c
38637+++ b/drivers/block/drbd/drbd_receiver.c
38638@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38639 struct drbd_device *device = peer_device->device;
38640 int err;
38641
38642- atomic_set(&device->packet_seq, 0);
38643+ atomic_set_unchecked(&device->packet_seq, 0);
38644 device->peer_seq = 0;
38645
38646 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38647@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38648 do {
38649 next_epoch = NULL;
38650
38651- epoch_size = atomic_read(&epoch->epoch_size);
38652+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38653
38654 switch (ev & ~EV_CLEANUP) {
38655 case EV_PUT:
38656@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38657 rv = FE_DESTROYED;
38658 } else {
38659 epoch->flags = 0;
38660- atomic_set(&epoch->epoch_size, 0);
38661+ atomic_set_unchecked(&epoch->epoch_size, 0);
38662 /* atomic_set(&epoch->active, 0); is already zero */
38663 if (rv == FE_STILL_LIVE)
38664 rv = FE_RECYCLED;
38665@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38666 conn_wait_active_ee_empty(connection);
38667 drbd_flush(connection);
38668
38669- if (atomic_read(&connection->current_epoch->epoch_size)) {
38670+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38671 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38672 if (epoch)
38673 break;
38674@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38675 }
38676
38677 epoch->flags = 0;
38678- atomic_set(&epoch->epoch_size, 0);
38679+ atomic_set_unchecked(&epoch->epoch_size, 0);
38680 atomic_set(&epoch->active, 0);
38681
38682 spin_lock(&connection->epoch_lock);
38683- if (atomic_read(&connection->current_epoch->epoch_size)) {
38684+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38685 list_add(&epoch->list, &connection->current_epoch->list);
38686 connection->current_epoch = epoch;
38687 connection->epochs++;
38688@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38689 list_add_tail(&peer_req->w.list, &device->sync_ee);
38690 spin_unlock_irq(&device->resource->req_lock);
38691
38692- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38693+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38694 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38695 return 0;
38696
38697@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38698 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38699 }
38700
38701- atomic_add(pi->size >> 9, &device->rs_sect_in);
38702+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38703
38704 return err;
38705 }
38706@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38707
38708 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38709 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38710- atomic_inc(&connection->current_epoch->epoch_size);
38711+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38712 err2 = drbd_drain_block(peer_device, pi->size);
38713 if (!err)
38714 err = err2;
38715@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38716
38717 spin_lock(&connection->epoch_lock);
38718 peer_req->epoch = connection->current_epoch;
38719- atomic_inc(&peer_req->epoch->epoch_size);
38720+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38721 atomic_inc(&peer_req->epoch->active);
38722 spin_unlock(&connection->epoch_lock);
38723
38724@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38725
38726 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38727 (int)part_stat_read(&disk->part0, sectors[1]) -
38728- atomic_read(&device->rs_sect_ev);
38729+ atomic_read_unchecked(&device->rs_sect_ev);
38730
38731 if (atomic_read(&device->ap_actlog_cnt)
38732 || curr_events - device->rs_last_events > 64) {
38733@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38734 device->use_csums = true;
38735 } else if (pi->cmd == P_OV_REPLY) {
38736 /* track progress, we may need to throttle */
38737- atomic_add(size >> 9, &device->rs_sect_in);
38738+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38739 peer_req->w.cb = w_e_end_ov_reply;
38740 dec_rs_pending(device);
38741 /* drbd_rs_begin_io done when we sent this request,
38742@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38743 goto out_free_e;
38744
38745 submit_for_resync:
38746- atomic_add(size >> 9, &device->rs_sect_ev);
38747+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38748
38749 submit:
38750 update_receiver_timing_details(connection, drbd_submit_peer_request);
38751@@ -4564,7 +4564,7 @@ struct data_cmd {
38752 int expect_payload;
38753 size_t pkt_size;
38754 int (*fn)(struct drbd_connection *, struct packet_info *);
38755-};
38756+} __do_const;
38757
38758 static struct data_cmd drbd_cmd_handler[] = {
38759 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38760@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38761 if (!list_empty(&connection->current_epoch->list))
38762 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38763 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38764- atomic_set(&connection->current_epoch->epoch_size, 0);
38765+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38766 connection->send.seen_any_write_yet = false;
38767
38768 drbd_info(connection, "Connection closed\n");
38769@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38770 put_ldev(device);
38771 }
38772 dec_rs_pending(device);
38773- atomic_add(blksize >> 9, &device->rs_sect_in);
38774+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38775
38776 return 0;
38777 }
38778@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38779 struct asender_cmd {
38780 size_t pkt_size;
38781 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38782-};
38783+} __do_const;
38784
38785 static struct asender_cmd asender_tbl[] = {
38786 [P_PING] = { 0, got_Ping },
38787diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38788index d0fae55..4469096 100644
38789--- a/drivers/block/drbd/drbd_worker.c
38790+++ b/drivers/block/drbd/drbd_worker.c
38791@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38792 list_add_tail(&peer_req->w.list, &device->read_ee);
38793 spin_unlock_irq(&device->resource->req_lock);
38794
38795- atomic_add(size >> 9, &device->rs_sect_ev);
38796+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38797 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38798 return 0;
38799
38800@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38801 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38802 int number, mxb;
38803
38804- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38805+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38806 device->rs_in_flight -= sect_in;
38807
38808 rcu_read_lock();
38809@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38810 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38811 struct fifo_buffer *plan;
38812
38813- atomic_set(&device->rs_sect_in, 0);
38814- atomic_set(&device->rs_sect_ev, 0);
38815+ atomic_set_unchecked(&device->rs_sect_in, 0);
38816+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38817 device->rs_in_flight = 0;
38818 device->rs_last_events =
38819 (int)part_stat_read(&disk->part0, sectors[0]) +
38820diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38821index 09e628da..7607aaa 100644
38822--- a/drivers/block/pktcdvd.c
38823+++ b/drivers/block/pktcdvd.c
38824@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38825
38826 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38827 {
38828- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38829+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38830 }
38831
38832 /*
38833@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38834 return -EROFS;
38835 }
38836 pd->settings.fp = ti.fp;
38837- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38838+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38839
38840 if (ti.nwa_v) {
38841 pd->nwa = be32_to_cpu(ti.next_writable);
38842diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38843index ec6c5c6..820ee2abc 100644
38844--- a/drivers/block/rbd.c
38845+++ b/drivers/block/rbd.c
38846@@ -64,7 +64,7 @@
38847 * If the counter is already at its maximum value returns
38848 * -EINVAL without updating it.
38849 */
38850-static int atomic_inc_return_safe(atomic_t *v)
38851+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38852 {
38853 unsigned int counter;
38854
38855diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38856index e5565fb..71be10b4 100644
38857--- a/drivers/block/smart1,2.h
38858+++ b/drivers/block/smart1,2.h
38859@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38860 }
38861
38862 static struct access_method smart4_access = {
38863- smart4_submit_command,
38864- smart4_intr_mask,
38865- smart4_fifo_full,
38866- smart4_intr_pending,
38867- smart4_completed,
38868+ .submit_command = smart4_submit_command,
38869+ .set_intr_mask = smart4_intr_mask,
38870+ .fifo_full = smart4_fifo_full,
38871+ .intr_pending = smart4_intr_pending,
38872+ .command_completed = smart4_completed,
38873 };
38874
38875 /*
38876@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38877 }
38878
38879 static struct access_method smart2_access = {
38880- smart2_submit_command,
38881- smart2_intr_mask,
38882- smart2_fifo_full,
38883- smart2_intr_pending,
38884- smart2_completed,
38885+ .submit_command = smart2_submit_command,
38886+ .set_intr_mask = smart2_intr_mask,
38887+ .fifo_full = smart2_fifo_full,
38888+ .intr_pending = smart2_intr_pending,
38889+ .command_completed = smart2_completed,
38890 };
38891
38892 /*
38893@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38894 }
38895
38896 static struct access_method smart2e_access = {
38897- smart2e_submit_command,
38898- smart2e_intr_mask,
38899- smart2e_fifo_full,
38900- smart2e_intr_pending,
38901- smart2e_completed,
38902+ .submit_command = smart2e_submit_command,
38903+ .set_intr_mask = smart2e_intr_mask,
38904+ .fifo_full = smart2e_fifo_full,
38905+ .intr_pending = smart2e_intr_pending,
38906+ .command_completed = smart2e_completed,
38907 };
38908
38909 /*
38910@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38911 }
38912
38913 static struct access_method smart1_access = {
38914- smart1_submit_command,
38915- smart1_intr_mask,
38916- smart1_fifo_full,
38917- smart1_intr_pending,
38918- smart1_completed,
38919+ .submit_command = smart1_submit_command,
38920+ .set_intr_mask = smart1_intr_mask,
38921+ .fifo_full = smart1_fifo_full,
38922+ .intr_pending = smart1_intr_pending,
38923+ .command_completed = smart1_completed,
38924 };
38925diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38926index 55c135b..9f8d60c 100644
38927--- a/drivers/bluetooth/btwilink.c
38928+++ b/drivers/bluetooth/btwilink.c
38929@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38930
38931 static int bt_ti_probe(struct platform_device *pdev)
38932 {
38933- static struct ti_st *hst;
38934+ struct ti_st *hst;
38935 struct hci_dev *hdev;
38936 int err;
38937
38938diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38939index 5d28a45..a538f90 100644
38940--- a/drivers/cdrom/cdrom.c
38941+++ b/drivers/cdrom/cdrom.c
38942@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38943 ENSURE(reset, CDC_RESET);
38944 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38945 cdi->mc_flags = 0;
38946- cdo->n_minors = 0;
38947 cdi->options = CDO_USE_FFLAGS;
38948
38949 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38950@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38951 else
38952 cdi->cdda_method = CDDA_OLD;
38953
38954- if (!cdo->generic_packet)
38955- cdo->generic_packet = cdrom_dummy_generic_packet;
38956+ if (!cdo->generic_packet) {
38957+ pax_open_kernel();
38958+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38959+ pax_close_kernel();
38960+ }
38961
38962 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38963 mutex_lock(&cdrom_mutex);
38964@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38965 if (cdi->exit)
38966 cdi->exit(cdi);
38967
38968- cdi->ops->n_minors--;
38969 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38970 }
38971
38972@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38973 */
38974 nr = nframes;
38975 do {
38976- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38977+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38978 if (cgc.buffer)
38979 break;
38980
38981@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38982 struct cdrom_device_info *cdi;
38983 int ret;
38984
38985- ret = scnprintf(info + *pos, max_size - *pos, header);
38986+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38987 if (!ret)
38988 return 1;
38989
38990diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38991index 584bc31..e64a12c 100644
38992--- a/drivers/cdrom/gdrom.c
38993+++ b/drivers/cdrom/gdrom.c
38994@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38995 .audio_ioctl = gdrom_audio_ioctl,
38996 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38997 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38998- .n_minors = 1,
38999 };
39000
39001 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
39002diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
39003index a4af822..ed58cd1 100644
39004--- a/drivers/char/Kconfig
39005+++ b/drivers/char/Kconfig
39006@@ -17,7 +17,8 @@ config DEVMEM
39007
39008 config DEVKMEM
39009 bool "/dev/kmem virtual device support"
39010- default y
39011+ default n
39012+ depends on !GRKERNSEC_KMEM
39013 help
39014 Say Y here if you want to support the /dev/kmem device. The
39015 /dev/kmem device is rarely used, but can be used for certain
39016@@ -586,6 +587,7 @@ config DEVPORT
39017 bool
39018 depends on !M68K
39019 depends on ISA || PCI
39020+ depends on !GRKERNSEC_KMEM
39021 default y
39022
39023 source "drivers/s390/char/Kconfig"
39024diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
39025index a48e05b..6bac831 100644
39026--- a/drivers/char/agp/compat_ioctl.c
39027+++ b/drivers/char/agp/compat_ioctl.c
39028@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
39029 return -ENOMEM;
39030 }
39031
39032- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
39033+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
39034 sizeof(*usegment) * ureserve.seg_count)) {
39035 kfree(usegment);
39036 kfree(ksegment);
39037diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
39038index 09f17eb..8531d2f 100644
39039--- a/drivers/char/agp/frontend.c
39040+++ b/drivers/char/agp/frontend.c
39041@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
39042 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
39043 return -EFAULT;
39044
39045- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
39046+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
39047 return -EFAULT;
39048
39049 client = agp_find_client_by_pid(reserve.pid);
39050@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
39051 if (segment == NULL)
39052 return -ENOMEM;
39053
39054- if (copy_from_user(segment, (void __user *) reserve.seg_list,
39055+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
39056 sizeof(struct agp_segment) * reserve.seg_count)) {
39057 kfree(segment);
39058 return -EFAULT;
39059diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
39060index 4f94375..413694e 100644
39061--- a/drivers/char/genrtc.c
39062+++ b/drivers/char/genrtc.c
39063@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
39064 switch (cmd) {
39065
39066 case RTC_PLL_GET:
39067+ memset(&pll, 0, sizeof(pll));
39068 if (get_rtc_pll(&pll))
39069 return -EINVAL;
39070 else
39071diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
39072index 5c0baa9..44011b1 100644
39073--- a/drivers/char/hpet.c
39074+++ b/drivers/char/hpet.c
39075@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
39076 }
39077
39078 static int
39079-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
39080+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
39081 struct hpet_info *info)
39082 {
39083 struct hpet_timer __iomem *timer;
39084diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
39085index a43048b..14724d5 100644
39086--- a/drivers/char/i8k.c
39087+++ b/drivers/char/i8k.c
39088@@ -790,7 +790,7 @@ static const struct i8k_config_data i8k_config_data[] = {
39089 },
39090 };
39091
39092-static struct dmi_system_id i8k_dmi_table[] __initdata = {
39093+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
39094 {
39095 .ident = "Dell Inspiron",
39096 .matches = {
39097diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
39098index bf75f63..359fa10 100644
39099--- a/drivers/char/ipmi/ipmi_msghandler.c
39100+++ b/drivers/char/ipmi/ipmi_msghandler.c
39101@@ -436,7 +436,7 @@ struct ipmi_smi {
39102 struct proc_dir_entry *proc_dir;
39103 char proc_dir_name[10];
39104
39105- atomic_t stats[IPMI_NUM_STATS];
39106+ atomic_unchecked_t stats[IPMI_NUM_STATS];
39107
39108 /*
39109 * run_to_completion duplicate of smb_info, smi_info
39110@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
39111 static DEFINE_MUTEX(smi_watchers_mutex);
39112
39113 #define ipmi_inc_stat(intf, stat) \
39114- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
39115+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
39116 #define ipmi_get_stat(intf, stat) \
39117- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
39118+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
39119
39120 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
39121 "ACPI", "SMBIOS", "PCI",
39122@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
39123 INIT_LIST_HEAD(&intf->cmd_rcvrs);
39124 init_waitqueue_head(&intf->waitq);
39125 for (i = 0; i < IPMI_NUM_STATS; i++)
39126- atomic_set(&intf->stats[i], 0);
39127+ atomic_set_unchecked(&intf->stats[i], 0);
39128
39129 intf->proc_dir = NULL;
39130
39131diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
39132index 8a45e92..e41b1c7 100644
39133--- a/drivers/char/ipmi/ipmi_si_intf.c
39134+++ b/drivers/char/ipmi/ipmi_si_intf.c
39135@@ -289,7 +289,7 @@ struct smi_info {
39136 unsigned char slave_addr;
39137
39138 /* Counters and things for the proc filesystem. */
39139- atomic_t stats[SI_NUM_STATS];
39140+ atomic_unchecked_t stats[SI_NUM_STATS];
39141
39142 struct task_struct *thread;
39143
39144@@ -298,9 +298,9 @@ struct smi_info {
39145 };
39146
39147 #define smi_inc_stat(smi, stat) \
39148- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
39149+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
39150 #define smi_get_stat(smi, stat) \
39151- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
39152+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
39153
39154 #define SI_MAX_PARMS 4
39155
39156@@ -3500,7 +3500,7 @@ static int try_smi_init(struct smi_info *new_smi)
39157 atomic_set(&new_smi->req_events, 0);
39158 new_smi->run_to_completion = false;
39159 for (i = 0; i < SI_NUM_STATS; i++)
39160- atomic_set(&new_smi->stats[i], 0);
39161+ atomic_set_unchecked(&new_smi->stats[i], 0);
39162
39163 new_smi->interrupt_disabled = true;
39164 atomic_set(&new_smi->need_watch, 0);
39165diff --git a/drivers/char/mem.c b/drivers/char/mem.c
39166index 6b1721f..fda9398 100644
39167--- a/drivers/char/mem.c
39168+++ b/drivers/char/mem.c
39169@@ -18,6 +18,7 @@
39170 #include <linux/raw.h>
39171 #include <linux/tty.h>
39172 #include <linux/capability.h>
39173+#include <linux/security.h>
39174 #include <linux/ptrace.h>
39175 #include <linux/device.h>
39176 #include <linux/highmem.h>
39177@@ -36,6 +37,10 @@
39178
39179 #define DEVPORT_MINOR 4
39180
39181+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39182+extern const struct file_operations grsec_fops;
39183+#endif
39184+
39185 static inline unsigned long size_inside_page(unsigned long start,
39186 unsigned long size)
39187 {
39188@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39189
39190 while (cursor < to) {
39191 if (!devmem_is_allowed(pfn)) {
39192+#ifdef CONFIG_GRKERNSEC_KMEM
39193+ gr_handle_mem_readwrite(from, to);
39194+#else
39195 printk(KERN_INFO
39196 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39197 current->comm, from, to);
39198+#endif
39199 return 0;
39200 }
39201 cursor += PAGE_SIZE;
39202@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39203 }
39204 return 1;
39205 }
39206+#elif defined(CONFIG_GRKERNSEC_KMEM)
39207+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39208+{
39209+ return 0;
39210+}
39211 #else
39212 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39213 {
39214@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39215 #endif
39216
39217 while (count > 0) {
39218- unsigned long remaining;
39219+ unsigned long remaining = 0;
39220+ char *temp;
39221
39222 sz = size_inside_page(p, count);
39223
39224@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39225 if (!ptr)
39226 return -EFAULT;
39227
39228- remaining = copy_to_user(buf, ptr, sz);
39229+#ifdef CONFIG_PAX_USERCOPY
39230+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39231+ if (!temp) {
39232+ unxlate_dev_mem_ptr(p, ptr);
39233+ return -ENOMEM;
39234+ }
39235+ remaining = probe_kernel_read(temp, ptr, sz);
39236+#else
39237+ temp = ptr;
39238+#endif
39239+
39240+ if (!remaining)
39241+ remaining = copy_to_user(buf, temp, sz);
39242+
39243+#ifdef CONFIG_PAX_USERCOPY
39244+ kfree(temp);
39245+#endif
39246+
39247 unxlate_dev_mem_ptr(p, ptr);
39248 if (remaining)
39249 return -EFAULT;
39250@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39251 size_t count, loff_t *ppos)
39252 {
39253 unsigned long p = *ppos;
39254- ssize_t low_count, read, sz;
39255+ ssize_t low_count, read, sz, err = 0;
39256 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39257- int err = 0;
39258
39259 read = 0;
39260 if (p < (unsigned long) high_memory) {
39261@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39262 }
39263 #endif
39264 while (low_count > 0) {
39265+ char *temp;
39266+
39267 sz = size_inside_page(p, low_count);
39268
39269 /*
39270@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39271 */
39272 kbuf = xlate_dev_kmem_ptr((void *)p);
39273
39274- if (copy_to_user(buf, kbuf, sz))
39275+#ifdef CONFIG_PAX_USERCOPY
39276+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39277+ if (!temp)
39278+ return -ENOMEM;
39279+ err = probe_kernel_read(temp, kbuf, sz);
39280+#else
39281+ temp = kbuf;
39282+#endif
39283+
39284+ if (!err)
39285+ err = copy_to_user(buf, temp, sz);
39286+
39287+#ifdef CONFIG_PAX_USERCOPY
39288+ kfree(temp);
39289+#endif
39290+
39291+ if (err)
39292 return -EFAULT;
39293 buf += sz;
39294 p += sz;
39295@@ -802,6 +851,9 @@ static const struct memdev {
39296 #ifdef CONFIG_PRINTK
39297 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39298 #endif
39299+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39300+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39301+#endif
39302 };
39303
39304 static int memory_open(struct inode *inode, struct file *filp)
39305@@ -863,7 +915,7 @@ static int __init chr_dev_init(void)
39306 continue;
39307
39308 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39309- NULL, devlist[minor].name);
39310+ NULL, "%s", devlist[minor].name);
39311 }
39312
39313 return tty_init();
39314diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39315index 9df78e2..01ba9ae 100644
39316--- a/drivers/char/nvram.c
39317+++ b/drivers/char/nvram.c
39318@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39319
39320 spin_unlock_irq(&rtc_lock);
39321
39322- if (copy_to_user(buf, contents, tmp - contents))
39323+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39324 return -EFAULT;
39325
39326 *ppos = i;
39327diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39328index 0ea9986..e7b07e4 100644
39329--- a/drivers/char/pcmcia/synclink_cs.c
39330+++ b/drivers/char/pcmcia/synclink_cs.c
39331@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39332
39333 if (debug_level >= DEBUG_LEVEL_INFO)
39334 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39335- __FILE__, __LINE__, info->device_name, port->count);
39336+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39337
39338 if (tty_port_close_start(port, tty, filp) == 0)
39339 goto cleanup;
39340@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39341 cleanup:
39342 if (debug_level >= DEBUG_LEVEL_INFO)
39343 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39344- tty->driver->name, port->count);
39345+ tty->driver->name, atomic_read(&port->count));
39346 }
39347
39348 /* Wait until the transmitter is empty.
39349@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39350
39351 if (debug_level >= DEBUG_LEVEL_INFO)
39352 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39353- __FILE__, __LINE__, tty->driver->name, port->count);
39354+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39355
39356 /* If port is closing, signal caller to try again */
39357 if (port->flags & ASYNC_CLOSING){
39358@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39359 goto cleanup;
39360 }
39361 spin_lock(&port->lock);
39362- port->count++;
39363+ atomic_inc(&port->count);
39364 spin_unlock(&port->lock);
39365 spin_unlock_irqrestore(&info->netlock, flags);
39366
39367- if (port->count == 1) {
39368+ if (atomic_read(&port->count) == 1) {
39369 /* 1st open on this device, init hardware */
39370 retval = startup(info, tty);
39371 if (retval < 0)
39372@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39373 unsigned short new_crctype;
39374
39375 /* return error if TTY interface open */
39376- if (info->port.count)
39377+ if (atomic_read(&info->port.count))
39378 return -EBUSY;
39379
39380 switch (encoding)
39381@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39382
39383 /* arbitrate between network and tty opens */
39384 spin_lock_irqsave(&info->netlock, flags);
39385- if (info->port.count != 0 || info->netcount != 0) {
39386+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39387 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39388 spin_unlock_irqrestore(&info->netlock, flags);
39389 return -EBUSY;
39390@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39391 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39392
39393 /* return error if TTY interface open */
39394- if (info->port.count)
39395+ if (atomic_read(&info->port.count))
39396 return -EBUSY;
39397
39398 if (cmd != SIOCWANDEV)
39399diff --git a/drivers/char/random.c b/drivers/char/random.c
39400index 9cd6968..6416f00 100644
39401--- a/drivers/char/random.c
39402+++ b/drivers/char/random.c
39403@@ -289,9 +289,6 @@
39404 /*
39405 * To allow fractional bits to be tracked, the entropy_count field is
39406 * denominated in units of 1/8th bits.
39407- *
39408- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39409- * credit_entropy_bits() needs to be 64 bits wide.
39410 */
39411 #define ENTROPY_SHIFT 3
39412 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39413@@ -439,9 +436,9 @@ struct entropy_store {
39414 };
39415
39416 static void push_to_pool(struct work_struct *work);
39417-static __u32 input_pool_data[INPUT_POOL_WORDS];
39418-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39419-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39420+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39421+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39422+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39423
39424 static struct entropy_store input_pool = {
39425 .poolinfo = &poolinfo_table[0],
39426@@ -635,7 +632,7 @@ retry:
39427 /* The +2 corresponds to the /4 in the denominator */
39428
39429 do {
39430- unsigned int anfrac = min(pnfrac, pool_size/2);
39431+ u64 anfrac = min(pnfrac, pool_size/2);
39432 unsigned int add =
39433 ((pool_size - entropy_count)*anfrac*3) >> s;
39434
39435@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39436
39437 extract_buf(r, tmp);
39438 i = min_t(int, nbytes, EXTRACT_SIZE);
39439- if (copy_to_user(buf, tmp, i)) {
39440+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39441 ret = -EFAULT;
39442 break;
39443 }
39444@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39445 static int proc_do_uuid(struct ctl_table *table, int write,
39446 void __user *buffer, size_t *lenp, loff_t *ppos)
39447 {
39448- struct ctl_table fake_table;
39449+ ctl_table_no_const fake_table;
39450 unsigned char buf[64], tmp_uuid[16], *uuid;
39451
39452 uuid = table->data;
39453@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39454 static int proc_do_entropy(struct ctl_table *table, int write,
39455 void __user *buffer, size_t *lenp, loff_t *ppos)
39456 {
39457- struct ctl_table fake_table;
39458+ ctl_table_no_const fake_table;
39459 int entropy_count;
39460
39461 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39462diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39463index e496dae..3db53b6 100644
39464--- a/drivers/char/sonypi.c
39465+++ b/drivers/char/sonypi.c
39466@@ -54,6 +54,7 @@
39467
39468 #include <asm/uaccess.h>
39469 #include <asm/io.h>
39470+#include <asm/local.h>
39471
39472 #include <linux/sonypi.h>
39473
39474@@ -490,7 +491,7 @@ static struct sonypi_device {
39475 spinlock_t fifo_lock;
39476 wait_queue_head_t fifo_proc_list;
39477 struct fasync_struct *fifo_async;
39478- int open_count;
39479+ local_t open_count;
39480 int model;
39481 struct input_dev *input_jog_dev;
39482 struct input_dev *input_key_dev;
39483@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39484 static int sonypi_misc_release(struct inode *inode, struct file *file)
39485 {
39486 mutex_lock(&sonypi_device.lock);
39487- sonypi_device.open_count--;
39488+ local_dec(&sonypi_device.open_count);
39489 mutex_unlock(&sonypi_device.lock);
39490 return 0;
39491 }
39492@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39493 {
39494 mutex_lock(&sonypi_device.lock);
39495 /* Flush input queue on first open */
39496- if (!sonypi_device.open_count)
39497+ if (!local_read(&sonypi_device.open_count))
39498 kfifo_reset(&sonypi_device.fifo);
39499- sonypi_device.open_count++;
39500+ local_inc(&sonypi_device.open_count);
39501 mutex_unlock(&sonypi_device.lock);
39502
39503 return 0;
39504@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39505
39506 static struct platform_device *sonypi_platform_device;
39507
39508-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39509+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39510 {
39511 .ident = "Sony Vaio",
39512 .matches = {
39513diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39514index 565a947..dcdc06e 100644
39515--- a/drivers/char/tpm/tpm_acpi.c
39516+++ b/drivers/char/tpm/tpm_acpi.c
39517@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39518 virt = acpi_os_map_iomem(start, len);
39519 if (!virt) {
39520 kfree(log->bios_event_log);
39521+ log->bios_event_log = NULL;
39522 printk("%s: ERROR - Unable to map memory\n", __func__);
39523 return -EIO;
39524 }
39525
39526- memcpy_fromio(log->bios_event_log, virt, len);
39527+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39528
39529 acpi_os_unmap_iomem(virt, len);
39530 return 0;
39531diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39532index 3a56a13..f8cbd25 100644
39533--- a/drivers/char/tpm/tpm_eventlog.c
39534+++ b/drivers/char/tpm/tpm_eventlog.c
39535@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39536 event = addr;
39537
39538 if ((event->event_type == 0 && event->event_size == 0) ||
39539- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39540+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39541 return NULL;
39542
39543 return addr;
39544@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39545 return NULL;
39546
39547 if ((event->event_type == 0 && event->event_size == 0) ||
39548- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39549+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39550 return NULL;
39551
39552 (*pos)++;
39553@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39554 int i;
39555
39556 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39557- seq_putc(m, data[i]);
39558+ if (!seq_putc(m, data[i]))
39559+ return -EFAULT;
39560
39561 return 0;
39562 }
39563diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39564index 50754d20..9561cdc 100644
39565--- a/drivers/char/virtio_console.c
39566+++ b/drivers/char/virtio_console.c
39567@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39568 if (to_user) {
39569 ssize_t ret;
39570
39571- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39572+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39573 if (ret)
39574 return -EFAULT;
39575 } else {
39576@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39577 if (!port_has_data(port) && !port->host_connected)
39578 return 0;
39579
39580- return fill_readbuf(port, ubuf, count, true);
39581+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39582 }
39583
39584 static int wait_port_writable(struct port *port, bool nonblock)
39585diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39586index 956b7e5..b655045 100644
39587--- a/drivers/clk/clk-composite.c
39588+++ b/drivers/clk/clk-composite.c
39589@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39590 struct clk *clk;
39591 struct clk_init_data init;
39592 struct clk_composite *composite;
39593- struct clk_ops *clk_composite_ops;
39594+ clk_ops_no_const *clk_composite_ops;
39595
39596 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39597 if (!composite) {
39598diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
39599index 69a094c..1fa2a8d 100644
39600--- a/drivers/clk/clk-mux.c
39601+++ b/drivers/clk/clk-mux.c
39602@@ -114,7 +114,7 @@ const struct clk_ops clk_mux_ro_ops = {
39603 EXPORT_SYMBOL_GPL(clk_mux_ro_ops);
39604
39605 struct clk *clk_register_mux_table(struct device *dev, const char *name,
39606- const char **parent_names, u8 num_parents, unsigned long flags,
39607+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39608 void __iomem *reg, u8 shift, u32 mask,
39609 u8 clk_mux_flags, u32 *table, spinlock_t *lock)
39610 {
39611@@ -166,7 +166,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
39612 EXPORT_SYMBOL_GPL(clk_register_mux_table);
39613
39614 struct clk *clk_register_mux(struct device *dev, const char *name,
39615- const char **parent_names, u8 num_parents, unsigned long flags,
39616+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39617 void __iomem *reg, u8 shift, u8 width,
39618 u8 clk_mux_flags, spinlock_t *lock)
39619 {
39620diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39621index e4c7538..9d5c18a 100644
39622--- a/drivers/clk/samsung/clk.h
39623+++ b/drivers/clk/samsung/clk.h
39624@@ -121,7 +121,7 @@ struct samsung_mux_clock {
39625 unsigned int id;
39626 const char *dev_name;
39627 const char *name;
39628- const char **parent_names;
39629+ const char * const *parent_names;
39630 u8 num_parents;
39631 unsigned long flags;
39632 unsigned long offset;
39633@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39634 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39635 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39636
39637-#define PNAME(x) static const char *x[] __initdata
39638+#define PNAME(x) static const char * const x[] __initconst
39639
39640 /**
39641 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39642diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39643index dd3a78c..386d49c 100644
39644--- a/drivers/clk/socfpga/clk-gate.c
39645+++ b/drivers/clk/socfpga/clk-gate.c
39646@@ -22,6 +22,7 @@
39647 #include <linux/mfd/syscon.h>
39648 #include <linux/of.h>
39649 #include <linux/regmap.h>
39650+#include <asm/pgtable.h>
39651
39652 #include "clk.h"
39653
39654@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39655 return 0;
39656 }
39657
39658-static struct clk_ops gateclk_ops = {
39659+static clk_ops_no_const gateclk_ops __read_only = {
39660 .prepare = socfpga_clk_prepare,
39661 .recalc_rate = socfpga_clk_recalc_rate,
39662 .get_parent = socfpga_clk_get_parent,
39663@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39664 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39665 socfpga_clk->hw.bit_idx = clk_gate[1];
39666
39667- gateclk_ops.enable = clk_gate_ops.enable;
39668- gateclk_ops.disable = clk_gate_ops.disable;
39669+ pax_open_kernel();
39670+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39671+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39672+ pax_close_kernel();
39673 }
39674
39675 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39676diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39677index de6da95..c98278b 100644
39678--- a/drivers/clk/socfpga/clk-pll.c
39679+++ b/drivers/clk/socfpga/clk-pll.c
39680@@ -21,6 +21,7 @@
39681 #include <linux/io.h>
39682 #include <linux/of.h>
39683 #include <linux/of_address.h>
39684+#include <asm/pgtable.h>
39685
39686 #include "clk.h"
39687
39688@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39689 CLK_MGR_PLL_CLK_SRC_MASK;
39690 }
39691
39692-static struct clk_ops clk_pll_ops = {
39693+static clk_ops_no_const clk_pll_ops __read_only = {
39694 .recalc_rate = clk_pll_recalc_rate,
39695 .get_parent = clk_pll_get_parent,
39696 };
39697@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39698 pll_clk->hw.hw.init = &init;
39699
39700 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39701- clk_pll_ops.enable = clk_gate_ops.enable;
39702- clk_pll_ops.disable = clk_gate_ops.disable;
39703+ pax_open_kernel();
39704+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39705+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39706+ pax_close_kernel();
39707
39708 clk = clk_register(NULL, &pll_clk->hw.hw);
39709 if (WARN_ON(IS_ERR(clk))) {
39710diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39711index b0c18ed..1713a80 100644
39712--- a/drivers/cpufreq/acpi-cpufreq.c
39713+++ b/drivers/cpufreq/acpi-cpufreq.c
39714@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39715 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39716 per_cpu(acfreq_data, cpu) = data;
39717
39718- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39719- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39720+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39721+ pax_open_kernel();
39722+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39723+ pax_close_kernel();
39724+ }
39725
39726 result = acpi_processor_register_performance(data->acpi_data, cpu);
39727 if (result)
39728@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39729 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39730 break;
39731 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39732- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39733+ pax_open_kernel();
39734+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39735+ pax_close_kernel();
39736 break;
39737 default:
39738 break;
39739@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39740 if (!msrs)
39741 return;
39742
39743- acpi_cpufreq_driver.boost_supported = true;
39744- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39745+ pax_open_kernel();
39746+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39747+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39748+ pax_close_kernel();
39749
39750 cpu_notifier_register_begin();
39751
39752diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39753index bab67db..91af7e3 100644
39754--- a/drivers/cpufreq/cpufreq-dt.c
39755+++ b/drivers/cpufreq/cpufreq-dt.c
39756@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39757 if (!IS_ERR(cpu_reg))
39758 regulator_put(cpu_reg);
39759
39760- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39761+ pax_open_kernel();
39762+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39763+ pax_close_kernel();
39764
39765 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39766 if (ret)
39767diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39768index 8ae655c..3141442 100644
39769--- a/drivers/cpufreq/cpufreq.c
39770+++ b/drivers/cpufreq/cpufreq.c
39771@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39772 }
39773
39774 mutex_lock(&cpufreq_governor_mutex);
39775- list_del(&governor->governor_list);
39776+ pax_list_del(&governor->governor_list);
39777 mutex_unlock(&cpufreq_governor_mutex);
39778 return;
39779 }
39780@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39781 return NOTIFY_OK;
39782 }
39783
39784-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39785+static struct notifier_block cpufreq_cpu_notifier = {
39786 .notifier_call = cpufreq_cpu_callback,
39787 };
39788
39789@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39790 return 0;
39791
39792 write_lock_irqsave(&cpufreq_driver_lock, flags);
39793- cpufreq_driver->boost_enabled = state;
39794+ pax_open_kernel();
39795+ *(bool *)&cpufreq_driver->boost_enabled = state;
39796+ pax_close_kernel();
39797 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39798
39799 ret = cpufreq_driver->set_boost(state);
39800 if (ret) {
39801 write_lock_irqsave(&cpufreq_driver_lock, flags);
39802- cpufreq_driver->boost_enabled = !state;
39803+ pax_open_kernel();
39804+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39805+ pax_close_kernel();
39806 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39807
39808 pr_err("%s: Cannot %s BOOST\n",
39809@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39810 cpufreq_driver = driver_data;
39811 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39812
39813- if (driver_data->setpolicy)
39814- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39815+ if (driver_data->setpolicy) {
39816+ pax_open_kernel();
39817+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39818+ pax_close_kernel();
39819+ }
39820
39821 if (cpufreq_boost_supported()) {
39822 /*
39823 * Check if driver provides function to enable boost -
39824 * if not, use cpufreq_boost_set_sw as default
39825 */
39826- if (!cpufreq_driver->set_boost)
39827- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39828+ if (!cpufreq_driver->set_boost) {
39829+ pax_open_kernel();
39830+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39831+ pax_close_kernel();
39832+ }
39833
39834 ret = cpufreq_sysfs_create_file(&boost.attr);
39835 if (ret) {
39836diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39837index 1b44496..b80ff5e 100644
39838--- a/drivers/cpufreq/cpufreq_governor.c
39839+++ b/drivers/cpufreq/cpufreq_governor.c
39840@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39841 struct dbs_data *dbs_data;
39842 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39843 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39844- struct od_ops *od_ops = NULL;
39845+ const struct od_ops *od_ops = NULL;
39846 struct od_dbs_tuners *od_tuners = NULL;
39847 struct cs_dbs_tuners *cs_tuners = NULL;
39848 struct cpu_dbs_common_info *cpu_cdbs;
39849@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39850
39851 if ((cdata->governor == GOV_CONSERVATIVE) &&
39852 (!policy->governor->initialized)) {
39853- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39854+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39855
39856 cpufreq_register_notifier(cs_ops->notifier_block,
39857 CPUFREQ_TRANSITION_NOTIFIER);
39858@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39859
39860 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39861 (policy->governor->initialized == 1)) {
39862- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39863+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39864
39865 cpufreq_unregister_notifier(cs_ops->notifier_block,
39866 CPUFREQ_TRANSITION_NOTIFIER);
39867diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39868index cc401d1..8197340 100644
39869--- a/drivers/cpufreq/cpufreq_governor.h
39870+++ b/drivers/cpufreq/cpufreq_governor.h
39871@@ -212,7 +212,7 @@ struct common_dbs_data {
39872 void (*exit)(struct dbs_data *dbs_data);
39873
39874 /* Governor specific ops, see below */
39875- void *gov_ops;
39876+ const void *gov_ops;
39877 };
39878
39879 /* Governor Per policy data */
39880@@ -232,7 +232,7 @@ struct od_ops {
39881 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39882 unsigned int freq_next, unsigned int relation);
39883 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39884-};
39885+} __no_const;
39886
39887 struct cs_ops {
39888 struct notifier_block *notifier_block;
39889diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39890index ad3f38f..8f086cd 100644
39891--- a/drivers/cpufreq/cpufreq_ondemand.c
39892+++ b/drivers/cpufreq/cpufreq_ondemand.c
39893@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39894
39895 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39896
39897-static struct od_ops od_ops = {
39898+static struct od_ops od_ops __read_only = {
39899 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39900 .powersave_bias_target = generic_powersave_bias_target,
39901 .freq_increase = dbs_freq_increase,
39902@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39903 (struct cpufreq_policy *, unsigned int, unsigned int),
39904 unsigned int powersave_bias)
39905 {
39906- od_ops.powersave_bias_target = f;
39907+ pax_open_kernel();
39908+ *(void **)&od_ops.powersave_bias_target = f;
39909+ pax_close_kernel();
39910 od_set_powersave_bias(powersave_bias);
39911 }
39912 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39913
39914 void od_unregister_powersave_bias_handler(void)
39915 {
39916- od_ops.powersave_bias_target = generic_powersave_bias_target;
39917+ pax_open_kernel();
39918+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39919+ pax_close_kernel();
39920 od_set_powersave_bias(0);
39921 }
39922 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39923diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39924index c45d274..0f469f7 100644
39925--- a/drivers/cpufreq/intel_pstate.c
39926+++ b/drivers/cpufreq/intel_pstate.c
39927@@ -134,10 +134,10 @@ struct pstate_funcs {
39928 struct cpu_defaults {
39929 struct pstate_adjust_policy pid_policy;
39930 struct pstate_funcs funcs;
39931-};
39932+} __do_const;
39933
39934 static struct pstate_adjust_policy pid_params;
39935-static struct pstate_funcs pstate_funcs;
39936+static struct pstate_funcs *pstate_funcs;
39937 static int hwp_active;
39938
39939 struct perf_limits {
39940@@ -721,18 +721,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39941
39942 cpu->pstate.current_pstate = pstate;
39943
39944- pstate_funcs.set(cpu, pstate);
39945+ pstate_funcs->set(cpu, pstate);
39946 }
39947
39948 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39949 {
39950- cpu->pstate.min_pstate = pstate_funcs.get_min();
39951- cpu->pstate.max_pstate = pstate_funcs.get_max();
39952- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39953- cpu->pstate.scaling = pstate_funcs.get_scaling();
39954+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39955+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39956+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39957+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39958
39959- if (pstate_funcs.get_vid)
39960- pstate_funcs.get_vid(cpu);
39961+ if (pstate_funcs->get_vid)
39962+ pstate_funcs->get_vid(cpu);
39963 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39964 }
39965
39966@@ -1056,15 +1056,15 @@ static unsigned int force_load;
39967
39968 static int intel_pstate_msrs_not_valid(void)
39969 {
39970- if (!pstate_funcs.get_max() ||
39971- !pstate_funcs.get_min() ||
39972- !pstate_funcs.get_turbo())
39973+ if (!pstate_funcs->get_max() ||
39974+ !pstate_funcs->get_min() ||
39975+ !pstate_funcs->get_turbo())
39976 return -ENODEV;
39977
39978 return 0;
39979 }
39980
39981-static void copy_pid_params(struct pstate_adjust_policy *policy)
39982+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39983 {
39984 pid_params.sample_rate_ms = policy->sample_rate_ms;
39985 pid_params.p_gain_pct = policy->p_gain_pct;
39986@@ -1076,12 +1076,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39987
39988 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39989 {
39990- pstate_funcs.get_max = funcs->get_max;
39991- pstate_funcs.get_min = funcs->get_min;
39992- pstate_funcs.get_turbo = funcs->get_turbo;
39993- pstate_funcs.get_scaling = funcs->get_scaling;
39994- pstate_funcs.set = funcs->set;
39995- pstate_funcs.get_vid = funcs->get_vid;
39996+ pstate_funcs = funcs;
39997 }
39998
39999 #if IS_ENABLED(CONFIG_ACPI)
40000diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
40001index 529cfd9..0e28fff 100644
40002--- a/drivers/cpufreq/p4-clockmod.c
40003+++ b/drivers/cpufreq/p4-clockmod.c
40004@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40005 case 0x0F: /* Core Duo */
40006 case 0x16: /* Celeron Core */
40007 case 0x1C: /* Atom */
40008- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40009+ pax_open_kernel();
40010+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40011+ pax_close_kernel();
40012 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
40013 case 0x0D: /* Pentium M (Dothan) */
40014- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40015+ pax_open_kernel();
40016+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40017+ pax_close_kernel();
40018 /* fall through */
40019 case 0x09: /* Pentium M (Banias) */
40020 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
40021@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40022
40023 /* on P-4s, the TSC runs with constant frequency independent whether
40024 * throttling is active or not. */
40025- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40026+ pax_open_kernel();
40027+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40028+ pax_close_kernel();
40029
40030 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
40031 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
40032diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
40033index 9bb42ba..b01b4a2 100644
40034--- a/drivers/cpufreq/sparc-us3-cpufreq.c
40035+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
40036@@ -18,14 +18,12 @@
40037 #include <asm/head.h>
40038 #include <asm/timer.h>
40039
40040-static struct cpufreq_driver *cpufreq_us3_driver;
40041-
40042 struct us3_freq_percpu_info {
40043 struct cpufreq_frequency_table table[4];
40044 };
40045
40046 /* Indexed by cpu number. */
40047-static struct us3_freq_percpu_info *us3_freq_table;
40048+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40049
40050 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40051 * in the Safari config register.
40052@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40053
40054 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40055 {
40056- if (cpufreq_us3_driver)
40057- us3_freq_target(policy, 0);
40058+ us3_freq_target(policy, 0);
40059
40060 return 0;
40061 }
40062
40063+static int __init us3_freq_init(void);
40064+static void __exit us3_freq_exit(void);
40065+
40066+static struct cpufreq_driver cpufreq_us3_driver = {
40067+ .init = us3_freq_cpu_init,
40068+ .verify = cpufreq_generic_frequency_table_verify,
40069+ .target_index = us3_freq_target,
40070+ .get = us3_freq_get,
40071+ .exit = us3_freq_cpu_exit,
40072+ .name = "UltraSPARC-III",
40073+
40074+};
40075+
40076 static int __init us3_freq_init(void)
40077 {
40078 unsigned long manuf, impl, ver;
40079- int ret;
40080
40081 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40082 return -ENODEV;
40083@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40084 (impl == CHEETAH_IMPL ||
40085 impl == CHEETAH_PLUS_IMPL ||
40086 impl == JAGUAR_IMPL ||
40087- impl == PANTHER_IMPL)) {
40088- struct cpufreq_driver *driver;
40089-
40090- ret = -ENOMEM;
40091- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40092- if (!driver)
40093- goto err_out;
40094-
40095- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40096- GFP_KERNEL);
40097- if (!us3_freq_table)
40098- goto err_out;
40099-
40100- driver->init = us3_freq_cpu_init;
40101- driver->verify = cpufreq_generic_frequency_table_verify;
40102- driver->target_index = us3_freq_target;
40103- driver->get = us3_freq_get;
40104- driver->exit = us3_freq_cpu_exit;
40105- strcpy(driver->name, "UltraSPARC-III");
40106-
40107- cpufreq_us3_driver = driver;
40108- ret = cpufreq_register_driver(driver);
40109- if (ret)
40110- goto err_out;
40111-
40112- return 0;
40113-
40114-err_out:
40115- if (driver) {
40116- kfree(driver);
40117- cpufreq_us3_driver = NULL;
40118- }
40119- kfree(us3_freq_table);
40120- us3_freq_table = NULL;
40121- return ret;
40122- }
40123+ impl == PANTHER_IMPL))
40124+ return cpufreq_register_driver(&cpufreq_us3_driver);
40125
40126 return -ENODEV;
40127 }
40128
40129 static void __exit us3_freq_exit(void)
40130 {
40131- if (cpufreq_us3_driver) {
40132- cpufreq_unregister_driver(cpufreq_us3_driver);
40133- kfree(cpufreq_us3_driver);
40134- cpufreq_us3_driver = NULL;
40135- kfree(us3_freq_table);
40136- us3_freq_table = NULL;
40137- }
40138+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40139 }
40140
40141 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40142diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40143index 7d4a315..21bb886 100644
40144--- a/drivers/cpufreq/speedstep-centrino.c
40145+++ b/drivers/cpufreq/speedstep-centrino.c
40146@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40147 !cpu_has(cpu, X86_FEATURE_EST))
40148 return -ENODEV;
40149
40150- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40151- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40152+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40153+ pax_open_kernel();
40154+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40155+ pax_close_kernel();
40156+ }
40157
40158 if (policy->cpu != 0)
40159 return -ENODEV;
40160diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40161index 5db1478..e90e25e 100644
40162--- a/drivers/cpuidle/driver.c
40163+++ b/drivers/cpuidle/driver.c
40164@@ -193,7 +193,7 @@ static int poll_idle(struct cpuidle_device *dev,
40165
40166 static void poll_idle_init(struct cpuidle_driver *drv)
40167 {
40168- struct cpuidle_state *state = &drv->states[0];
40169+ cpuidle_state_no_const *state = &drv->states[0];
40170
40171 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40172 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40173diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40174index fb9f511..213e6cc 100644
40175--- a/drivers/cpuidle/governor.c
40176+++ b/drivers/cpuidle/governor.c
40177@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40178 mutex_lock(&cpuidle_lock);
40179 if (__cpuidle_find_governor(gov->name) == NULL) {
40180 ret = 0;
40181- list_add_tail(&gov->governor_list, &cpuidle_governors);
40182+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40183 if (!cpuidle_curr_governor ||
40184 cpuidle_curr_governor->rating < gov->rating)
40185 cpuidle_switch_governor(gov);
40186diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40187index 832a2c3..1794080 100644
40188--- a/drivers/cpuidle/sysfs.c
40189+++ b/drivers/cpuidle/sysfs.c
40190@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40191 NULL
40192 };
40193
40194-static struct attribute_group cpuidle_attr_group = {
40195+static attribute_group_no_const cpuidle_attr_group = {
40196 .attrs = cpuidle_default_attrs,
40197 .name = "cpuidle",
40198 };
40199diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40200index 8d2a772..33826c9 100644
40201--- a/drivers/crypto/hifn_795x.c
40202+++ b/drivers/crypto/hifn_795x.c
40203@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40204 MODULE_PARM_DESC(hifn_pll_ref,
40205 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40206
40207-static atomic_t hifn_dev_number;
40208+static atomic_unchecked_t hifn_dev_number;
40209
40210 #define ACRYPTO_OP_DECRYPT 0
40211 #define ACRYPTO_OP_ENCRYPT 1
40212@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40213 goto err_out_disable_pci_device;
40214
40215 snprintf(name, sizeof(name), "hifn%d",
40216- atomic_inc_return(&hifn_dev_number)-1);
40217+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40218
40219 err = pci_request_regions(pdev, name);
40220 if (err)
40221diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
40222index 4630709..0a70e46 100644
40223--- a/drivers/crypto/omap-des.c
40224+++ b/drivers/crypto/omap-des.c
40225@@ -536,9 +536,6 @@ static int omap_des_crypt_dma_stop(struct omap_des_dev *dd)
40226 dmaengine_terminate_all(dd->dma_lch_in);
40227 dmaengine_terminate_all(dd->dma_lch_out);
40228
40229- dma_unmap_sg(dd->dev, dd->in_sg, dd->in_sg_len, DMA_TO_DEVICE);
40230- dma_unmap_sg(dd->dev, dd->out_sg, dd->out_sg_len, DMA_FROM_DEVICE);
40231-
40232 return err;
40233 }
40234
40235diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40236index ca1b362..01cae6a 100644
40237--- a/drivers/devfreq/devfreq.c
40238+++ b/drivers/devfreq/devfreq.c
40239@@ -672,7 +672,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40240 goto err_out;
40241 }
40242
40243- list_add(&governor->node, &devfreq_governor_list);
40244+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40245
40246 list_for_each_entry(devfreq, &devfreq_list, node) {
40247 int ret = 0;
40248@@ -760,7 +760,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40249 }
40250 }
40251
40252- list_del(&governor->node);
40253+ pax_list_del((struct list_head *)&governor->node);
40254 err_out:
40255 mutex_unlock(&devfreq_list_lock);
40256
40257diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40258index 10fcaba..326f709 100644
40259--- a/drivers/dma/sh/shdma-base.c
40260+++ b/drivers/dma/sh/shdma-base.c
40261@@ -227,8 +227,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40262 schan->slave_id = -EINVAL;
40263 }
40264
40265- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40266- sdev->desc_size, GFP_KERNEL);
40267+ schan->desc = kcalloc(sdev->desc_size,
40268+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40269 if (!schan->desc) {
40270 ret = -ENOMEM;
40271 goto edescalloc;
40272diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40273index 11707df..2ea96f7 100644
40274--- a/drivers/dma/sh/shdmac.c
40275+++ b/drivers/dma/sh/shdmac.c
40276@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40277 return ret;
40278 }
40279
40280-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40281+static struct notifier_block sh_dmae_nmi_notifier = {
40282 .notifier_call = sh_dmae_nmi_handler,
40283
40284 /* Run before NMI debug handler and KGDB */
40285diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40286index 592af5f..bb1d583 100644
40287--- a/drivers/edac/edac_device.c
40288+++ b/drivers/edac/edac_device.c
40289@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40290 */
40291 int edac_device_alloc_index(void)
40292 {
40293- static atomic_t device_indexes = ATOMIC_INIT(0);
40294+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40295
40296- return atomic_inc_return(&device_indexes) - 1;
40297+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40298 }
40299 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40300
40301diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40302index 112d63a..5443a61 100644
40303--- a/drivers/edac/edac_mc_sysfs.c
40304+++ b/drivers/edac/edac_mc_sysfs.c
40305@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40306 struct dev_ch_attribute {
40307 struct device_attribute attr;
40308 int channel;
40309-};
40310+} __do_const;
40311
40312 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40313 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40314diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40315index 2cf44b4d..6dd2dc7 100644
40316--- a/drivers/edac/edac_pci.c
40317+++ b/drivers/edac/edac_pci.c
40318@@ -29,7 +29,7 @@
40319
40320 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40321 static LIST_HEAD(edac_pci_list);
40322-static atomic_t pci_indexes = ATOMIC_INIT(0);
40323+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40324
40325 /*
40326 * edac_pci_alloc_ctl_info
40327@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40328 */
40329 int edac_pci_alloc_index(void)
40330 {
40331- return atomic_inc_return(&pci_indexes) - 1;
40332+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40333 }
40334 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40335
40336diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40337index 24d877f..4e30133 100644
40338--- a/drivers/edac/edac_pci_sysfs.c
40339+++ b/drivers/edac/edac_pci_sysfs.c
40340@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40341 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40342 static int edac_pci_poll_msec = 1000; /* one second workq period */
40343
40344-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40345-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40346+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40347+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40348
40349 static struct kobject *edac_pci_top_main_kobj;
40350 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40351@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40352 void *value;
40353 ssize_t(*show) (void *, char *);
40354 ssize_t(*store) (void *, const char *, size_t);
40355-};
40356+} __do_const;
40357
40358 /* Set of show/store abstract level functions for PCI Parity object */
40359 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40360@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40361 edac_printk(KERN_CRIT, EDAC_PCI,
40362 "Signaled System Error on %s\n",
40363 pci_name(dev));
40364- atomic_inc(&pci_nonparity_count);
40365+ atomic_inc_unchecked(&pci_nonparity_count);
40366 }
40367
40368 if (status & (PCI_STATUS_PARITY)) {
40369@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40370 "Master Data Parity Error on %s\n",
40371 pci_name(dev));
40372
40373- atomic_inc(&pci_parity_count);
40374+ atomic_inc_unchecked(&pci_parity_count);
40375 }
40376
40377 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40378@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40379 "Detected Parity Error on %s\n",
40380 pci_name(dev));
40381
40382- atomic_inc(&pci_parity_count);
40383+ atomic_inc_unchecked(&pci_parity_count);
40384 }
40385 }
40386
40387@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40388 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40389 "Signaled System Error on %s\n",
40390 pci_name(dev));
40391- atomic_inc(&pci_nonparity_count);
40392+ atomic_inc_unchecked(&pci_nonparity_count);
40393 }
40394
40395 if (status & (PCI_STATUS_PARITY)) {
40396@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40397 "Master Data Parity Error on "
40398 "%s\n", pci_name(dev));
40399
40400- atomic_inc(&pci_parity_count);
40401+ atomic_inc_unchecked(&pci_parity_count);
40402 }
40403
40404 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40405@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40406 "Detected Parity Error on %s\n",
40407 pci_name(dev));
40408
40409- atomic_inc(&pci_parity_count);
40410+ atomic_inc_unchecked(&pci_parity_count);
40411 }
40412 }
40413 }
40414@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40415 if (!check_pci_errors)
40416 return;
40417
40418- before_count = atomic_read(&pci_parity_count);
40419+ before_count = atomic_read_unchecked(&pci_parity_count);
40420
40421 /* scan all PCI devices looking for a Parity Error on devices and
40422 * bridges.
40423@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40424 /* Only if operator has selected panic on PCI Error */
40425 if (edac_pci_get_panic_on_pe()) {
40426 /* If the count is different 'after' from 'before' */
40427- if (before_count != atomic_read(&pci_parity_count))
40428+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40429 panic("EDAC: PCI Parity Error");
40430 }
40431 }
40432diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40433index c2359a1..8bd119d 100644
40434--- a/drivers/edac/mce_amd.h
40435+++ b/drivers/edac/mce_amd.h
40436@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40437 bool (*mc0_mce)(u16, u8);
40438 bool (*mc1_mce)(u16, u8);
40439 bool (*mc2_mce)(u16, u8);
40440-};
40441+} __no_const;
40442
40443 void amd_report_gart_errors(bool);
40444 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40445diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40446index 57ea7f4..af06b76 100644
40447--- a/drivers/firewire/core-card.c
40448+++ b/drivers/firewire/core-card.c
40449@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40450 const struct fw_card_driver *driver,
40451 struct device *device)
40452 {
40453- static atomic_t index = ATOMIC_INIT(-1);
40454+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40455
40456- card->index = atomic_inc_return(&index);
40457+ card->index = atomic_inc_return_unchecked(&index);
40458 card->driver = driver;
40459 card->device = device;
40460 card->current_tlabel = 0;
40461@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40462
40463 void fw_core_remove_card(struct fw_card *card)
40464 {
40465- struct fw_card_driver dummy_driver = dummy_driver_template;
40466+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40467
40468 card->driver->update_phy_reg(card, 4,
40469 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40470diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40471index f9e3aee..269dbdb 100644
40472--- a/drivers/firewire/core-device.c
40473+++ b/drivers/firewire/core-device.c
40474@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40475 struct config_rom_attribute {
40476 struct device_attribute attr;
40477 u32 key;
40478-};
40479+} __do_const;
40480
40481 static ssize_t show_immediate(struct device *dev,
40482 struct device_attribute *dattr, char *buf)
40483diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40484index d6a09b9..18e90dd 100644
40485--- a/drivers/firewire/core-transaction.c
40486+++ b/drivers/firewire/core-transaction.c
40487@@ -38,6 +38,7 @@
40488 #include <linux/timer.h>
40489 #include <linux/types.h>
40490 #include <linux/workqueue.h>
40491+#include <linux/sched.h>
40492
40493 #include <asm/byteorder.h>
40494
40495diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40496index e1480ff6..1a429bd 100644
40497--- a/drivers/firewire/core.h
40498+++ b/drivers/firewire/core.h
40499@@ -111,6 +111,7 @@ struct fw_card_driver {
40500
40501 int (*stop_iso)(struct fw_iso_context *ctx);
40502 };
40503+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40504
40505 void fw_card_initialize(struct fw_card *card,
40506 const struct fw_card_driver *driver, struct device *device);
40507diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40508index f51d376..b118e40 100644
40509--- a/drivers/firewire/ohci.c
40510+++ b/drivers/firewire/ohci.c
40511@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40512 be32_to_cpu(ohci->next_header));
40513 }
40514
40515+#ifndef CONFIG_GRKERNSEC
40516 if (param_remote_dma) {
40517 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40518 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40519 }
40520+#endif
40521
40522 spin_unlock_irq(&ohci->lock);
40523
40524@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40525 unsigned long flags;
40526 int n, ret = 0;
40527
40528+#ifndef CONFIG_GRKERNSEC
40529 if (param_remote_dma)
40530 return 0;
40531+#endif
40532
40533 /*
40534 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40535diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40536index 94a58a0..f5eba42 100644
40537--- a/drivers/firmware/dmi-id.c
40538+++ b/drivers/firmware/dmi-id.c
40539@@ -16,7 +16,7 @@
40540 struct dmi_device_attribute{
40541 struct device_attribute dev_attr;
40542 int field;
40543-};
40544+} __do_const;
40545 #define to_dmi_dev_attr(_dev_attr) \
40546 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40547
40548diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40549index 4fd9961..52d60ce 100644
40550--- a/drivers/firmware/efi/cper.c
40551+++ b/drivers/firmware/efi/cper.c
40552@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40553 */
40554 u64 cper_next_record_id(void)
40555 {
40556- static atomic64_t seq;
40557+ static atomic64_unchecked_t seq;
40558
40559- if (!atomic64_read(&seq))
40560- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40561+ if (!atomic64_read_unchecked(&seq))
40562+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40563
40564- return atomic64_inc_return(&seq);
40565+ return atomic64_inc_return_unchecked(&seq);
40566 }
40567 EXPORT_SYMBOL_GPL(cper_next_record_id);
40568
40569diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40570index e14363d..c3d5d84 100644
40571--- a/drivers/firmware/efi/efi.c
40572+++ b/drivers/firmware/efi/efi.c
40573@@ -159,14 +159,16 @@ static struct attribute_group efi_subsys_attr_group = {
40574 };
40575
40576 static struct efivars generic_efivars;
40577-static struct efivar_operations generic_ops;
40578+static efivar_operations_no_const generic_ops __read_only;
40579
40580 static int generic_ops_register(void)
40581 {
40582- generic_ops.get_variable = efi.get_variable;
40583- generic_ops.set_variable = efi.set_variable;
40584- generic_ops.get_next_variable = efi.get_next_variable;
40585- generic_ops.query_variable_store = efi_query_variable_store;
40586+ pax_open_kernel();
40587+ *(void **)&generic_ops.get_variable = efi.get_variable;
40588+ *(void **)&generic_ops.set_variable = efi.set_variable;
40589+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40590+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40591+ pax_close_kernel();
40592
40593 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40594 }
40595diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40596index 7b2e049..a253334 100644
40597--- a/drivers/firmware/efi/efivars.c
40598+++ b/drivers/firmware/efi/efivars.c
40599@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40600 static int
40601 create_efivars_bin_attributes(void)
40602 {
40603- struct bin_attribute *attr;
40604+ bin_attribute_no_const *attr;
40605 int error;
40606
40607 /* new_var */
40608diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40609index 5c55227..97f4978 100644
40610--- a/drivers/firmware/efi/runtime-map.c
40611+++ b/drivers/firmware/efi/runtime-map.c
40612@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40613 kfree(entry);
40614 }
40615
40616-static struct kobj_type __refdata map_ktype = {
40617+static const struct kobj_type __refconst map_ktype = {
40618 .sysfs_ops = &map_attr_ops,
40619 .default_attrs = def_attrs,
40620 .release = map_release,
40621diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40622index f1ab05e..ab51228 100644
40623--- a/drivers/firmware/google/gsmi.c
40624+++ b/drivers/firmware/google/gsmi.c
40625@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40626 return local_hash_64(input, 32);
40627 }
40628
40629-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40630+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40631 {
40632 .ident = "Google Board",
40633 .matches = {
40634diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40635index 2f569aa..26e4f39 100644
40636--- a/drivers/firmware/google/memconsole.c
40637+++ b/drivers/firmware/google/memconsole.c
40638@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40639 return false;
40640 }
40641
40642-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40643+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40644 {
40645 .ident = "Google Board",
40646 .matches = {
40647@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40648 if (!found_memconsole())
40649 return -ENODEV;
40650
40651- memconsole_bin_attr.size = memconsole_length;
40652+ pax_open_kernel();
40653+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40654+ pax_close_kernel();
40655+
40656 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40657 }
40658
40659diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40660index cc016c61..d35279e 100644
40661--- a/drivers/firmware/memmap.c
40662+++ b/drivers/firmware/memmap.c
40663@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40664 kfree(entry);
40665 }
40666
40667-static struct kobj_type __refdata memmap_ktype = {
40668+static const struct kobj_type __refconst memmap_ktype = {
40669 .release = release_firmware_map_entry,
40670 .sysfs_ops = &memmap_attr_ops,
40671 .default_attrs = def_attrs,
40672diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40673index 3cfcfc6..09d6f117 100644
40674--- a/drivers/gpio/gpio-em.c
40675+++ b/drivers/gpio/gpio-em.c
40676@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40677 struct em_gio_priv *p;
40678 struct resource *io[2], *irq[2];
40679 struct gpio_chip *gpio_chip;
40680- struct irq_chip *irq_chip;
40681+ irq_chip_no_const *irq_chip;
40682 const char *name = dev_name(&pdev->dev);
40683 int ret;
40684
40685diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40686index 4ba7ed5..1536b5d 100644
40687--- a/drivers/gpio/gpio-ich.c
40688+++ b/drivers/gpio/gpio-ich.c
40689@@ -94,7 +94,7 @@ struct ichx_desc {
40690 * this option allows driver caching written output values
40691 */
40692 bool use_outlvl_cache;
40693-};
40694+} __do_const;
40695
40696 static struct {
40697 spinlock_t lock;
40698diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40699index b232397..ce8c4dc 100644
40700--- a/drivers/gpio/gpio-omap.c
40701+++ b/drivers/gpio/gpio-omap.c
40702@@ -1054,7 +1054,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
40703 dev_err(bank->dev, "Could not get gpio dbck\n");
40704 }
40705
40706-static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
40707+static int omap_gpio_chip_init(struct gpio_bank *bank, irq_chip_no_const *irqc)
40708 {
40709 static int gpio;
40710 int irq_base = 0;
40711@@ -1137,7 +1137,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40712 const struct omap_gpio_platform_data *pdata;
40713 struct resource *res;
40714 struct gpio_bank *bank;
40715- struct irq_chip *irqc;
40716+ irq_chip_no_const *irqc;
40717 int ret;
40718
40719 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40720diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40721index 1e14a6c..0442450 100644
40722--- a/drivers/gpio/gpio-rcar.c
40723+++ b/drivers/gpio/gpio-rcar.c
40724@@ -379,7 +379,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40725 struct gpio_rcar_priv *p;
40726 struct resource *io, *irq;
40727 struct gpio_chip *gpio_chip;
40728- struct irq_chip *irq_chip;
40729+ irq_chip_no_const *irq_chip;
40730 struct device *dev = &pdev->dev;
40731 const char *name = dev_name(dev);
40732 int ret;
40733diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40734index c1caa45..f0f97d2 100644
40735--- a/drivers/gpio/gpio-vr41xx.c
40736+++ b/drivers/gpio/gpio-vr41xx.c
40737@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40738 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40739 maskl, pendl, maskh, pendh);
40740
40741- atomic_inc(&irq_err_count);
40742+ atomic_inc_unchecked(&irq_err_count);
40743
40744 return -EINVAL;
40745 }
40746diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40747index 6bc612b..3932464 100644
40748--- a/drivers/gpio/gpiolib.c
40749+++ b/drivers/gpio/gpiolib.c
40750@@ -558,8 +558,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40751 }
40752
40753 if (gpiochip->irqchip) {
40754- gpiochip->irqchip->irq_request_resources = NULL;
40755- gpiochip->irqchip->irq_release_resources = NULL;
40756+ pax_open_kernel();
40757+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40758+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40759+ pax_close_kernel();
40760 gpiochip->irqchip = NULL;
40761 }
40762 }
40763@@ -625,8 +627,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40764 gpiochip->irqchip = NULL;
40765 return -EINVAL;
40766 }
40767- irqchip->irq_request_resources = gpiochip_irq_reqres;
40768- irqchip->irq_release_resources = gpiochip_irq_relres;
40769+
40770+ pax_open_kernel();
40771+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40772+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40773+ pax_close_kernel();
40774
40775 /*
40776 * Prepare the mapping since the irqchip shall be orthogonal to
40777diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40778index 488f51d..301d462 100644
40779--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40780+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40781@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40782 enum cache_policy alternate_policy,
40783 void __user *alternate_aperture_base,
40784 uint64_t alternate_aperture_size);
40785-};
40786+} __no_const;
40787
40788 /**
40789 * struct device_queue_manager
40790diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40791index 5940531..a75b0e5 100644
40792--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40793+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40794@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40795
40796 void (*submit_packet)(struct kernel_queue *kq);
40797 void (*rollback_packet)(struct kernel_queue *kq);
40798-};
40799+} __no_const;
40800
40801 struct kernel_queue {
40802 struct kernel_queue_ops ops;
40803diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40804index 9b23525..65f4110 100644
40805--- a/drivers/gpu/drm/drm_context.c
40806+++ b/drivers/gpu/drm/drm_context.c
40807@@ -53,6 +53,9 @@ struct drm_ctx_list {
40808 */
40809 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40810 {
40811+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40812+ return;
40813+
40814 mutex_lock(&dev->struct_mutex);
40815 idr_remove(&dev->ctx_idr, ctx_handle);
40816 mutex_unlock(&dev->struct_mutex);
40817@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40818 */
40819 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40820 {
40821+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40822+ return -EINVAL;
40823+
40824 idr_init(&dev->ctx_idr);
40825 return 0;
40826 }
40827@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40828 */
40829 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40830 {
40831+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40832+ return;
40833+
40834 mutex_lock(&dev->struct_mutex);
40835 idr_destroy(&dev->ctx_idr);
40836 mutex_unlock(&dev->struct_mutex);
40837@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40838 {
40839 struct drm_ctx_list *pos, *tmp;
40840
40841+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40842+ return;
40843+
40844 mutex_lock(&dev->ctxlist_mutex);
40845
40846 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40847 if (pos->tag == file &&
40848- pos->handle != DRM_KERNEL_CONTEXT) {
40849+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40850 if (dev->driver->context_dtor)
40851 dev->driver->context_dtor(dev, pos->handle);
40852
40853@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40854 struct drm_local_map *map;
40855 struct drm_map_list *_entry;
40856
40857+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40858+ return -EINVAL;
40859+
40860 mutex_lock(&dev->struct_mutex);
40861
40862 map = idr_find(&dev->ctx_idr, request->ctx_id);
40863@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40864 struct drm_local_map *map = NULL;
40865 struct drm_map_list *r_list = NULL;
40866
40867+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40868+ return -EINVAL;
40869+
40870 mutex_lock(&dev->struct_mutex);
40871 list_for_each_entry(r_list, &dev->maplist, head) {
40872 if (r_list->map
40873@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40874 {
40875 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40876
40877- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40878+ if (file_priv->master->lock.hw_lock == NULL) {
40879+ DRM_ERROR(
40880+ "Device has been unregistered. Hard exit. Process %d\n",
40881+ task_pid_nr(current));
40882+ send_sig(SIGTERM, current, 0);
40883+ return -EPERM;
40884+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40885 DRM_ERROR("Lock isn't held after context switch\n");
40886 }
40887
40888@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40889 struct drm_ctx ctx;
40890 int i;
40891
40892+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40893+ return -EINVAL;
40894+
40895 if (res->count >= DRM_RESERVED_CONTEXTS) {
40896 memset(&ctx, 0, sizeof(ctx));
40897 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40898@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40899 struct drm_ctx_list *ctx_entry;
40900 struct drm_ctx *ctx = data;
40901
40902+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40903+ return -EINVAL;
40904+
40905 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40906- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40907+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40908 /* Skip kernel's context and get a new one. */
40909 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40910 }
40911@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40912 {
40913 struct drm_ctx *ctx = data;
40914
40915+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40916+ return -EINVAL;
40917+
40918 /* This is 0, because we don't handle any context flags */
40919 ctx->flags = 0;
40920
40921@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40922 {
40923 struct drm_ctx *ctx = data;
40924
40925+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40926+ return -EINVAL;
40927+
40928 DRM_DEBUG("%d\n", ctx->handle);
40929 return drm_context_switch(dev, dev->last_context, ctx->handle);
40930 }
40931@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40932 {
40933 struct drm_ctx *ctx = data;
40934
40935+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40936+ return -EINVAL;
40937+
40938 DRM_DEBUG("%d\n", ctx->handle);
40939 drm_context_switch_complete(dev, file_priv, ctx->handle);
40940
40941@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40942 {
40943 struct drm_ctx *ctx = data;
40944
40945+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40946+ return -EINVAL;
40947+
40948 DRM_DEBUG("%d\n", ctx->handle);
40949- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40950+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40951 if (dev->driver->context_dtor)
40952 dev->driver->context_dtor(dev, ctx->handle);
40953 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40954diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40955index 3007b44..420b4a3 100644
40956--- a/drivers/gpu/drm/drm_crtc.c
40957+++ b/drivers/gpu/drm/drm_crtc.c
40958@@ -4176,7 +4176,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40959 goto done;
40960 }
40961
40962- if (copy_to_user(&enum_ptr[copied].name,
40963+ if (copy_to_user(enum_ptr[copied].name,
40964 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40965 ret = -EFAULT;
40966 goto done;
40967diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40968index 48f7359..8c3b594 100644
40969--- a/drivers/gpu/drm/drm_drv.c
40970+++ b/drivers/gpu/drm/drm_drv.c
40971@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40972
40973 drm_device_set_unplugged(dev);
40974
40975- if (dev->open_count == 0) {
40976+ if (local_read(&dev->open_count) == 0) {
40977 drm_put_dev(dev);
40978 }
40979 mutex_unlock(&drm_global_mutex);
40980@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40981 if (drm_ht_create(&dev->map_hash, 12))
40982 goto err_minors;
40983
40984- ret = drm_legacy_ctxbitmap_init(dev);
40985- if (ret) {
40986- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40987- goto err_ht;
40988+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40989+ ret = drm_legacy_ctxbitmap_init(dev);
40990+ if (ret) {
40991+ DRM_ERROR(
40992+ "Cannot allocate memory for context bitmap.\n");
40993+ goto err_ht;
40994+ }
40995 }
40996
40997 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40998diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40999index 076dd60..e4a4ba7 100644
41000--- a/drivers/gpu/drm/drm_fops.c
41001+++ b/drivers/gpu/drm/drm_fops.c
41002@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
41003 return PTR_ERR(minor);
41004
41005 dev = minor->dev;
41006- if (!dev->open_count++)
41007+ if (local_inc_return(&dev->open_count) == 1)
41008 need_setup = 1;
41009
41010 /* share address_space across all char-devs of a single device */
41011@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
41012 return 0;
41013
41014 err_undo:
41015- dev->open_count--;
41016+ local_dec(&dev->open_count);
41017 drm_minor_release(minor);
41018 return retcode;
41019 }
41020@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
41021
41022 mutex_lock(&drm_global_mutex);
41023
41024- DRM_DEBUG("open_count = %d\n", dev->open_count);
41025+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
41026
41027 mutex_lock(&dev->struct_mutex);
41028 list_del(&file_priv->lhead);
41029@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
41030 * Begin inline drm_release
41031 */
41032
41033- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41034+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41035 task_pid_nr(current),
41036 (long)old_encode_dev(file_priv->minor->kdev->devt),
41037- dev->open_count);
41038+ local_read(&dev->open_count));
41039
41040 /* Release any auth tokens that might point to this file_priv,
41041 (do that under the drm_global_mutex) */
41042@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41043 * End inline drm_release
41044 */
41045
41046- if (!--dev->open_count) {
41047+ if (local_dec_and_test(&dev->open_count)) {
41048 retcode = drm_lastclose(dev);
41049 if (drm_device_is_unplugged(dev))
41050 drm_put_dev(dev);
41051diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41052index 3d2e91c..d31c4c9 100644
41053--- a/drivers/gpu/drm/drm_global.c
41054+++ b/drivers/gpu/drm/drm_global.c
41055@@ -36,7 +36,7 @@
41056 struct drm_global_item {
41057 struct mutex mutex;
41058 void *object;
41059- int refcount;
41060+ atomic_t refcount;
41061 };
41062
41063 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41064@@ -49,7 +49,7 @@ void drm_global_init(void)
41065 struct drm_global_item *item = &glob[i];
41066 mutex_init(&item->mutex);
41067 item->object = NULL;
41068- item->refcount = 0;
41069+ atomic_set(&item->refcount, 0);
41070 }
41071 }
41072
41073@@ -59,7 +59,7 @@ void drm_global_release(void)
41074 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41075 struct drm_global_item *item = &glob[i];
41076 BUG_ON(item->object != NULL);
41077- BUG_ON(item->refcount != 0);
41078+ BUG_ON(atomic_read(&item->refcount) != 0);
41079 }
41080 }
41081
41082@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41083 struct drm_global_item *item = &glob[ref->global_type];
41084
41085 mutex_lock(&item->mutex);
41086- if (item->refcount == 0) {
41087+ if (atomic_read(&item->refcount) == 0) {
41088 item->object = kzalloc(ref->size, GFP_KERNEL);
41089 if (unlikely(item->object == NULL)) {
41090 ret = -ENOMEM;
41091@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41092 goto out_err;
41093
41094 }
41095- ++item->refcount;
41096+ atomic_inc(&item->refcount);
41097 ref->object = item->object;
41098 mutex_unlock(&item->mutex);
41099 return 0;
41100@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41101 struct drm_global_item *item = &glob[ref->global_type];
41102
41103 mutex_lock(&item->mutex);
41104- BUG_ON(item->refcount == 0);
41105+ BUG_ON(atomic_read(&item->refcount) == 0);
41106 BUG_ON(ref->object != item->object);
41107- if (--item->refcount == 0) {
41108+ if (atomic_dec_and_test(&item->refcount)) {
41109 ref->release(ref);
41110 item->object = NULL;
41111 }
41112diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41113index cbb4fc0..5c756cb9 100644
41114--- a/drivers/gpu/drm/drm_info.c
41115+++ b/drivers/gpu/drm/drm_info.c
41116@@ -77,10 +77,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41117 struct drm_local_map *map;
41118 struct drm_map_list *r_list;
41119
41120- /* Hardcoded from _DRM_FRAME_BUFFER,
41121- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41122- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41123- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41124+ static const char * const types[] = {
41125+ [_DRM_FRAME_BUFFER] = "FB",
41126+ [_DRM_REGISTERS] = "REG",
41127+ [_DRM_SHM] = "SHM",
41128+ [_DRM_AGP] = "AGP",
41129+ [_DRM_SCATTER_GATHER] = "SG",
41130+ [_DRM_CONSISTENT] = "PCI"};
41131 const char *type;
41132 int i;
41133
41134@@ -91,7 +94,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41135 map = r_list->map;
41136 if (!map)
41137 continue;
41138- if (map->type < 0 || map->type > 5)
41139+ if (map->type >= ARRAY_SIZE(types))
41140 type = "??";
41141 else
41142 type = types[map->type];
41143diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41144index aa8bbb4..0f62630 100644
41145--- a/drivers/gpu/drm/drm_ioc32.c
41146+++ b/drivers/gpu/drm/drm_ioc32.c
41147@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41148 request = compat_alloc_user_space(nbytes);
41149 if (!access_ok(VERIFY_WRITE, request, nbytes))
41150 return -EFAULT;
41151- list = (struct drm_buf_desc *) (request + 1);
41152+ list = (struct drm_buf_desc __user *) (request + 1);
41153
41154 if (__put_user(count, &request->count)
41155 || __put_user(list, &request->list))
41156@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41157 request = compat_alloc_user_space(nbytes);
41158 if (!access_ok(VERIFY_WRITE, request, nbytes))
41159 return -EFAULT;
41160- list = (struct drm_buf_pub *) (request + 1);
41161+ list = (struct drm_buf_pub __user *) (request + 1);
41162
41163 if (__put_user(count, &request->count)
41164 || __put_user(list, &request->list))
41165@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41166 return 0;
41167 }
41168
41169-static drm_ioctl_compat_t *drm_compat_ioctls[] = {
41170+static drm_ioctl_compat_t drm_compat_ioctls[] = {
41171 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41172 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41173 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41174@@ -1062,7 +1062,6 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
41175 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41176 {
41177 unsigned int nr = DRM_IOCTL_NR(cmd);
41178- drm_ioctl_compat_t *fn;
41179 int ret;
41180
41181 /* Assume that ioctls without an explicit compat routine will just
41182@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41183 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41184 return drm_ioctl(filp, cmd, arg);
41185
41186- fn = drm_compat_ioctls[nr];
41187-
41188- if (fn != NULL)
41189- ret = (*fn) (filp, cmd, arg);
41190+ if (drm_compat_ioctls[nr] != NULL)
41191+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41192 else
41193 ret = drm_ioctl(filp, cmd, arg);
41194
41195diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41196index 266dcd6..d0194d9 100644
41197--- a/drivers/gpu/drm/drm_ioctl.c
41198+++ b/drivers/gpu/drm/drm_ioctl.c
41199@@ -663,7 +663,7 @@ long drm_ioctl(struct file *filp,
41200 struct drm_file *file_priv = filp->private_data;
41201 struct drm_device *dev;
41202 const struct drm_ioctl_desc *ioctl = NULL;
41203- drm_ioctl_t *func;
41204+ drm_ioctl_no_const_t func;
41205 unsigned int nr = DRM_IOCTL_NR(cmd);
41206 int retcode = -EINVAL;
41207 char stack_kdata[128];
41208diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41209index f861361..b61d4c7 100644
41210--- a/drivers/gpu/drm/drm_lock.c
41211+++ b/drivers/gpu/drm/drm_lock.c
41212@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41213 struct drm_master *master = file_priv->master;
41214 int ret = 0;
41215
41216+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41217+ return -EINVAL;
41218+
41219 ++file_priv->lock_count;
41220
41221- if (lock->context == DRM_KERNEL_CONTEXT) {
41222+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41223 DRM_ERROR("Process %d using kernel context %d\n",
41224 task_pid_nr(current), lock->context);
41225 return -EINVAL;
41226@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41227 struct drm_lock *lock = data;
41228 struct drm_master *master = file_priv->master;
41229
41230- if (lock->context == DRM_KERNEL_CONTEXT) {
41231+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41232+ return -EINVAL;
41233+
41234+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41235 DRM_ERROR("Process %d using kernel context %d\n",
41236 task_pid_nr(current), lock->context);
41237 return -EINVAL;
41238 }
41239
41240+ if (!master->lock.hw_lock) {
41241+ DRM_ERROR(
41242+ "Device has been unregistered. Hard exit. Process %d\n",
41243+ task_pid_nr(current));
41244+ send_sig(SIGTERM, current, 0);
41245+ return -EPERM;
41246+ }
41247+
41248 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41249 /* FIXME: Should really bail out here. */
41250 }
41251diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41252index d4813e0..6c1ab4d 100644
41253--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41254+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41255@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41256 u32 pipeconf_reg = PIPEACONF;
41257 u32 dspcntr_reg = DSPACNTR;
41258
41259- u32 pipeconf = dev_priv->pipeconf[pipe];
41260- u32 dspcntr = dev_priv->dspcntr[pipe];
41261+ u32 pipeconf;
41262+ u32 dspcntr;
41263 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41264
41265+ if (pipe == -1)
41266+ return;
41267+
41268+ pipeconf = dev_priv->pipeconf[pipe];
41269+ dspcntr = dev_priv->dspcntr[pipe];
41270+
41271 if (pipe) {
41272 pipeconf_reg = PIPECCONF;
41273 dspcntr_reg = DSPCCNTR;
41274diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41275index 93ec5dc..82acbaf 100644
41276--- a/drivers/gpu/drm/i810/i810_drv.h
41277+++ b/drivers/gpu/drm/i810/i810_drv.h
41278@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41279 int page_flipping;
41280
41281 wait_queue_head_t irq_queue;
41282- atomic_t irq_received;
41283- atomic_t irq_emitted;
41284+ atomic_unchecked_t irq_received;
41285+ atomic_unchecked_t irq_emitted;
41286
41287 int front_offset;
41288 } drm_i810_private_t;
41289diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41290index 68e0c85..3303192 100644
41291--- a/drivers/gpu/drm/i915/i915_dma.c
41292+++ b/drivers/gpu/drm/i915/i915_dma.c
41293@@ -162,6 +162,8 @@ static int i915_getparam(struct drm_device *dev, void *data,
41294 value = INTEL_INFO(dev)->eu_total;
41295 if (!value)
41296 return -ENODEV;
41297+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41298+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41299 break;
41300 default:
41301 DRM_DEBUG("Unknown parameter %d\n", param->param);
41302@@ -376,7 +378,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41303 * locking inversion with the driver load path. And the access here is
41304 * completely racy anyway. So don't bother with locking for now.
41305 */
41306- return dev->open_count == 0;
41307+ return local_read(&dev->open_count) == 0;
41308 }
41309
41310 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41311diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41312index a3190e79..86b06cb 100644
41313--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41314+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41315@@ -936,12 +936,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41316 static int
41317 validate_exec_list(struct drm_device *dev,
41318 struct drm_i915_gem_exec_object2 *exec,
41319- int count)
41320+ unsigned int count)
41321 {
41322 unsigned relocs_total = 0;
41323 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41324 unsigned invalid_flags;
41325- int i;
41326+ unsigned int i;
41327
41328 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41329 if (USES_FULL_PPGTT(dev))
41330diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41331index 176de63..b50b66a 100644
41332--- a/drivers/gpu/drm/i915/i915_ioc32.c
41333+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41334@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41335 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41336 || __put_user(batchbuffer32.num_cliprects,
41337 &batchbuffer->num_cliprects)
41338- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41339+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41340 &batchbuffer->cliprects))
41341 return -EFAULT;
41342
41343@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41344
41345 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41346 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41347- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41348+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41349 &cmdbuffer->buf)
41350 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41351 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41352 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41353 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41354- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41355+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41356 &cmdbuffer->cliprects))
41357 return -EFAULT;
41358
41359@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41360 (unsigned long)request);
41361 }
41362
41363-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41364+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41365 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41366 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41367 [DRM_I915_GETPARAM] = compat_i915_getparam,
41368@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41369 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41370 {
41371 unsigned int nr = DRM_IOCTL_NR(cmd);
41372- drm_ioctl_compat_t *fn = NULL;
41373 int ret;
41374
41375 if (nr < DRM_COMMAND_BASE)
41376 return drm_compat_ioctl(filp, cmd, arg);
41377
41378- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41379- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41380-
41381- if (fn != NULL)
41382- ret = (*fn) (filp, cmd, arg);
41383+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41384+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41385 else
41386 ret = drm_ioctl(filp, cmd, arg);
41387
41388diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41389index d0f3cbc..f3ab4cc 100644
41390--- a/drivers/gpu/drm/i915/intel_display.c
41391+++ b/drivers/gpu/drm/i915/intel_display.c
41392@@ -13604,13 +13604,13 @@ struct intel_quirk {
41393 int subsystem_vendor;
41394 int subsystem_device;
41395 void (*hook)(struct drm_device *dev);
41396-};
41397+} __do_const;
41398
41399 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41400 struct intel_dmi_quirk {
41401 void (*hook)(struct drm_device *dev);
41402 const struct dmi_system_id (*dmi_id_list)[];
41403-};
41404+} __do_const;
41405
41406 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41407 {
41408@@ -13618,18 +13618,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41409 return 1;
41410 }
41411
41412-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41413+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41414 {
41415- .dmi_id_list = &(const struct dmi_system_id[]) {
41416- {
41417- .callback = intel_dmi_reverse_brightness,
41418- .ident = "NCR Corporation",
41419- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41420- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41421- },
41422- },
41423- { } /* terminating entry */
41424+ .callback = intel_dmi_reverse_brightness,
41425+ .ident = "NCR Corporation",
41426+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41427+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41428 },
41429+ },
41430+ { } /* terminating entry */
41431+};
41432+
41433+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41434+ {
41435+ .dmi_id_list = &intel_dmi_quirks_table,
41436 .hook = quirk_invert_brightness,
41437 },
41438 };
41439diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41440index 74f505b..21f6914 100644
41441--- a/drivers/gpu/drm/imx/imx-drm-core.c
41442+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41443@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41444 if (imxdrm->pipes >= MAX_CRTC)
41445 return -EINVAL;
41446
41447- if (imxdrm->drm->open_count)
41448+ if (local_read(&imxdrm->drm->open_count))
41449 return -EBUSY;
41450
41451 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41452diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41453index b4a20149..219ab78 100644
41454--- a/drivers/gpu/drm/mga/mga_drv.h
41455+++ b/drivers/gpu/drm/mga/mga_drv.h
41456@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41457 u32 clear_cmd;
41458 u32 maccess;
41459
41460- atomic_t vbl_received; /**< Number of vblanks received. */
41461+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41462 wait_queue_head_t fence_queue;
41463- atomic_t last_fence_retired;
41464+ atomic_unchecked_t last_fence_retired;
41465 u32 next_fence_to_post;
41466
41467 unsigned int fb_cpp;
41468diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41469index 729bfd5..14bae78 100644
41470--- a/drivers/gpu/drm/mga/mga_ioc32.c
41471+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41472@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41473 return 0;
41474 }
41475
41476-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41477+drm_ioctl_compat_t mga_compat_ioctls[] = {
41478 [DRM_MGA_INIT] = compat_mga_init,
41479 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41480 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41481@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41482 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41483 {
41484 unsigned int nr = DRM_IOCTL_NR(cmd);
41485- drm_ioctl_compat_t *fn = NULL;
41486 int ret;
41487
41488 if (nr < DRM_COMMAND_BASE)
41489 return drm_compat_ioctl(filp, cmd, arg);
41490
41491- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41492- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41493-
41494- if (fn != NULL)
41495- ret = (*fn) (filp, cmd, arg);
41496+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41497+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41498 else
41499 ret = drm_ioctl(filp, cmd, arg);
41500
41501diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41502index 1b071b8..de8601a 100644
41503--- a/drivers/gpu/drm/mga/mga_irq.c
41504+++ b/drivers/gpu/drm/mga/mga_irq.c
41505@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41506 if (crtc != 0)
41507 return 0;
41508
41509- return atomic_read(&dev_priv->vbl_received);
41510+ return atomic_read_unchecked(&dev_priv->vbl_received);
41511 }
41512
41513
41514@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41515 /* VBLANK interrupt */
41516 if (status & MGA_VLINEPEN) {
41517 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41518- atomic_inc(&dev_priv->vbl_received);
41519+ atomic_inc_unchecked(&dev_priv->vbl_received);
41520 drm_handle_vblank(dev, 0);
41521 handled = 1;
41522 }
41523@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41524 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41525 MGA_WRITE(MGA_PRIMEND, prim_end);
41526
41527- atomic_inc(&dev_priv->last_fence_retired);
41528+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41529 wake_up(&dev_priv->fence_queue);
41530 handled = 1;
41531 }
41532@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41533 * using fences.
41534 */
41535 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41536- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41537+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41538 - *sequence) <= (1 << 23)));
41539
41540 *sequence = cur_fence;
41541diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41542index 0190b69..60c3eaf 100644
41543--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41544+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41545@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41546 struct bit_table {
41547 const char id;
41548 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41549-};
41550+} __no_const;
41551
41552 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41553
41554diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41555index 8904933..9624b38 100644
41556--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41557+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41558@@ -941,7 +941,8 @@ static struct drm_driver
41559 driver_stub = {
41560 .driver_features =
41561 DRIVER_USE_AGP |
41562- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41563+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41564+ DRIVER_KMS_LEGACY_CONTEXT,
41565
41566 .load = nouveau_drm_load,
41567 .unload = nouveau_drm_unload,
41568diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41569index dd72652..1fd2368 100644
41570--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41571+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41572@@ -123,7 +123,6 @@ struct nouveau_drm {
41573 struct drm_global_reference mem_global_ref;
41574 struct ttm_bo_global_ref bo_global_ref;
41575 struct ttm_bo_device bdev;
41576- atomic_t validate_sequence;
41577 int (*move)(struct nouveau_channel *,
41578 struct ttm_buffer_object *,
41579 struct ttm_mem_reg *, struct ttm_mem_reg *);
41580diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41581index 462679a..88e32a7 100644
41582--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41583+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41584@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41585 unsigned long arg)
41586 {
41587 unsigned int nr = DRM_IOCTL_NR(cmd);
41588- drm_ioctl_compat_t *fn = NULL;
41589+ drm_ioctl_compat_t fn = NULL;
41590 int ret;
41591
41592 if (nr < DRM_COMMAND_BASE)
41593diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41594index 18f4497..10f6025 100644
41595--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41596+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41597@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41598 }
41599
41600 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41601- nouveau_vram_manager_init,
41602- nouveau_vram_manager_fini,
41603- nouveau_vram_manager_new,
41604- nouveau_vram_manager_del,
41605- nouveau_vram_manager_debug
41606+ .init = nouveau_vram_manager_init,
41607+ .takedown = nouveau_vram_manager_fini,
41608+ .get_node = nouveau_vram_manager_new,
41609+ .put_node = nouveau_vram_manager_del,
41610+ .debug = nouveau_vram_manager_debug
41611 };
41612
41613 static int
41614@@ -198,11 +198,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41615 }
41616
41617 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41618- nouveau_gart_manager_init,
41619- nouveau_gart_manager_fini,
41620- nouveau_gart_manager_new,
41621- nouveau_gart_manager_del,
41622- nouveau_gart_manager_debug
41623+ .init = nouveau_gart_manager_init,
41624+ .takedown = nouveau_gart_manager_fini,
41625+ .get_node = nouveau_gart_manager_new,
41626+ .put_node = nouveau_gart_manager_del,
41627+ .debug = nouveau_gart_manager_debug
41628 };
41629
41630 /*XXX*/
41631@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41632 }
41633
41634 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41635- nv04_gart_manager_init,
41636- nv04_gart_manager_fini,
41637- nv04_gart_manager_new,
41638- nv04_gart_manager_del,
41639- nv04_gart_manager_debug
41640+ .init = nv04_gart_manager_init,
41641+ .takedown = nv04_gart_manager_fini,
41642+ .get_node = nv04_gart_manager_new,
41643+ .put_node = nv04_gart_manager_del,
41644+ .debug = nv04_gart_manager_debug
41645 };
41646
41647 int
41648diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41649index c7592ec..dd45ebc 100644
41650--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41651+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41652@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41653 * locking inversion with the driver load path. And the access here is
41654 * completely racy anyway. So don't bother with locking for now.
41655 */
41656- return dev->open_count == 0;
41657+ return local_read(&dev->open_count) == 0;
41658 }
41659
41660 static const struct vga_switcheroo_client_ops
41661diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41662index 9782364..89bd954 100644
41663--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41664+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41665@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41666 int ret;
41667
41668 mutex_lock(&qdev->async_io_mutex);
41669- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41670+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41671 if (qdev->last_sent_io_cmd > irq_num) {
41672 if (intr)
41673 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41674- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41675+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41676 else
41677 ret = wait_event_timeout(qdev->io_cmd_event,
41678- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41679+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41680 /* 0 is timeout, just bail the "hw" has gone away */
41681 if (ret <= 0)
41682 goto out;
41683- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41684+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41685 }
41686 outb(val, addr);
41687 qdev->last_sent_io_cmd = irq_num + 1;
41688 if (intr)
41689 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41690- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41691+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41692 else
41693 ret = wait_event_timeout(qdev->io_cmd_event,
41694- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41695+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41696 out:
41697 if (ret > 0)
41698 ret = 0;
41699diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41700index 6911b8c..89d6867 100644
41701--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41702+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41703@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41704 struct drm_info_node *node = (struct drm_info_node *) m->private;
41705 struct qxl_device *qdev = node->minor->dev->dev_private;
41706
41707- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41708- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41709- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41710- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41711+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41712+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41713+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41714+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41715 seq_printf(m, "%d\n", qdev->irq_received_error);
41716 return 0;
41717 }
41718diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41719index 7c6cafe..460f542 100644
41720--- a/drivers/gpu/drm/qxl/qxl_drv.h
41721+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41722@@ -290,10 +290,10 @@ struct qxl_device {
41723 unsigned int last_sent_io_cmd;
41724
41725 /* interrupt handling */
41726- atomic_t irq_received;
41727- atomic_t irq_received_display;
41728- atomic_t irq_received_cursor;
41729- atomic_t irq_received_io_cmd;
41730+ atomic_unchecked_t irq_received;
41731+ atomic_unchecked_t irq_received_display;
41732+ atomic_unchecked_t irq_received_cursor;
41733+ atomic_unchecked_t irq_received_io_cmd;
41734 unsigned irq_received_error;
41735 wait_queue_head_t display_event;
41736 wait_queue_head_t cursor_event;
41737diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41738index b110883..dd06418 100644
41739--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41740+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41741@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41742
41743 /* TODO copy slow path code from i915 */
41744 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41745- 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);
41746+ 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);
41747
41748 {
41749 struct qxl_drawable *draw = fb_cmd;
41750@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41751 struct drm_qxl_reloc reloc;
41752
41753 if (copy_from_user(&reloc,
41754- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41755+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41756 sizeof(reloc))) {
41757 ret = -EFAULT;
41758 goto out_free_bos;
41759@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41760
41761 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41762
41763- struct drm_qxl_command *commands =
41764- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41765+ struct drm_qxl_command __user *commands =
41766+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41767
41768- if (copy_from_user(&user_cmd, &commands[cmd_num],
41769+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41770 sizeof(user_cmd)))
41771 return -EFAULT;
41772
41773diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41774index 0bf1e20..42a7310 100644
41775--- a/drivers/gpu/drm/qxl/qxl_irq.c
41776+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41777@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41778 if (!pending)
41779 return IRQ_NONE;
41780
41781- atomic_inc(&qdev->irq_received);
41782+ atomic_inc_unchecked(&qdev->irq_received);
41783
41784 if (pending & QXL_INTERRUPT_DISPLAY) {
41785- atomic_inc(&qdev->irq_received_display);
41786+ atomic_inc_unchecked(&qdev->irq_received_display);
41787 wake_up_all(&qdev->display_event);
41788 qxl_queue_garbage_collect(qdev, false);
41789 }
41790 if (pending & QXL_INTERRUPT_CURSOR) {
41791- atomic_inc(&qdev->irq_received_cursor);
41792+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41793 wake_up_all(&qdev->cursor_event);
41794 }
41795 if (pending & QXL_INTERRUPT_IO_CMD) {
41796- atomic_inc(&qdev->irq_received_io_cmd);
41797+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41798 wake_up_all(&qdev->io_cmd_event);
41799 }
41800 if (pending & QXL_INTERRUPT_ERROR) {
41801@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41802 init_waitqueue_head(&qdev->io_cmd_event);
41803 INIT_WORK(&qdev->client_monitors_config_work,
41804 qxl_client_monitors_config_work_func);
41805- atomic_set(&qdev->irq_received, 0);
41806- atomic_set(&qdev->irq_received_display, 0);
41807- atomic_set(&qdev->irq_received_cursor, 0);
41808- atomic_set(&qdev->irq_received_io_cmd, 0);
41809+ atomic_set_unchecked(&qdev->irq_received, 0);
41810+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41811+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41812+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41813 qdev->irq_received_error = 0;
41814 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41815 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41816diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41817index 0cbc4c9..0e46686 100644
41818--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41819+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41820@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41821 }
41822 }
41823
41824-static struct vm_operations_struct qxl_ttm_vm_ops;
41825+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41826 static const struct vm_operations_struct *ttm_vm_ops;
41827
41828 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41829@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41830 return r;
41831 if (unlikely(ttm_vm_ops == NULL)) {
41832 ttm_vm_ops = vma->vm_ops;
41833+ pax_open_kernel();
41834 qxl_ttm_vm_ops = *ttm_vm_ops;
41835 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41836+ pax_close_kernel();
41837 }
41838 vma->vm_ops = &qxl_ttm_vm_ops;
41839 return 0;
41840@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41841 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41842 {
41843 #if defined(CONFIG_DEBUG_FS)
41844- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41845- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41846- unsigned i;
41847+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41848+ {
41849+ .name = "qxl_mem_mm",
41850+ .show = &qxl_mm_dump_table,
41851+ },
41852+ {
41853+ .name = "qxl_surf_mm",
41854+ .show = &qxl_mm_dump_table,
41855+ }
41856+ };
41857
41858- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41859- if (i == 0)
41860- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41861- else
41862- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41863- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41864- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41865- qxl_mem_types_list[i].driver_features = 0;
41866- if (i == 0)
41867- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41868- else
41869- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41870+ pax_open_kernel();
41871+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41872+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41873+ pax_close_kernel();
41874
41875- }
41876- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41877+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41878 #else
41879 return 0;
41880 #endif
41881diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41882index 2c45ac9..5d740f8 100644
41883--- a/drivers/gpu/drm/r128/r128_cce.c
41884+++ b/drivers/gpu/drm/r128/r128_cce.c
41885@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41886
41887 /* GH: Simple idle check.
41888 */
41889- atomic_set(&dev_priv->idle_count, 0);
41890+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41891
41892 /* We don't support anything other than bus-mastering ring mode,
41893 * but the ring can be in either AGP or PCI space for the ring
41894diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41895index 723e5d6..102dbaf 100644
41896--- a/drivers/gpu/drm/r128/r128_drv.h
41897+++ b/drivers/gpu/drm/r128/r128_drv.h
41898@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41899 int is_pci;
41900 unsigned long cce_buffers_offset;
41901
41902- atomic_t idle_count;
41903+ atomic_unchecked_t idle_count;
41904
41905 int page_flipping;
41906 int current_page;
41907 u32 crtc_offset;
41908 u32 crtc_offset_cntl;
41909
41910- atomic_t vbl_received;
41911+ atomic_unchecked_t vbl_received;
41912
41913 u32 color_fmt;
41914 unsigned int front_offset;
41915diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41916index 663f38c..ec159a1 100644
41917--- a/drivers/gpu/drm/r128/r128_ioc32.c
41918+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41919@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41920 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41921 }
41922
41923-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41924+drm_ioctl_compat_t r128_compat_ioctls[] = {
41925 [DRM_R128_INIT] = compat_r128_init,
41926 [DRM_R128_DEPTH] = compat_r128_depth,
41927 [DRM_R128_STIPPLE] = compat_r128_stipple,
41928@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41929 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41930 {
41931 unsigned int nr = DRM_IOCTL_NR(cmd);
41932- drm_ioctl_compat_t *fn = NULL;
41933 int ret;
41934
41935 if (nr < DRM_COMMAND_BASE)
41936 return drm_compat_ioctl(filp, cmd, arg);
41937
41938- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41939- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41940-
41941- if (fn != NULL)
41942- ret = (*fn) (filp, cmd, arg);
41943+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41944+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41945 else
41946 ret = drm_ioctl(filp, cmd, arg);
41947
41948diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41949index c2ae496..30b5993 100644
41950--- a/drivers/gpu/drm/r128/r128_irq.c
41951+++ b/drivers/gpu/drm/r128/r128_irq.c
41952@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41953 if (crtc != 0)
41954 return 0;
41955
41956- return atomic_read(&dev_priv->vbl_received);
41957+ return atomic_read_unchecked(&dev_priv->vbl_received);
41958 }
41959
41960 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41961@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41962 /* VBLANK interrupt */
41963 if (status & R128_CRTC_VBLANK_INT) {
41964 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41965- atomic_inc(&dev_priv->vbl_received);
41966+ atomic_inc_unchecked(&dev_priv->vbl_received);
41967 drm_handle_vblank(dev, 0);
41968 return IRQ_HANDLED;
41969 }
41970diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41971index 8fd2d9f..18c9660 100644
41972--- a/drivers/gpu/drm/r128/r128_state.c
41973+++ b/drivers/gpu/drm/r128/r128_state.c
41974@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41975
41976 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41977 {
41978- if (atomic_read(&dev_priv->idle_count) == 0)
41979+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41980 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41981 else
41982- atomic_set(&dev_priv->idle_count, 0);
41983+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41984 }
41985
41986 #endif
41987diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41988index b928c17..e5d9400 100644
41989--- a/drivers/gpu/drm/radeon/mkregtable.c
41990+++ b/drivers/gpu/drm/radeon/mkregtable.c
41991@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41992 regex_t mask_rex;
41993 regmatch_t match[4];
41994 char buf[1024];
41995- size_t end;
41996+ long end;
41997 int len;
41998 int done = 0;
41999 int r;
42000 unsigned o;
42001 struct offset *offset;
42002 char last_reg_s[10];
42003- int last_reg;
42004+ unsigned long last_reg;
42005
42006 if (regcomp
42007 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
42008diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
42009index a7fdfa4..04a3964 100644
42010--- a/drivers/gpu/drm/radeon/radeon_device.c
42011+++ b/drivers/gpu/drm/radeon/radeon_device.c
42012@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
42013 * locking inversion with the driver load path. And the access here is
42014 * completely racy anyway. So don't bother with locking for now.
42015 */
42016- return dev->open_count == 0;
42017+ return local_read(&dev->open_count) == 0;
42018 }
42019
42020 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
42021diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
42022index 46bd393..6ae4719 100644
42023--- a/drivers/gpu/drm/radeon/radeon_drv.h
42024+++ b/drivers/gpu/drm/radeon/radeon_drv.h
42025@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
42026
42027 /* SW interrupt */
42028 wait_queue_head_t swi_queue;
42029- atomic_t swi_emitted;
42030+ atomic_unchecked_t swi_emitted;
42031 int vblank_crtc;
42032 uint32_t irq_enable_reg;
42033 uint32_t r500_disp_irq_reg;
42034diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42035index 0b98ea1..a3c770f 100644
42036--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42037+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42038@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42039 request = compat_alloc_user_space(sizeof(*request));
42040 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42041 || __put_user(req32.param, &request->param)
42042- || __put_user((void __user *)(unsigned long)req32.value,
42043+ || __put_user((unsigned long)req32.value,
42044 &request->value))
42045 return -EFAULT;
42046
42047@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42048 #define compat_radeon_cp_setparam NULL
42049 #endif /* X86_64 || IA64 */
42050
42051-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42052+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42053 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42054 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42055 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42056@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42057 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42058 {
42059 unsigned int nr = DRM_IOCTL_NR(cmd);
42060- drm_ioctl_compat_t *fn = NULL;
42061 int ret;
42062
42063 if (nr < DRM_COMMAND_BASE)
42064 return drm_compat_ioctl(filp, cmd, arg);
42065
42066- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42067- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42068-
42069- if (fn != NULL)
42070- ret = (*fn) (filp, cmd, arg);
42071+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42072+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42073 else
42074 ret = drm_ioctl(filp, cmd, arg);
42075
42076diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42077index 244b19b..c19226d 100644
42078--- a/drivers/gpu/drm/radeon/radeon_irq.c
42079+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42080@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42081 unsigned int ret;
42082 RING_LOCALS;
42083
42084- atomic_inc(&dev_priv->swi_emitted);
42085- ret = atomic_read(&dev_priv->swi_emitted);
42086+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42087+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42088
42089 BEGIN_RING(4);
42090 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42091@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42092 drm_radeon_private_t *dev_priv =
42093 (drm_radeon_private_t *) dev->dev_private;
42094
42095- atomic_set(&dev_priv->swi_emitted, 0);
42096+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42097 init_waitqueue_head(&dev_priv->swi_queue);
42098
42099 dev->max_vblank_count = 0x001fffff;
42100diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42101index 15aee72..cda326e 100644
42102--- a/drivers/gpu/drm/radeon/radeon_state.c
42103+++ b/drivers/gpu/drm/radeon/radeon_state.c
42104@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42105 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42106 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42107
42108- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42109+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42110 sarea_priv->nbox * sizeof(depth_boxes[0])))
42111 return -EFAULT;
42112
42113@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42114 {
42115 drm_radeon_private_t *dev_priv = dev->dev_private;
42116 drm_radeon_getparam_t *param = data;
42117- int value;
42118+ int value = 0;
42119
42120 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42121
42122diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42123index edafd3c..3af7c9c 100644
42124--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42125+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42126@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42127 man->size = size >> PAGE_SHIFT;
42128 }
42129
42130-static struct vm_operations_struct radeon_ttm_vm_ops;
42131+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42132 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42133
42134 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42135@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42136 }
42137 if (unlikely(ttm_vm_ops == NULL)) {
42138 ttm_vm_ops = vma->vm_ops;
42139+ pax_open_kernel();
42140 radeon_ttm_vm_ops = *ttm_vm_ops;
42141 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42142+ pax_close_kernel();
42143 }
42144 vma->vm_ops = &radeon_ttm_vm_ops;
42145 return 0;
42146diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42147index a287e4f..df1d5dd 100644
42148--- a/drivers/gpu/drm/tegra/dc.c
42149+++ b/drivers/gpu/drm/tegra/dc.c
42150@@ -1594,7 +1594,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42151 }
42152
42153 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42154- dc->debugfs_files[i].data = dc;
42155+ *(void **)&dc->debugfs_files[i].data = dc;
42156
42157 err = drm_debugfs_create_files(dc->debugfs_files,
42158 ARRAY_SIZE(debugfs_files),
42159diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42160index ed970f6..4eeea42 100644
42161--- a/drivers/gpu/drm/tegra/dsi.c
42162+++ b/drivers/gpu/drm/tegra/dsi.c
42163@@ -62,7 +62,7 @@ struct tegra_dsi {
42164 struct clk *clk_lp;
42165 struct clk *clk;
42166
42167- struct drm_info_list *debugfs_files;
42168+ drm_info_list_no_const *debugfs_files;
42169 struct drm_minor *minor;
42170 struct dentry *debugfs;
42171
42172diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42173index 06ab178..b5324e4 100644
42174--- a/drivers/gpu/drm/tegra/hdmi.c
42175+++ b/drivers/gpu/drm/tegra/hdmi.c
42176@@ -64,7 +64,7 @@ struct tegra_hdmi {
42177 bool stereo;
42178 bool dvi;
42179
42180- struct drm_info_list *debugfs_files;
42181+ drm_info_list_no_const *debugfs_files;
42182 struct drm_minor *minor;
42183 struct dentry *debugfs;
42184 };
42185diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
42186index 7591d89..463e2b6 100644
42187--- a/drivers/gpu/drm/tegra/sor.c
42188+++ b/drivers/gpu/drm/tegra/sor.c
42189@@ -826,8 +826,11 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor,
42190 goto remove;
42191 }
42192
42193- for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42194- sor->debugfs_files[i].data = sor;
42195+ for (i = 0; i < ARRAY_SIZE(debugfs_files); i++) {
42196+ pax_open_kernel();
42197+ *(void **)&sor->debugfs_files[i].data = sor;
42198+ pax_close_kernel();
42199+ }
42200
42201 err = drm_debugfs_create_files(sor->debugfs_files,
42202 ARRAY_SIZE(debugfs_files),
42203diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42204index aa0bd054..aea6a01 100644
42205--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42206+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42207@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42208 }
42209
42210 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42211- ttm_bo_man_init,
42212- ttm_bo_man_takedown,
42213- ttm_bo_man_get_node,
42214- ttm_bo_man_put_node,
42215- ttm_bo_man_debug
42216+ .init = ttm_bo_man_init,
42217+ .takedown = ttm_bo_man_takedown,
42218+ .get_node = ttm_bo_man_get_node,
42219+ .put_node = ttm_bo_man_put_node,
42220+ .debug = ttm_bo_man_debug
42221 };
42222 EXPORT_SYMBOL(ttm_bo_manager_func);
42223diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42224index a1803fb..c53f6b0 100644
42225--- a/drivers/gpu/drm/ttm/ttm_memory.c
42226+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42227@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42228 zone->glob = glob;
42229 glob->zone_kernel = zone;
42230 ret = kobject_init_and_add(
42231- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42232+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42233 if (unlikely(ret != 0)) {
42234 kobject_put(&zone->kobj);
42235 return ret;
42236@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42237 zone->glob = glob;
42238 glob->zone_dma32 = zone;
42239 ret = kobject_init_and_add(
42240- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42241+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42242 if (unlikely(ret != 0)) {
42243 kobject_put(&zone->kobj);
42244 return ret;
42245diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42246index 025c429..314062f 100644
42247--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42248+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42249@@ -54,7 +54,7 @@
42250
42251 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42252 #define SMALL_ALLOCATION 16
42253-#define FREE_ALL_PAGES (~0U)
42254+#define FREE_ALL_PAGES (~0UL)
42255 /* times are in msecs */
42256 #define PAGE_FREE_INTERVAL 1000
42257
42258@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42259 * @free_all: If set to true will free all pages in pool
42260 * @use_static: Safe to use static buffer
42261 **/
42262-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42263+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42264 bool use_static)
42265 {
42266 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42267 unsigned long irq_flags;
42268 struct page *p;
42269 struct page **pages_to_free;
42270- unsigned freed_pages = 0,
42271- npages_to_free = nr_free;
42272+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42273
42274 if (NUM_PAGES_TO_ALLOC < nr_free)
42275 npages_to_free = NUM_PAGES_TO_ALLOC;
42276@@ -371,7 +370,8 @@ restart:
42277 __list_del(&p->lru, &pool->list);
42278
42279 ttm_pool_update_free_locked(pool, freed_pages);
42280- nr_free -= freed_pages;
42281+ if (likely(nr_free != FREE_ALL_PAGES))
42282+ nr_free -= freed_pages;
42283 }
42284
42285 spin_unlock_irqrestore(&pool->lock, irq_flags);
42286@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42287 unsigned i;
42288 unsigned pool_offset;
42289 struct ttm_page_pool *pool;
42290- int shrink_pages = sc->nr_to_scan;
42291+ unsigned long shrink_pages = sc->nr_to_scan;
42292 unsigned long freed = 0;
42293
42294 if (!mutex_trylock(&lock))
42295@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42296 pool_offset = ++start_pool % NUM_POOLS;
42297 /* select start pool in round robin fashion */
42298 for (i = 0; i < NUM_POOLS; ++i) {
42299- unsigned nr_free = shrink_pages;
42300+ unsigned long nr_free = shrink_pages;
42301 if (shrink_pages == 0)
42302 break;
42303 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42304@@ -673,7 +673,7 @@ out:
42305 }
42306
42307 /* Put all pages in pages list to correct pool to wait for reuse */
42308-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42309+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42310 enum ttm_caching_state cstate)
42311 {
42312 unsigned long irq_flags;
42313@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42314 struct list_head plist;
42315 struct page *p = NULL;
42316 gfp_t gfp_flags = GFP_USER;
42317- unsigned count;
42318+ unsigned long count;
42319 int r;
42320
42321 /* set zero flag for page allocation if required */
42322diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42323index 01e1d27..aaa018a 100644
42324--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42325+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42326@@ -56,7 +56,7 @@
42327
42328 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42329 #define SMALL_ALLOCATION 4
42330-#define FREE_ALL_PAGES (~0U)
42331+#define FREE_ALL_PAGES (~0UL)
42332 /* times are in msecs */
42333 #define IS_UNDEFINED (0)
42334 #define IS_WC (1<<1)
42335@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42336 * @nr_free: If set to true will free all pages in pool
42337 * @use_static: Safe to use static buffer
42338 **/
42339-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42340+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42341 bool use_static)
42342 {
42343 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42344@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42345 struct dma_page *dma_p, *tmp;
42346 struct page **pages_to_free;
42347 struct list_head d_pages;
42348- unsigned freed_pages = 0,
42349- npages_to_free = nr_free;
42350+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42351
42352 if (NUM_PAGES_TO_ALLOC < nr_free)
42353 npages_to_free = NUM_PAGES_TO_ALLOC;
42354@@ -499,7 +498,8 @@ restart:
42355 /* remove range of pages from the pool */
42356 if (freed_pages) {
42357 ttm_pool_update_free_locked(pool, freed_pages);
42358- nr_free -= freed_pages;
42359+ if (likely(nr_free != FREE_ALL_PAGES))
42360+ nr_free -= freed_pages;
42361 }
42362
42363 spin_unlock_irqrestore(&pool->lock, irq_flags);
42364@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42365 struct dma_page *d_page, *next;
42366 enum pool_type type;
42367 bool is_cached = false;
42368- unsigned count = 0, i, npages = 0;
42369+ unsigned long count = 0, i, npages = 0;
42370 unsigned long irq_flags;
42371
42372 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42373@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42374 static unsigned start_pool;
42375 unsigned idx = 0;
42376 unsigned pool_offset;
42377- unsigned shrink_pages = sc->nr_to_scan;
42378+ unsigned long shrink_pages = sc->nr_to_scan;
42379 struct device_pools *p;
42380 unsigned long freed = 0;
42381
42382@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42383 goto out;
42384 pool_offset = ++start_pool % _manager->npools;
42385 list_for_each_entry(p, &_manager->pools, pools) {
42386- unsigned nr_free;
42387+ unsigned long nr_free;
42388
42389 if (!p->dev)
42390 continue;
42391@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42392 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42393 freed += nr_free - shrink_pages;
42394
42395- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42396+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42397 p->pool->dev_name, p->pool->name, current->pid,
42398 nr_free, shrink_pages);
42399 }
42400diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42401index 5fc16ce..1bd84ec 100644
42402--- a/drivers/gpu/drm/udl/udl_fb.c
42403+++ b/drivers/gpu/drm/udl/udl_fb.c
42404@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42405 fb_deferred_io_cleanup(info);
42406 kfree(info->fbdefio);
42407 info->fbdefio = NULL;
42408- info->fbops->fb_mmap = udl_fb_mmap;
42409 }
42410
42411 pr_warn("released /dev/fb%d user=%d count=%d\n",
42412diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42413index ef8c500..01030c8 100644
42414--- a/drivers/gpu/drm/via/via_drv.h
42415+++ b/drivers/gpu/drm/via/via_drv.h
42416@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42417 typedef uint32_t maskarray_t[5];
42418
42419 typedef struct drm_via_irq {
42420- atomic_t irq_received;
42421+ atomic_unchecked_t irq_received;
42422 uint32_t pending_mask;
42423 uint32_t enable_mask;
42424 wait_queue_head_t irq_queue;
42425@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42426 struct timeval last_vblank;
42427 int last_vblank_valid;
42428 unsigned usec_per_vblank;
42429- atomic_t vbl_received;
42430+ atomic_unchecked_t vbl_received;
42431 drm_via_state_t hc_state;
42432 char pci_buf[VIA_PCI_BUF_SIZE];
42433 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42434diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42435index 1319433..a993b0c 100644
42436--- a/drivers/gpu/drm/via/via_irq.c
42437+++ b/drivers/gpu/drm/via/via_irq.c
42438@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42439 if (crtc != 0)
42440 return 0;
42441
42442- return atomic_read(&dev_priv->vbl_received);
42443+ return atomic_read_unchecked(&dev_priv->vbl_received);
42444 }
42445
42446 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42447@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42448
42449 status = VIA_READ(VIA_REG_INTERRUPT);
42450 if (status & VIA_IRQ_VBLANK_PENDING) {
42451- atomic_inc(&dev_priv->vbl_received);
42452- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42453+ atomic_inc_unchecked(&dev_priv->vbl_received);
42454+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42455 do_gettimeofday(&cur_vblank);
42456 if (dev_priv->last_vblank_valid) {
42457 dev_priv->usec_per_vblank =
42458@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42459 dev_priv->last_vblank = cur_vblank;
42460 dev_priv->last_vblank_valid = 1;
42461 }
42462- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42463+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42464 DRM_DEBUG("US per vblank is: %u\n",
42465 dev_priv->usec_per_vblank);
42466 }
42467@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42468
42469 for (i = 0; i < dev_priv->num_irqs; ++i) {
42470 if (status & cur_irq->pending_mask) {
42471- atomic_inc(&cur_irq->irq_received);
42472+ atomic_inc_unchecked(&cur_irq->irq_received);
42473 wake_up(&cur_irq->irq_queue);
42474 handled = 1;
42475 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42476@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42477 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42478 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42479 masks[irq][4]));
42480- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42481+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42482 } else {
42483 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42484 (((cur_irq_sequence =
42485- atomic_read(&cur_irq->irq_received)) -
42486+ atomic_read_unchecked(&cur_irq->irq_received)) -
42487 *sequence) <= (1 << 23)));
42488 }
42489 *sequence = cur_irq_sequence;
42490@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42491 }
42492
42493 for (i = 0; i < dev_priv->num_irqs; ++i) {
42494- atomic_set(&cur_irq->irq_received, 0);
42495+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42496 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42497 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42498 init_waitqueue_head(&cur_irq->irq_queue);
42499@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42500 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42501 case VIA_IRQ_RELATIVE:
42502 irqwait->request.sequence +=
42503- atomic_read(&cur_irq->irq_received);
42504+ atomic_read_unchecked(&cur_irq->irq_received);
42505 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42506 case VIA_IRQ_ABSOLUTE:
42507 break;
42508diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42509index d26a6da..5fa41ed 100644
42510--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42511+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42512@@ -447,7 +447,7 @@ struct vmw_private {
42513 * Fencing and IRQs.
42514 */
42515
42516- atomic_t marker_seq;
42517+ atomic_unchecked_t marker_seq;
42518 wait_queue_head_t fence_queue;
42519 wait_queue_head_t fifo_queue;
42520 spinlock_t waiter_lock;
42521diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42522index 39f2b03..d1b0a64 100644
42523--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42524+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42525@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42526 (unsigned int) min,
42527 (unsigned int) fifo->capabilities);
42528
42529- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42530+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42531 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42532 vmw_marker_queue_init(&fifo->marker_queue);
42533 return vmw_fifo_send_fence(dev_priv, &dummy);
42534@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42535 if (reserveable)
42536 iowrite32(bytes, fifo_mem +
42537 SVGA_FIFO_RESERVED);
42538- return fifo_mem + (next_cmd >> 2);
42539+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42540 } else {
42541 need_bounce = true;
42542 }
42543@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42544
42545 fm = vmw_fifo_reserve(dev_priv, bytes);
42546 if (unlikely(fm == NULL)) {
42547- *seqno = atomic_read(&dev_priv->marker_seq);
42548+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42549 ret = -ENOMEM;
42550 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42551 false, 3*HZ);
42552@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42553 }
42554
42555 do {
42556- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42557+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42558 } while (*seqno == 0);
42559
42560 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42561diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42562index 170b61b..fec7348 100644
42563--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42564+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42565@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42566 }
42567
42568 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42569- vmw_gmrid_man_init,
42570- vmw_gmrid_man_takedown,
42571- vmw_gmrid_man_get_node,
42572- vmw_gmrid_man_put_node,
42573- vmw_gmrid_man_debug
42574+ .init = vmw_gmrid_man_init,
42575+ .takedown = vmw_gmrid_man_takedown,
42576+ .get_node = vmw_gmrid_man_get_node,
42577+ .put_node = vmw_gmrid_man_put_node,
42578+ .debug = vmw_gmrid_man_debug
42579 };
42580diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42581index 69c8ce2..cacb0ab 100644
42582--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42583+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42584@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42585 int ret;
42586
42587 num_clips = arg->num_clips;
42588- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42589+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42590
42591 if (unlikely(num_clips == 0))
42592 return 0;
42593@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42594 int ret;
42595
42596 num_clips = arg->num_clips;
42597- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42598+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42599
42600 if (unlikely(num_clips == 0))
42601 return 0;
42602diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42603index 9fe9827..0aa2fc0 100644
42604--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42605+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42606@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42607 * emitted. Then the fence is stale and signaled.
42608 */
42609
42610- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42611+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42612 > VMW_FENCE_WRAP);
42613
42614 return ret;
42615@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42616
42617 if (fifo_idle)
42618 down_read(&fifo_state->rwsem);
42619- signal_seq = atomic_read(&dev_priv->marker_seq);
42620+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42621 ret = 0;
42622
42623 for (;;) {
42624diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42625index efd1ffd..0ae13ca 100644
42626--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42627+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42628@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42629 while (!vmw_lag_lt(queue, us)) {
42630 spin_lock(&queue->lock);
42631 if (list_empty(&queue->head))
42632- seqno = atomic_read(&dev_priv->marker_seq);
42633+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42634 else {
42635 marker = list_first_entry(&queue->head,
42636 struct vmw_marker, head);
42637diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42638index 37ac7b5..d52a5c9 100644
42639--- a/drivers/gpu/vga/vga_switcheroo.c
42640+++ b/drivers/gpu/vga/vga_switcheroo.c
42641@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42642
42643 /* this version is for the case where the power switch is separate
42644 to the device being powered down. */
42645-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42646+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42647 {
42648 /* copy over all the bus versions */
42649 if (dev->bus && dev->bus->pm) {
42650@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42651 return ret;
42652 }
42653
42654-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42655+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42656 {
42657 /* copy over all the bus versions */
42658 if (dev->bus && dev->bus->pm) {
42659diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42660index 722a925..594c312 100644
42661--- a/drivers/hid/hid-core.c
42662+++ b/drivers/hid/hid-core.c
42663@@ -2552,7 +2552,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42664
42665 int hid_add_device(struct hid_device *hdev)
42666 {
42667- static atomic_t id = ATOMIC_INIT(0);
42668+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42669 int ret;
42670
42671 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42672@@ -2595,7 +2595,7 @@ int hid_add_device(struct hid_device *hdev)
42673 /* XXX hack, any other cleaner solution after the driver core
42674 * is converted to allow more than 20 bytes as the device name? */
42675 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42676- hdev->vendor, hdev->product, atomic_inc_return(&id));
42677+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42678
42679 hid_debug_register(hdev, dev_name(&hdev->dev));
42680 ret = device_add(&hdev->dev);
42681diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
42682index 5614fee..8301fbf 100644
42683--- a/drivers/hid/hid-sensor-custom.c
42684+++ b/drivers/hid/hid-sensor-custom.c
42685@@ -34,7 +34,7 @@ struct hid_sensor_custom_field {
42686 int report_id;
42687 char group_name[HID_CUSTOM_NAME_LENGTH];
42688 struct hid_sensor_hub_attribute_info attribute;
42689- struct device_attribute sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42690+ device_attribute_no_const sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42691 char attr_name[HID_CUSTOM_TOTAL_ATTRS][HID_CUSTOM_NAME_LENGTH];
42692 struct attribute *attrs[HID_CUSTOM_TOTAL_ATTRS];
42693 struct attribute_group hid_custom_attribute_group;
42694@@ -590,7 +590,7 @@ static int hid_sensor_custom_add_attributes(struct hid_sensor_custom
42695 j = 0;
42696 while (j < HID_CUSTOM_TOTAL_ATTRS &&
42697 hid_custom_attrs[j].name) {
42698- struct device_attribute *device_attr;
42699+ device_attribute_no_const *device_attr;
42700
42701 device_attr = &sensor_inst->fields[i].sd_attrs[j];
42702
42703diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42704index c13fb5b..55a3802 100644
42705--- a/drivers/hid/hid-wiimote-debug.c
42706+++ b/drivers/hid/hid-wiimote-debug.c
42707@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42708 else if (size == 0)
42709 return -EIO;
42710
42711- if (copy_to_user(u, buf, size))
42712+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42713 return -EFAULT;
42714
42715 *off += size;
42716diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42717index 54da66d..aa3a3d7 100644
42718--- a/drivers/hv/channel.c
42719+++ b/drivers/hv/channel.c
42720@@ -373,7 +373,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42721 int ret = 0;
42722
42723 next_gpadl_handle =
42724- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42725+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42726
42727 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42728 if (ret)
42729diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42730index d3943bc..3de28a9 100644
42731--- a/drivers/hv/hv.c
42732+++ b/drivers/hv/hv.c
42733@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42734 u64 output_address = (output) ? virt_to_phys(output) : 0;
42735 u32 output_address_hi = output_address >> 32;
42736 u32 output_address_lo = output_address & 0xFFFFFFFF;
42737- void *hypercall_page = hv_context.hypercall_page;
42738+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42739
42740 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42741 "=a"(hv_status_lo) : "d" (control_hi),
42742@@ -164,7 +164,7 @@ int hv_init(void)
42743 /* See if the hypercall page is already set */
42744 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42745
42746- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42747+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42748
42749 if (!virtaddr)
42750 goto cleanup;
42751diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42752index cb5b7dc..6052f22 100644
42753--- a/drivers/hv/hv_balloon.c
42754+++ b/drivers/hv/hv_balloon.c
42755@@ -469,7 +469,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42756
42757 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42758 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42759-static atomic_t trans_id = ATOMIC_INIT(0);
42760+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42761
42762 static int dm_ring_size = (5 * PAGE_SIZE);
42763
42764@@ -941,7 +941,7 @@ static void hot_add_req(struct work_struct *dummy)
42765 pr_info("Memory hot add failed\n");
42766
42767 dm->state = DM_INITIALIZED;
42768- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42769+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42770 vmbus_sendpacket(dm->dev->channel, &resp,
42771 sizeof(struct dm_hot_add_response),
42772 (unsigned long)NULL,
42773@@ -1022,7 +1022,7 @@ static void post_status(struct hv_dynmem_device *dm)
42774 memset(&status, 0, sizeof(struct dm_status));
42775 status.hdr.type = DM_STATUS_REPORT;
42776 status.hdr.size = sizeof(struct dm_status);
42777- status.hdr.trans_id = atomic_inc_return(&trans_id);
42778+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42779
42780 /*
42781 * The host expects the guest to report free and committed memory.
42782@@ -1046,7 +1046,7 @@ static void post_status(struct hv_dynmem_device *dm)
42783 * send the status. This can happen if we were interrupted
42784 * after we picked our transaction ID.
42785 */
42786- if (status.hdr.trans_id != atomic_read(&trans_id))
42787+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42788 return;
42789
42790 /*
42791@@ -1191,7 +1191,7 @@ static void balloon_up(struct work_struct *dummy)
42792 */
42793
42794 do {
42795- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42796+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42797 ret = vmbus_sendpacket(dm_device.dev->channel,
42798 bl_resp,
42799 bl_resp->hdr.size,
42800@@ -1237,7 +1237,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42801
42802 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42803 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42804- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42805+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42806 resp.hdr.size = sizeof(struct dm_unballoon_response);
42807
42808 vmbus_sendpacket(dm_device.dev->channel, &resp,
42809@@ -1298,7 +1298,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42810 memset(&version_req, 0, sizeof(struct dm_version_request));
42811 version_req.hdr.type = DM_VERSION_REQUEST;
42812 version_req.hdr.size = sizeof(struct dm_version_request);
42813- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42814+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42815 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42816 version_req.is_last_attempt = 1;
42817
42818@@ -1471,7 +1471,7 @@ static int balloon_probe(struct hv_device *dev,
42819 memset(&version_req, 0, sizeof(struct dm_version_request));
42820 version_req.hdr.type = DM_VERSION_REQUEST;
42821 version_req.hdr.size = sizeof(struct dm_version_request);
42822- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42823+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42824 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42825 version_req.is_last_attempt = 0;
42826
42827@@ -1502,7 +1502,7 @@ static int balloon_probe(struct hv_device *dev,
42828 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42829 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42830 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42831- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42832+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42833
42834 cap_msg.caps.cap_bits.balloon = 1;
42835 cap_msg.caps.cap_bits.hot_add = 1;
42836diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42837index 887287a..238a626 100644
42838--- a/drivers/hv/hyperv_vmbus.h
42839+++ b/drivers/hv/hyperv_vmbus.h
42840@@ -645,7 +645,7 @@ enum vmbus_connect_state {
42841 struct vmbus_connection {
42842 enum vmbus_connect_state conn_state;
42843
42844- atomic_t next_gpadl_handle;
42845+ atomic_unchecked_t next_gpadl_handle;
42846
42847 /*
42848 * Represents channel interrupts. Each bit position represents a
42849diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42850index 579bdf9..0dac21d5 100644
42851--- a/drivers/hwmon/acpi_power_meter.c
42852+++ b/drivers/hwmon/acpi_power_meter.c
42853@@ -116,7 +116,7 @@ struct sensor_template {
42854 struct device_attribute *devattr,
42855 const char *buf, size_t count);
42856 int index;
42857-};
42858+} __do_const;
42859
42860 /* Averaging interval */
42861 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42862@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42863 struct sensor_template *attrs)
42864 {
42865 struct device *dev = &resource->acpi_dev->dev;
42866- struct sensor_device_attribute *sensors =
42867+ sensor_device_attribute_no_const *sensors =
42868 &resource->sensors[resource->num_sensors];
42869 int res = 0;
42870
42871@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42872 return 0;
42873 }
42874
42875-static struct dmi_system_id __initdata pm_dmi_table[] = {
42876+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42877 {
42878 enable_cap_knobs, "IBM Active Energy Manager",
42879 {
42880diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42881index 0af63da..05a183a 100644
42882--- a/drivers/hwmon/applesmc.c
42883+++ b/drivers/hwmon/applesmc.c
42884@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42885 {
42886 struct applesmc_node_group *grp;
42887 struct applesmc_dev_attr *node;
42888- struct attribute *attr;
42889+ attribute_no_const *attr;
42890 int ret, i;
42891
42892 for (grp = groups; grp->format; grp++) {
42893diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42894index cccef87..06ce8ec 100644
42895--- a/drivers/hwmon/asus_atk0110.c
42896+++ b/drivers/hwmon/asus_atk0110.c
42897@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42898 struct atk_sensor_data {
42899 struct list_head list;
42900 struct atk_data *data;
42901- struct device_attribute label_attr;
42902- struct device_attribute input_attr;
42903- struct device_attribute limit1_attr;
42904- struct device_attribute limit2_attr;
42905+ device_attribute_no_const label_attr;
42906+ device_attribute_no_const input_attr;
42907+ device_attribute_no_const limit1_attr;
42908+ device_attribute_no_const limit2_attr;
42909 char label_attr_name[ATTR_NAME_SIZE];
42910 char input_attr_name[ATTR_NAME_SIZE];
42911 char limit1_attr_name[ATTR_NAME_SIZE];
42912@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42913 static struct device_attribute atk_name_attr =
42914 __ATTR(name, 0444, atk_name_show, NULL);
42915
42916-static void atk_init_attribute(struct device_attribute *attr, char *name,
42917+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42918 sysfs_show_func show)
42919 {
42920 sysfs_attr_init(&attr->attr);
42921diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42922index ed303ba..e24bd26f 100644
42923--- a/drivers/hwmon/coretemp.c
42924+++ b/drivers/hwmon/coretemp.c
42925@@ -782,7 +782,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42926 return NOTIFY_OK;
42927 }
42928
42929-static struct notifier_block coretemp_cpu_notifier __refdata = {
42930+static struct notifier_block coretemp_cpu_notifier = {
42931 .notifier_call = coretemp_cpu_callback,
42932 };
42933
42934diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42935index 7a8a6fb..015c1fd 100644
42936--- a/drivers/hwmon/ibmaem.c
42937+++ b/drivers/hwmon/ibmaem.c
42938@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42939 struct aem_rw_sensor_template *rw)
42940 {
42941 struct device *dev = &data->pdev->dev;
42942- struct sensor_device_attribute *sensors = data->sensors;
42943+ sensor_device_attribute_no_const *sensors = data->sensors;
42944 int err;
42945
42946 /* Set up read-only sensors */
42947diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42948index 17ae2eb..21b71dd 100644
42949--- a/drivers/hwmon/iio_hwmon.c
42950+++ b/drivers/hwmon/iio_hwmon.c
42951@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42952 {
42953 struct device *dev = &pdev->dev;
42954 struct iio_hwmon_state *st;
42955- struct sensor_device_attribute *a;
42956+ sensor_device_attribute_no_const *a;
42957 int ret, i;
42958 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42959 enum iio_chan_type type;
42960diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42961index 37f0170..414ec2c 100644
42962--- a/drivers/hwmon/nct6683.c
42963+++ b/drivers/hwmon/nct6683.c
42964@@ -397,11 +397,11 @@ static struct attribute_group *
42965 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42966 int repeat)
42967 {
42968- struct sensor_device_attribute_2 *a2;
42969- struct sensor_device_attribute *a;
42970+ sensor_device_attribute_2_no_const *a2;
42971+ sensor_device_attribute_no_const *a;
42972 struct sensor_device_template **t;
42973 struct sensor_device_attr_u *su;
42974- struct attribute_group *group;
42975+ attribute_group_no_const *group;
42976 struct attribute **attrs;
42977 int i, j, count;
42978
42979diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42980index bd1c99d..2fa55ad 100644
42981--- a/drivers/hwmon/nct6775.c
42982+++ b/drivers/hwmon/nct6775.c
42983@@ -953,10 +953,10 @@ static struct attribute_group *
42984 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42985 int repeat)
42986 {
42987- struct attribute_group *group;
42988+ attribute_group_no_const *group;
42989 struct sensor_device_attr_u *su;
42990- struct sensor_device_attribute *a;
42991- struct sensor_device_attribute_2 *a2;
42992+ sensor_device_attribute_no_const *a;
42993+ sensor_device_attribute_2_no_const *a2;
42994 struct attribute **attrs;
42995 struct sensor_device_template **t;
42996 int i, count;
42997diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42998index f2e47c7..45d7941 100644
42999--- a/drivers/hwmon/pmbus/pmbus_core.c
43000+++ b/drivers/hwmon/pmbus/pmbus_core.c
43001@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
43002 return 0;
43003 }
43004
43005-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43006+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
43007 const char *name,
43008 umode_t mode,
43009 ssize_t (*show)(struct device *dev,
43010@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43011 dev_attr->store = store;
43012 }
43013
43014-static void pmbus_attr_init(struct sensor_device_attribute *a,
43015+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
43016 const char *name,
43017 umode_t mode,
43018 ssize_t (*show)(struct device *dev,
43019@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
43020 u16 reg, u8 mask)
43021 {
43022 struct pmbus_boolean *boolean;
43023- struct sensor_device_attribute *a;
43024+ sensor_device_attribute_no_const *a;
43025
43026 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
43027 if (!boolean)
43028@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
43029 bool update, bool readonly)
43030 {
43031 struct pmbus_sensor *sensor;
43032- struct device_attribute *a;
43033+ device_attribute_no_const *a;
43034
43035 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
43036 if (!sensor)
43037@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
43038 const char *lstring, int index)
43039 {
43040 struct pmbus_label *label;
43041- struct device_attribute *a;
43042+ device_attribute_no_const *a;
43043
43044 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
43045 if (!label)
43046diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
43047index d4f0935..7420593 100644
43048--- a/drivers/hwmon/sht15.c
43049+++ b/drivers/hwmon/sht15.c
43050@@ -169,7 +169,7 @@ struct sht15_data {
43051 int supply_uv;
43052 bool supply_uv_valid;
43053 struct work_struct update_supply_work;
43054- atomic_t interrupt_handled;
43055+ atomic_unchecked_t interrupt_handled;
43056 };
43057
43058 /**
43059@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43060 ret = gpio_direction_input(data->pdata->gpio_data);
43061 if (ret)
43062 return ret;
43063- atomic_set(&data->interrupt_handled, 0);
43064+ atomic_set_unchecked(&data->interrupt_handled, 0);
43065
43066 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43067 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43068 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43069 /* Only relevant if the interrupt hasn't occurred. */
43070- if (!atomic_read(&data->interrupt_handled))
43071+ if (!atomic_read_unchecked(&data->interrupt_handled))
43072 schedule_work(&data->read_work);
43073 }
43074 ret = wait_event_timeout(data->wait_queue,
43075@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43076
43077 /* First disable the interrupt */
43078 disable_irq_nosync(irq);
43079- atomic_inc(&data->interrupt_handled);
43080+ atomic_inc_unchecked(&data->interrupt_handled);
43081 /* Then schedule a reading work struct */
43082 if (data->state != SHT15_READING_NOTHING)
43083 schedule_work(&data->read_work);
43084@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43085 * If not, then start the interrupt again - care here as could
43086 * have gone low in meantime so verify it hasn't!
43087 */
43088- atomic_set(&data->interrupt_handled, 0);
43089+ atomic_set_unchecked(&data->interrupt_handled, 0);
43090 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43091 /* If still not occurred or another handler was scheduled */
43092 if (gpio_get_value(data->pdata->gpio_data)
43093- || atomic_read(&data->interrupt_handled))
43094+ || atomic_read_unchecked(&data->interrupt_handled))
43095 return;
43096 }
43097
43098diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43099index ac91c07..8e69663 100644
43100--- a/drivers/hwmon/via-cputemp.c
43101+++ b/drivers/hwmon/via-cputemp.c
43102@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43103 return NOTIFY_OK;
43104 }
43105
43106-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43107+static struct notifier_block via_cputemp_cpu_notifier = {
43108 .notifier_call = via_cputemp_cpu_callback,
43109 };
43110
43111diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43112index 65e3240..e6c511d 100644
43113--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43114+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43115@@ -39,7 +39,7 @@
43116 extern struct i2c_adapter amd756_smbus;
43117
43118 static struct i2c_adapter *s4882_adapter;
43119-static struct i2c_algorithm *s4882_algo;
43120+static i2c_algorithm_no_const *s4882_algo;
43121
43122 /* Wrapper access functions for multiplexed SMBus */
43123 static DEFINE_MUTEX(amd756_lock);
43124diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43125index b19a310..d6eece0 100644
43126--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43127+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43128@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43129 /* usb layer */
43130
43131 /* Send command to device, and get response. */
43132-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43133+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43134 {
43135 int ret = 0;
43136 int actual;
43137diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43138index 88eda09..cf40434 100644
43139--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43140+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43141@@ -37,7 +37,7 @@
43142 extern struct i2c_adapter *nforce2_smbus;
43143
43144 static struct i2c_adapter *s4985_adapter;
43145-static struct i2c_algorithm *s4985_algo;
43146+static i2c_algorithm_no_const *s4985_algo;
43147
43148 /* Wrapper access functions for multiplexed SMBus */
43149 static DEFINE_MUTEX(nforce2_lock);
43150diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43151index 71c7a39..71dd3e0 100644
43152--- a/drivers/i2c/i2c-dev.c
43153+++ b/drivers/i2c/i2c-dev.c
43154@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43155 break;
43156 }
43157
43158- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43159+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43160 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43161 if (IS_ERR(rdwr_pa[i].buf)) {
43162 res = PTR_ERR(rdwr_pa[i].buf);
43163diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43164index 0b510ba..4fbb5085 100644
43165--- a/drivers/ide/ide-cd.c
43166+++ b/drivers/ide/ide-cd.c
43167@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43168 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43169 if ((unsigned long)buf & alignment
43170 || blk_rq_bytes(rq) & q->dma_pad_mask
43171- || object_is_on_stack(buf))
43172+ || object_starts_on_stack(buf))
43173 drive->dma = 0;
43174 }
43175 }
43176diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43177index 4df97f6..c751151 100644
43178--- a/drivers/iio/industrialio-core.c
43179+++ b/drivers/iio/industrialio-core.c
43180@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43181 }
43182
43183 static
43184-int __iio_device_attr_init(struct device_attribute *dev_attr,
43185+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43186 const char *postfix,
43187 struct iio_chan_spec const *chan,
43188 ssize_t (*readfunc)(struct device *dev,
43189diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43190index 0271608..81998c5 100644
43191--- a/drivers/infiniband/core/cm.c
43192+++ b/drivers/infiniband/core/cm.c
43193@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43194
43195 struct cm_counter_group {
43196 struct kobject obj;
43197- atomic_long_t counter[CM_ATTR_COUNT];
43198+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43199 };
43200
43201 struct cm_counter_attribute {
43202@@ -1397,7 +1397,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43203 struct ib_mad_send_buf *msg = NULL;
43204 int ret;
43205
43206- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43207+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43208 counter[CM_REQ_COUNTER]);
43209
43210 /* Quick state check to discard duplicate REQs. */
43211@@ -1784,7 +1784,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43212 if (!cm_id_priv)
43213 return;
43214
43215- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43216+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43217 counter[CM_REP_COUNTER]);
43218 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43219 if (ret)
43220@@ -1951,7 +1951,7 @@ static int cm_rtu_handler(struct cm_work *work)
43221 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43222 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43223 spin_unlock_irq(&cm_id_priv->lock);
43224- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43225+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43226 counter[CM_RTU_COUNTER]);
43227 goto out;
43228 }
43229@@ -2134,7 +2134,7 @@ static int cm_dreq_handler(struct cm_work *work)
43230 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43231 dreq_msg->local_comm_id);
43232 if (!cm_id_priv) {
43233- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43234+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43235 counter[CM_DREQ_COUNTER]);
43236 cm_issue_drep(work->port, work->mad_recv_wc);
43237 return -EINVAL;
43238@@ -2159,7 +2159,7 @@ static int cm_dreq_handler(struct cm_work *work)
43239 case IB_CM_MRA_REP_RCVD:
43240 break;
43241 case IB_CM_TIMEWAIT:
43242- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43243+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43244 counter[CM_DREQ_COUNTER]);
43245 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43246 goto unlock;
43247@@ -2173,7 +2173,7 @@ static int cm_dreq_handler(struct cm_work *work)
43248 cm_free_msg(msg);
43249 goto deref;
43250 case IB_CM_DREQ_RCVD:
43251- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43252+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43253 counter[CM_DREQ_COUNTER]);
43254 goto unlock;
43255 default:
43256@@ -2540,7 +2540,7 @@ static int cm_mra_handler(struct cm_work *work)
43257 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43258 cm_id_priv->msg, timeout)) {
43259 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43260- atomic_long_inc(&work->port->
43261+ atomic_long_inc_unchecked(&work->port->
43262 counter_group[CM_RECV_DUPLICATES].
43263 counter[CM_MRA_COUNTER]);
43264 goto out;
43265@@ -2549,7 +2549,7 @@ static int cm_mra_handler(struct cm_work *work)
43266 break;
43267 case IB_CM_MRA_REQ_RCVD:
43268 case IB_CM_MRA_REP_RCVD:
43269- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43270+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43271 counter[CM_MRA_COUNTER]);
43272 /* fall through */
43273 default:
43274@@ -2711,7 +2711,7 @@ static int cm_lap_handler(struct cm_work *work)
43275 case IB_CM_LAP_IDLE:
43276 break;
43277 case IB_CM_MRA_LAP_SENT:
43278- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43279+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43280 counter[CM_LAP_COUNTER]);
43281 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43282 goto unlock;
43283@@ -2727,7 +2727,7 @@ static int cm_lap_handler(struct cm_work *work)
43284 cm_free_msg(msg);
43285 goto deref;
43286 case IB_CM_LAP_RCVD:
43287- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43288+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43289 counter[CM_LAP_COUNTER]);
43290 goto unlock;
43291 default:
43292@@ -3011,7 +3011,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43293 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43294 if (cur_cm_id_priv) {
43295 spin_unlock_irq(&cm.lock);
43296- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43297+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43298 counter[CM_SIDR_REQ_COUNTER]);
43299 goto out; /* Duplicate message. */
43300 }
43301@@ -3223,10 +3223,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43302 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43303 msg->retries = 1;
43304
43305- atomic_long_add(1 + msg->retries,
43306+ atomic_long_add_unchecked(1 + msg->retries,
43307 &port->counter_group[CM_XMIT].counter[attr_index]);
43308 if (msg->retries)
43309- atomic_long_add(msg->retries,
43310+ atomic_long_add_unchecked(msg->retries,
43311 &port->counter_group[CM_XMIT_RETRIES].
43312 counter[attr_index]);
43313
43314@@ -3436,7 +3436,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43315 }
43316
43317 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43318- atomic_long_inc(&port->counter_group[CM_RECV].
43319+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43320 counter[attr_id - CM_ATTR_ID_OFFSET]);
43321
43322 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43323@@ -3667,7 +3667,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43324 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43325
43326 return sprintf(buf, "%ld\n",
43327- atomic_long_read(&group->counter[cm_attr->index]));
43328+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43329 }
43330
43331 static const struct sysfs_ops cm_counter_ops = {
43332diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43333index 9f5ad7c..588cd84 100644
43334--- a/drivers/infiniband/core/fmr_pool.c
43335+++ b/drivers/infiniband/core/fmr_pool.c
43336@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43337
43338 struct task_struct *thread;
43339
43340- atomic_t req_ser;
43341- atomic_t flush_ser;
43342+ atomic_unchecked_t req_ser;
43343+ atomic_unchecked_t flush_ser;
43344
43345 wait_queue_head_t force_wait;
43346 };
43347@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43348 struct ib_fmr_pool *pool = pool_ptr;
43349
43350 do {
43351- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43352+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43353 ib_fmr_batch_release(pool);
43354
43355- atomic_inc(&pool->flush_ser);
43356+ atomic_inc_unchecked(&pool->flush_ser);
43357 wake_up_interruptible(&pool->force_wait);
43358
43359 if (pool->flush_function)
43360@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43361 }
43362
43363 set_current_state(TASK_INTERRUPTIBLE);
43364- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43365+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43366 !kthread_should_stop())
43367 schedule();
43368 __set_current_state(TASK_RUNNING);
43369@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43370 pool->dirty_watermark = params->dirty_watermark;
43371 pool->dirty_len = 0;
43372 spin_lock_init(&pool->pool_lock);
43373- atomic_set(&pool->req_ser, 0);
43374- atomic_set(&pool->flush_ser, 0);
43375+ atomic_set_unchecked(&pool->req_ser, 0);
43376+ atomic_set_unchecked(&pool->flush_ser, 0);
43377 init_waitqueue_head(&pool->force_wait);
43378
43379 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43380@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43381 }
43382 spin_unlock_irq(&pool->pool_lock);
43383
43384- serial = atomic_inc_return(&pool->req_ser);
43385+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43386 wake_up_process(pool->thread);
43387
43388 if (wait_event_interruptible(pool->force_wait,
43389- atomic_read(&pool->flush_ser) - serial >= 0))
43390+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43391 return -EINTR;
43392
43393 return 0;
43394@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43395 } else {
43396 list_add_tail(&fmr->list, &pool->dirty_list);
43397 if (++pool->dirty_len >= pool->dirty_watermark) {
43398- atomic_inc(&pool->req_ser);
43399+ atomic_inc_unchecked(&pool->req_ser);
43400 wake_up_process(pool->thread);
43401 }
43402 }
43403diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43404index a9f0489..27a161b 100644
43405--- a/drivers/infiniband/core/uverbs_cmd.c
43406+++ b/drivers/infiniband/core/uverbs_cmd.c
43407@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43408 if (copy_from_user(&cmd, buf, sizeof cmd))
43409 return -EFAULT;
43410
43411+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43412+ return -EFAULT;
43413+
43414 INIT_UDATA(&udata, buf + sizeof cmd,
43415 (unsigned long) cmd.response + sizeof resp,
43416 in_len - sizeof cmd, out_len - sizeof resp);
43417diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43418index cff815b..75576dd 100644
43419--- a/drivers/infiniband/hw/cxgb4/mem.c
43420+++ b/drivers/infiniband/hw/cxgb4/mem.c
43421@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43422 int err;
43423 struct fw_ri_tpte tpt;
43424 u32 stag_idx;
43425- static atomic_t key;
43426+ static atomic_unchecked_t key;
43427
43428 if (c4iw_fatal_error(rdev))
43429 return -EIO;
43430@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43431 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43432 rdev->stats.stag.max = rdev->stats.stag.cur;
43433 mutex_unlock(&rdev->stats.lock);
43434- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43435+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43436 }
43437 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43438 __func__, stag_state, type, pdid, stag_idx);
43439diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43440index 79b3dbc..96e5fcc 100644
43441--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43442+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43443@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43444 struct ib_atomic_eth *ateth;
43445 struct ipath_ack_entry *e;
43446 u64 vaddr;
43447- atomic64_t *maddr;
43448+ atomic64_unchecked_t *maddr;
43449 u64 sdata;
43450 u32 rkey;
43451 u8 next;
43452@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43453 IB_ACCESS_REMOTE_ATOMIC)))
43454 goto nack_acc_unlck;
43455 /* Perform atomic OP and save result. */
43456- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43457+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43458 sdata = be64_to_cpu(ateth->swap_data);
43459 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43460 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43461- (u64) atomic64_add_return(sdata, maddr) - sdata :
43462+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43463 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43464 be64_to_cpu(ateth->compare_data),
43465 sdata);
43466diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43467index 1f95bba..9530f87 100644
43468--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43469+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43470@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43471 unsigned long flags;
43472 struct ib_wc wc;
43473 u64 sdata;
43474- atomic64_t *maddr;
43475+ atomic64_unchecked_t *maddr;
43476 enum ib_wc_status send_status;
43477
43478 /*
43479@@ -382,11 +382,11 @@ again:
43480 IB_ACCESS_REMOTE_ATOMIC)))
43481 goto acc_err;
43482 /* Perform atomic OP and save result. */
43483- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43484+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43485 sdata = wqe->wr.wr.atomic.compare_add;
43486 *(u64 *) sqp->s_sge.sge.vaddr =
43487 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43488- (u64) atomic64_add_return(sdata, maddr) - sdata :
43489+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43490 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43491 sdata, wqe->wr.wr.atomic.swap);
43492 goto send_comp;
43493diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43494index 9cd2b00..7486df4 100644
43495--- a/drivers/infiniband/hw/mlx4/mad.c
43496+++ b/drivers/infiniband/hw/mlx4/mad.c
43497@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43498
43499 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43500 {
43501- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43502+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43503 cpu_to_be64(0xff00000000000000LL);
43504 }
43505
43506diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43507index ed327e6..ca1739e0 100644
43508--- a/drivers/infiniband/hw/mlx4/mcg.c
43509+++ b/drivers/infiniband/hw/mlx4/mcg.c
43510@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43511 {
43512 char name[20];
43513
43514- atomic_set(&ctx->tid, 0);
43515+ atomic_set_unchecked(&ctx->tid, 0);
43516 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43517 ctx->mcg_wq = create_singlethread_workqueue(name);
43518 if (!ctx->mcg_wq)
43519diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43520index fce39343..9d8fdff 100644
43521--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43522+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43523@@ -435,7 +435,7 @@ struct mlx4_ib_demux_ctx {
43524 struct list_head mcg_mgid0_list;
43525 struct workqueue_struct *mcg_wq;
43526 struct mlx4_ib_demux_pv_ctx **tun;
43527- atomic_t tid;
43528+ atomic_unchecked_t tid;
43529 int flushing; /* flushing the work queue */
43530 };
43531
43532diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43533index 9d3e5c1..6f166df 100644
43534--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43535+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43536@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43537 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43538 }
43539
43540-int mthca_QUERY_FW(struct mthca_dev *dev)
43541+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43542 {
43543 struct mthca_mailbox *mailbox;
43544 u32 *outbox;
43545@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43546 CMD_TIME_CLASS_B);
43547 }
43548
43549-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43550+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43551 int num_mtt)
43552 {
43553 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43554@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43555 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43556 }
43557
43558-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43559+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43560 int eq_num)
43561 {
43562 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43563@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43564 CMD_TIME_CLASS_B);
43565 }
43566
43567-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43568+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43569 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43570 void *in_mad, void *response_mad)
43571 {
43572diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43573index ded76c1..0cf0a08 100644
43574--- a/drivers/infiniband/hw/mthca/mthca_main.c
43575+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43576@@ -692,7 +692,7 @@ err_close:
43577 return err;
43578 }
43579
43580-static int mthca_setup_hca(struct mthca_dev *dev)
43581+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43582 {
43583 int err;
43584
43585diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43586index ed9a989..6aa5dc2 100644
43587--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43588+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43589@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43590 * through the bitmaps)
43591 */
43592
43593-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43594+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43595 {
43596 int o;
43597 int m;
43598@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43599 return key;
43600 }
43601
43602-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43603+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43604 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43605 {
43606 struct mthca_mailbox *mailbox;
43607@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43608 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43609 }
43610
43611-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43612+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43613 u64 *buffer_list, int buffer_size_shift,
43614 int list_len, u64 iova, u64 total_size,
43615 u32 access, struct mthca_mr *mr)
43616diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43617index 415f8e1..e34214e 100644
43618--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43619+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43620@@ -764,7 +764,7 @@ unlock:
43621 return 0;
43622 }
43623
43624-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43625+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43626 {
43627 struct mthca_dev *dev = to_mdev(ibcq->device);
43628 struct mthca_cq *cq = to_mcq(ibcq);
43629diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43630index 9f9d5c5..3c19aac 100644
43631--- a/drivers/infiniband/hw/nes/nes.c
43632+++ b/drivers/infiniband/hw/nes/nes.c
43633@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43634 LIST_HEAD(nes_adapter_list);
43635 static LIST_HEAD(nes_dev_list);
43636
43637-atomic_t qps_destroyed;
43638+atomic_unchecked_t qps_destroyed;
43639
43640 static unsigned int ee_flsh_adapter;
43641 static unsigned int sysfs_nonidx_addr;
43642@@ -279,7 +279,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43643 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43644 struct nes_adapter *nesadapter = nesdev->nesadapter;
43645
43646- atomic_inc(&qps_destroyed);
43647+ atomic_inc_unchecked(&qps_destroyed);
43648
43649 /* Free the control structures */
43650
43651diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43652index bd9d132..70d84f4 100644
43653--- a/drivers/infiniband/hw/nes/nes.h
43654+++ b/drivers/infiniband/hw/nes/nes.h
43655@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43656 extern unsigned int wqm_quanta;
43657 extern struct list_head nes_adapter_list;
43658
43659-extern atomic_t cm_connects;
43660-extern atomic_t cm_accepts;
43661-extern atomic_t cm_disconnects;
43662-extern atomic_t cm_closes;
43663-extern atomic_t cm_connecteds;
43664-extern atomic_t cm_connect_reqs;
43665-extern atomic_t cm_rejects;
43666-extern atomic_t mod_qp_timouts;
43667-extern atomic_t qps_created;
43668-extern atomic_t qps_destroyed;
43669-extern atomic_t sw_qps_destroyed;
43670+extern atomic_unchecked_t cm_connects;
43671+extern atomic_unchecked_t cm_accepts;
43672+extern atomic_unchecked_t cm_disconnects;
43673+extern atomic_unchecked_t cm_closes;
43674+extern atomic_unchecked_t cm_connecteds;
43675+extern atomic_unchecked_t cm_connect_reqs;
43676+extern atomic_unchecked_t cm_rejects;
43677+extern atomic_unchecked_t mod_qp_timouts;
43678+extern atomic_unchecked_t qps_created;
43679+extern atomic_unchecked_t qps_destroyed;
43680+extern atomic_unchecked_t sw_qps_destroyed;
43681 extern u32 mh_detected;
43682 extern u32 mh_pauses_sent;
43683 extern u32 cm_packets_sent;
43684@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43685 extern u32 cm_packets_received;
43686 extern u32 cm_packets_dropped;
43687 extern u32 cm_packets_retrans;
43688-extern atomic_t cm_listens_created;
43689-extern atomic_t cm_listens_destroyed;
43690+extern atomic_unchecked_t cm_listens_created;
43691+extern atomic_unchecked_t cm_listens_destroyed;
43692 extern u32 cm_backlog_drops;
43693-extern atomic_t cm_loopbacks;
43694-extern atomic_t cm_nodes_created;
43695-extern atomic_t cm_nodes_destroyed;
43696-extern atomic_t cm_accel_dropped_pkts;
43697-extern atomic_t cm_resets_recvd;
43698-extern atomic_t pau_qps_created;
43699-extern atomic_t pau_qps_destroyed;
43700+extern atomic_unchecked_t cm_loopbacks;
43701+extern atomic_unchecked_t cm_nodes_created;
43702+extern atomic_unchecked_t cm_nodes_destroyed;
43703+extern atomic_unchecked_t cm_accel_dropped_pkts;
43704+extern atomic_unchecked_t cm_resets_recvd;
43705+extern atomic_unchecked_t pau_qps_created;
43706+extern atomic_unchecked_t pau_qps_destroyed;
43707
43708 extern u32 int_mod_timer_init;
43709 extern u32 int_mod_cq_depth_256;
43710diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43711index 72b4341..2600332 100644
43712--- a/drivers/infiniband/hw/nes/nes_cm.c
43713+++ b/drivers/infiniband/hw/nes/nes_cm.c
43714@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43715 u32 cm_packets_retrans;
43716 u32 cm_packets_created;
43717 u32 cm_packets_received;
43718-atomic_t cm_listens_created;
43719-atomic_t cm_listens_destroyed;
43720+atomic_unchecked_t cm_listens_created;
43721+atomic_unchecked_t cm_listens_destroyed;
43722 u32 cm_backlog_drops;
43723-atomic_t cm_loopbacks;
43724-atomic_t cm_nodes_created;
43725-atomic_t cm_nodes_destroyed;
43726-atomic_t cm_accel_dropped_pkts;
43727-atomic_t cm_resets_recvd;
43728+atomic_unchecked_t cm_loopbacks;
43729+atomic_unchecked_t cm_nodes_created;
43730+atomic_unchecked_t cm_nodes_destroyed;
43731+atomic_unchecked_t cm_accel_dropped_pkts;
43732+atomic_unchecked_t cm_resets_recvd;
43733
43734 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43735 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43736@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43737 /* instance of function pointers for client API */
43738 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43739 static struct nes_cm_ops nes_cm_api = {
43740- mini_cm_accelerated,
43741- mini_cm_listen,
43742- mini_cm_del_listen,
43743- mini_cm_connect,
43744- mini_cm_close,
43745- mini_cm_accept,
43746- mini_cm_reject,
43747- mini_cm_recv_pkt,
43748- mini_cm_dealloc_core,
43749- mini_cm_get,
43750- mini_cm_set
43751+ .accelerated = mini_cm_accelerated,
43752+ .listen = mini_cm_listen,
43753+ .stop_listener = mini_cm_del_listen,
43754+ .connect = mini_cm_connect,
43755+ .close = mini_cm_close,
43756+ .accept = mini_cm_accept,
43757+ .reject = mini_cm_reject,
43758+ .recv_pkt = mini_cm_recv_pkt,
43759+ .destroy_cm_core = mini_cm_dealloc_core,
43760+ .get = mini_cm_get,
43761+ .set = mini_cm_set
43762 };
43763
43764 static struct nes_cm_core *g_cm_core;
43765
43766-atomic_t cm_connects;
43767-atomic_t cm_accepts;
43768-atomic_t cm_disconnects;
43769-atomic_t cm_closes;
43770-atomic_t cm_connecteds;
43771-atomic_t cm_connect_reqs;
43772-atomic_t cm_rejects;
43773+atomic_unchecked_t cm_connects;
43774+atomic_unchecked_t cm_accepts;
43775+atomic_unchecked_t cm_disconnects;
43776+atomic_unchecked_t cm_closes;
43777+atomic_unchecked_t cm_connecteds;
43778+atomic_unchecked_t cm_connect_reqs;
43779+atomic_unchecked_t cm_rejects;
43780
43781 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43782 {
43783@@ -1461,7 +1461,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43784 kfree(listener);
43785 listener = NULL;
43786 ret = 0;
43787- atomic_inc(&cm_listens_destroyed);
43788+ atomic_inc_unchecked(&cm_listens_destroyed);
43789 } else {
43790 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43791 }
43792@@ -1667,7 +1667,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43793 cm_node->rem_mac);
43794
43795 add_hte_node(cm_core, cm_node);
43796- atomic_inc(&cm_nodes_created);
43797+ atomic_inc_unchecked(&cm_nodes_created);
43798
43799 return cm_node;
43800 }
43801@@ -1728,7 +1728,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43802 }
43803
43804 atomic_dec(&cm_core->node_cnt);
43805- atomic_inc(&cm_nodes_destroyed);
43806+ atomic_inc_unchecked(&cm_nodes_destroyed);
43807 nesqp = cm_node->nesqp;
43808 if (nesqp) {
43809 nesqp->cm_node = NULL;
43810@@ -1792,7 +1792,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43811
43812 static void drop_packet(struct sk_buff *skb)
43813 {
43814- atomic_inc(&cm_accel_dropped_pkts);
43815+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43816 dev_kfree_skb_any(skb);
43817 }
43818
43819@@ -1855,7 +1855,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43820 {
43821
43822 int reset = 0; /* whether to send reset in case of err.. */
43823- atomic_inc(&cm_resets_recvd);
43824+ atomic_inc_unchecked(&cm_resets_recvd);
43825 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43826 " refcnt=%d\n", cm_node, cm_node->state,
43827 atomic_read(&cm_node->ref_count));
43828@@ -2523,7 +2523,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43829 rem_ref_cm_node(cm_node->cm_core, cm_node);
43830 return NULL;
43831 }
43832- atomic_inc(&cm_loopbacks);
43833+ atomic_inc_unchecked(&cm_loopbacks);
43834 loopbackremotenode->loopbackpartner = cm_node;
43835 loopbackremotenode->tcp_cntxt.rcv_wscale =
43836 NES_CM_DEFAULT_RCV_WND_SCALE;
43837@@ -2804,7 +2804,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43838 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43839 else {
43840 rem_ref_cm_node(cm_core, cm_node);
43841- atomic_inc(&cm_accel_dropped_pkts);
43842+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43843 dev_kfree_skb_any(skb);
43844 }
43845 break;
43846@@ -3112,7 +3112,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43847
43848 if ((cm_id) && (cm_id->event_handler)) {
43849 if (issue_disconn) {
43850- atomic_inc(&cm_disconnects);
43851+ atomic_inc_unchecked(&cm_disconnects);
43852 cm_event.event = IW_CM_EVENT_DISCONNECT;
43853 cm_event.status = disconn_status;
43854 cm_event.local_addr = cm_id->local_addr;
43855@@ -3134,7 +3134,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43856 }
43857
43858 if (issue_close) {
43859- atomic_inc(&cm_closes);
43860+ atomic_inc_unchecked(&cm_closes);
43861 nes_disconnect(nesqp, 1);
43862
43863 cm_id->provider_data = nesqp;
43864@@ -3272,7 +3272,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43865
43866 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43867 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43868- atomic_inc(&cm_accepts);
43869+ atomic_inc_unchecked(&cm_accepts);
43870
43871 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43872 netdev_refcnt_read(nesvnic->netdev));
43873@@ -3470,7 +3470,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43874 struct nes_cm_core *cm_core;
43875 u8 *start_buff;
43876
43877- atomic_inc(&cm_rejects);
43878+ atomic_inc_unchecked(&cm_rejects);
43879 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43880 loopback = cm_node->loopbackpartner;
43881 cm_core = cm_node->cm_core;
43882@@ -3535,7 +3535,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43883 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43884 ntohs(laddr->sin_port));
43885
43886- atomic_inc(&cm_connects);
43887+ atomic_inc_unchecked(&cm_connects);
43888 nesqp->active_conn = 1;
43889
43890 /* cache the cm_id in the qp */
43891@@ -3680,7 +3680,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43892 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43893 return err;
43894 }
43895- atomic_inc(&cm_listens_created);
43896+ atomic_inc_unchecked(&cm_listens_created);
43897 }
43898
43899 cm_id->add_ref(cm_id);
43900@@ -3787,7 +3787,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43901
43902 if (nesqp->destroyed)
43903 return;
43904- atomic_inc(&cm_connecteds);
43905+ atomic_inc_unchecked(&cm_connecteds);
43906 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43907 " local port 0x%04X. jiffies = %lu.\n",
43908 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43909@@ -3972,7 +3972,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43910
43911 cm_id->add_ref(cm_id);
43912 ret = cm_id->event_handler(cm_id, &cm_event);
43913- atomic_inc(&cm_closes);
43914+ atomic_inc_unchecked(&cm_closes);
43915 cm_event.event = IW_CM_EVENT_CLOSE;
43916 cm_event.status = 0;
43917 cm_event.provider_data = cm_id->provider_data;
43918@@ -4012,7 +4012,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43919 return;
43920 cm_id = cm_node->cm_id;
43921
43922- atomic_inc(&cm_connect_reqs);
43923+ atomic_inc_unchecked(&cm_connect_reqs);
43924 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43925 cm_node, cm_id, jiffies);
43926
43927@@ -4061,7 +4061,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43928 return;
43929 cm_id = cm_node->cm_id;
43930
43931- atomic_inc(&cm_connect_reqs);
43932+ atomic_inc_unchecked(&cm_connect_reqs);
43933 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43934 cm_node, cm_id, jiffies);
43935
43936diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43937index 4166452..fc952c3 100644
43938--- a/drivers/infiniband/hw/nes/nes_mgt.c
43939+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43940@@ -40,8 +40,8 @@
43941 #include "nes.h"
43942 #include "nes_mgt.h"
43943
43944-atomic_t pau_qps_created;
43945-atomic_t pau_qps_destroyed;
43946+atomic_unchecked_t pau_qps_created;
43947+atomic_unchecked_t pau_qps_destroyed;
43948
43949 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43950 {
43951@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43952 {
43953 struct sk_buff *skb;
43954 unsigned long flags;
43955- atomic_inc(&pau_qps_destroyed);
43956+ atomic_inc_unchecked(&pau_qps_destroyed);
43957
43958 /* Free packets that have not yet been forwarded */
43959 /* Lock is acquired by skb_dequeue when removing the skb */
43960@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43961 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43962 skb_queue_head_init(&nesqp->pau_list);
43963 spin_lock_init(&nesqp->pau_lock);
43964- atomic_inc(&pau_qps_created);
43965+ atomic_inc_unchecked(&pau_qps_created);
43966 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43967 }
43968
43969diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43970index 70acda9..a96de9d 100644
43971--- a/drivers/infiniband/hw/nes/nes_nic.c
43972+++ b/drivers/infiniband/hw/nes/nes_nic.c
43973@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43974 target_stat_values[++index] = mh_detected;
43975 target_stat_values[++index] = mh_pauses_sent;
43976 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43977- target_stat_values[++index] = atomic_read(&cm_connects);
43978- target_stat_values[++index] = atomic_read(&cm_accepts);
43979- target_stat_values[++index] = atomic_read(&cm_disconnects);
43980- target_stat_values[++index] = atomic_read(&cm_connecteds);
43981- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43982- target_stat_values[++index] = atomic_read(&cm_rejects);
43983- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43984- target_stat_values[++index] = atomic_read(&qps_created);
43985- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43986- target_stat_values[++index] = atomic_read(&qps_destroyed);
43987- target_stat_values[++index] = atomic_read(&cm_closes);
43988+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43989+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43990+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43991+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43992+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43993+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43994+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43995+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43996+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43997+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43998+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43999 target_stat_values[++index] = cm_packets_sent;
44000 target_stat_values[++index] = cm_packets_bounced;
44001 target_stat_values[++index] = cm_packets_created;
44002 target_stat_values[++index] = cm_packets_received;
44003 target_stat_values[++index] = cm_packets_dropped;
44004 target_stat_values[++index] = cm_packets_retrans;
44005- target_stat_values[++index] = atomic_read(&cm_listens_created);
44006- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
44007+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
44008+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
44009 target_stat_values[++index] = cm_backlog_drops;
44010- target_stat_values[++index] = atomic_read(&cm_loopbacks);
44011- target_stat_values[++index] = atomic_read(&cm_nodes_created);
44012- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
44013- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
44014- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
44015+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
44016+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
44017+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
44018+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
44019+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
44020 target_stat_values[++index] = nesadapter->free_4kpbl;
44021 target_stat_values[++index] = nesadapter->free_256pbl;
44022 target_stat_values[++index] = int_mod_timer_init;
44023 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
44024 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
44025 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
44026- target_stat_values[++index] = atomic_read(&pau_qps_created);
44027- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
44028+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
44029+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
44030 }
44031
44032 /**
44033diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
44034index c0d0296..3185f57 100644
44035--- a/drivers/infiniband/hw/nes/nes_verbs.c
44036+++ b/drivers/infiniband/hw/nes/nes_verbs.c
44037@@ -46,9 +46,9 @@
44038
44039 #include <rdma/ib_umem.h>
44040
44041-atomic_t mod_qp_timouts;
44042-atomic_t qps_created;
44043-atomic_t sw_qps_destroyed;
44044+atomic_unchecked_t mod_qp_timouts;
44045+atomic_unchecked_t qps_created;
44046+atomic_unchecked_t sw_qps_destroyed;
44047
44048 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
44049
44050@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
44051 if (init_attr->create_flags)
44052 return ERR_PTR(-EINVAL);
44053
44054- atomic_inc(&qps_created);
44055+ atomic_inc_unchecked(&qps_created);
44056 switch (init_attr->qp_type) {
44057 case IB_QPT_RC:
44058 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44059@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44060 struct iw_cm_event cm_event;
44061 int ret = 0;
44062
44063- atomic_inc(&sw_qps_destroyed);
44064+ atomic_inc_unchecked(&sw_qps_destroyed);
44065 nesqp->destroyed = 1;
44066
44067 /* Blow away the connection if it exists. */
44068diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44069index 7df16f7..7e1b21e 100644
44070--- a/drivers/infiniband/hw/qib/qib.h
44071+++ b/drivers/infiniband/hw/qib/qib.h
44072@@ -52,6 +52,7 @@
44073 #include <linux/kref.h>
44074 #include <linux/sched.h>
44075 #include <linux/kthread.h>
44076+#include <linux/slab.h>
44077
44078 #include "qib_common.h"
44079 #include "qib_verbs.h"
44080diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44081index cdc7df4..a2fdfdb 100644
44082--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44083+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44084@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44085 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44086 }
44087
44088-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44089+static struct rtnl_link_ops ipoib_link_ops = {
44090 .kind = "ipoib",
44091 .maxtype = IFLA_IPOIB_MAX,
44092 .policy = ipoib_policy,
44093diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44094index e853a21..56fc5a8 100644
44095--- a/drivers/input/gameport/gameport.c
44096+++ b/drivers/input/gameport/gameport.c
44097@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44098 */
44099 static void gameport_init_port(struct gameport *gameport)
44100 {
44101- static atomic_t gameport_no = ATOMIC_INIT(-1);
44102+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44103
44104 __module_get(THIS_MODULE);
44105
44106 mutex_init(&gameport->drv_mutex);
44107 device_initialize(&gameport->dev);
44108 dev_set_name(&gameport->dev, "gameport%lu",
44109- (unsigned long)atomic_inc_return(&gameport_no));
44110+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44111 gameport->dev.bus = &gameport_bus;
44112 gameport->dev.release = gameport_release_port;
44113 if (gameport->parent)
44114diff --git a/drivers/input/input.c b/drivers/input/input.c
44115index cc357f1..ee42fbc 100644
44116--- a/drivers/input/input.c
44117+++ b/drivers/input/input.c
44118@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44119 */
44120 struct input_dev *input_allocate_device(void)
44121 {
44122- static atomic_t input_no = ATOMIC_INIT(-1);
44123+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44124 struct input_dev *dev;
44125
44126 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44127@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44128 INIT_LIST_HEAD(&dev->node);
44129
44130 dev_set_name(&dev->dev, "input%lu",
44131- (unsigned long)atomic_inc_return(&input_no));
44132+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44133
44134 __module_get(THIS_MODULE);
44135 }
44136diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44137index 4a95b22..874c182 100644
44138--- a/drivers/input/joystick/sidewinder.c
44139+++ b/drivers/input/joystick/sidewinder.c
44140@@ -30,6 +30,7 @@
44141 #include <linux/kernel.h>
44142 #include <linux/module.h>
44143 #include <linux/slab.h>
44144+#include <linux/sched.h>
44145 #include <linux/input.h>
44146 #include <linux/gameport.h>
44147 #include <linux/jiffies.h>
44148diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44149index 61c7611..e1bfa38 100644
44150--- a/drivers/input/joystick/xpad.c
44151+++ b/drivers/input/joystick/xpad.c
44152@@ -905,7 +905,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44153
44154 static int xpad_led_probe(struct usb_xpad *xpad)
44155 {
44156- static atomic_t led_seq = ATOMIC_INIT(-1);
44157+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44158 unsigned long led_no;
44159 struct xpad_led *led;
44160 struct led_classdev *led_cdev;
44161@@ -918,7 +918,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44162 if (!led)
44163 return -ENOMEM;
44164
44165- led_no = atomic_inc_return(&led_seq);
44166+ led_no = atomic_inc_return_unchecked(&led_seq);
44167
44168 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44169 led->xpad = xpad;
44170diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44171index ac1fa5f..5f7502c 100644
44172--- a/drivers/input/misc/ims-pcu.c
44173+++ b/drivers/input/misc/ims-pcu.c
44174@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44175
44176 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44177 {
44178- static atomic_t device_no = ATOMIC_INIT(-1);
44179+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44180
44181 const struct ims_pcu_device_info *info;
44182 int error;
44183@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44184 }
44185
44186 /* Device appears to be operable, complete initialization */
44187- pcu->device_no = atomic_inc_return(&device_no);
44188+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44189
44190 /*
44191 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44192diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44193index ad5a5a1..5eac214 100644
44194--- a/drivers/input/mouse/psmouse.h
44195+++ b/drivers/input/mouse/psmouse.h
44196@@ -125,7 +125,7 @@ struct psmouse_attribute {
44197 ssize_t (*set)(struct psmouse *psmouse, void *data,
44198 const char *buf, size_t count);
44199 bool protect;
44200-};
44201+} __do_const;
44202 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44203
44204 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44205diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44206index b604564..3f14ae4 100644
44207--- a/drivers/input/mousedev.c
44208+++ b/drivers/input/mousedev.c
44209@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44210
44211 spin_unlock_irq(&client->packet_lock);
44212
44213- if (copy_to_user(buffer, data, count))
44214+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44215 return -EFAULT;
44216
44217 return count;
44218diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44219index a05a517..323a2fd 100644
44220--- a/drivers/input/serio/serio.c
44221+++ b/drivers/input/serio/serio.c
44222@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44223 */
44224 static void serio_init_port(struct serio *serio)
44225 {
44226- static atomic_t serio_no = ATOMIC_INIT(-1);
44227+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44228
44229 __module_get(THIS_MODULE);
44230
44231@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44232 mutex_init(&serio->drv_mutex);
44233 device_initialize(&serio->dev);
44234 dev_set_name(&serio->dev, "serio%lu",
44235- (unsigned long)atomic_inc_return(&serio_no));
44236+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44237 serio->dev.bus = &serio_bus;
44238 serio->dev.release = serio_release_port;
44239 serio->dev.groups = serio_device_attr_groups;
44240diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44241index 71ef5d6..93380a9 100644
44242--- a/drivers/input/serio/serio_raw.c
44243+++ b/drivers/input/serio/serio_raw.c
44244@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44245
44246 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44247 {
44248- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44249+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44250 struct serio_raw *serio_raw;
44251 int err;
44252
44253@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44254 }
44255
44256 snprintf(serio_raw->name, sizeof(serio_raw->name),
44257- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44258+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44259 kref_init(&serio_raw->kref);
44260 INIT_LIST_HEAD(&serio_raw->client_list);
44261 init_waitqueue_head(&serio_raw->wait);
44262diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44263index 92e2243..8fd9092 100644
44264--- a/drivers/input/touchscreen/htcpen.c
44265+++ b/drivers/input/touchscreen/htcpen.c
44266@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44267 }
44268 };
44269
44270-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44271+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44272 {
44273 .ident = "Shift",
44274 .matches = {
44275diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44276index ca9f4ed..b860ff1 100644
44277--- a/drivers/iommu/amd_iommu.c
44278+++ b/drivers/iommu/amd_iommu.c
44279@@ -829,11 +829,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44280
44281 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44282 {
44283+ phys_addr_t physaddr;
44284 WARN_ON(address & 0x7ULL);
44285
44286 memset(cmd, 0, sizeof(*cmd));
44287- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44288- cmd->data[1] = upper_32_bits(__pa(address));
44289+
44290+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44291+ if (object_starts_on_stack((void *)address)) {
44292+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44293+ physaddr = __pa((u64)adjbuf);
44294+ } else
44295+#endif
44296+ physaddr = __pa(address);
44297+
44298+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44299+ cmd->data[1] = upper_32_bits(physaddr);
44300 cmd->data[2] = 1;
44301 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44302 }
44303diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44304index 65075ef..53823f9 100644
44305--- a/drivers/iommu/arm-smmu.c
44306+++ b/drivers/iommu/arm-smmu.c
44307@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44308
44309 struct arm_smmu_domain {
44310 struct arm_smmu_device *smmu;
44311- struct io_pgtable_ops *pgtbl_ops;
44312+ struct io_pgtable *pgtbl;
44313 spinlock_t pgtbl_lock;
44314 struct arm_smmu_cfg cfg;
44315 enum arm_smmu_domain_stage stage;
44316@@ -817,7 +817,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44317 {
44318 int irq, start, ret = 0;
44319 unsigned long ias, oas;
44320- struct io_pgtable_ops *pgtbl_ops;
44321+ struct io_pgtable *pgtbl;
44322 struct io_pgtable_cfg pgtbl_cfg;
44323 enum io_pgtable_fmt fmt;
44324 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44325@@ -902,14 +902,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44326 };
44327
44328 smmu_domain->smmu = smmu;
44329- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44330- if (!pgtbl_ops) {
44331+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44332+ if (!pgtbl) {
44333 ret = -ENOMEM;
44334 goto out_clear_smmu;
44335 }
44336
44337 /* Update our support page sizes to reflect the page table format */
44338- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44339+ pax_open_kernel();
44340+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44341+ pax_close_kernel();
44342
44343 /* Initialise the context bank with our page table cfg */
44344 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44345@@ -930,7 +932,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44346 mutex_unlock(&smmu_domain->init_mutex);
44347
44348 /* Publish page table ops for map/unmap */
44349- smmu_domain->pgtbl_ops = pgtbl_ops;
44350+ smmu_domain->pgtbl = pgtbl;
44351 return 0;
44352
44353 out_clear_smmu:
44354@@ -963,8 +965,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44355 free_irq(irq, domain);
44356 }
44357
44358- if (smmu_domain->pgtbl_ops)
44359- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44360+ free_io_pgtable(smmu_domain->pgtbl);
44361
44362 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44363 }
44364@@ -1190,13 +1191,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44365 int ret;
44366 unsigned long flags;
44367 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44368- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44369+ struct io_pgtable *iop = smmu_domain->pgtbl;
44370
44371- if (!ops)
44372+ if (!iop)
44373 return -ENODEV;
44374
44375 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44376- ret = ops->map(ops, iova, paddr, size, prot);
44377+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44378 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44379 return ret;
44380 }
44381@@ -1207,13 +1208,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44382 size_t ret;
44383 unsigned long flags;
44384 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44385- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44386+ struct io_pgtable *iop = smmu_domain->pgtbl;
44387
44388- if (!ops)
44389+ if (!iop)
44390 return 0;
44391
44392 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44393- ret = ops->unmap(ops, iova, size);
44394+ ret = iop->ops->unmap(iop, iova, size);
44395 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44396 return ret;
44397 }
44398@@ -1224,7 +1225,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44399 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44400 struct arm_smmu_device *smmu = smmu_domain->smmu;
44401 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44402- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44403+ struct io_pgtable *iop = smmu_domain->pgtbl;
44404 struct device *dev = smmu->dev;
44405 void __iomem *cb_base;
44406 u32 tmp;
44407@@ -1247,7 +1248,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44408 dev_err(dev,
44409 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44410 &iova);
44411- return ops->iova_to_phys(ops, iova);
44412+ return iop->ops->iova_to_phys(iop, iova);
44413 }
44414
44415 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44416@@ -1268,9 +1269,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44417 phys_addr_t ret;
44418 unsigned long flags;
44419 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44420- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44421+ struct io_pgtable *iop = smmu_domain->pgtbl;
44422
44423- if (!ops)
44424+ if (!iop)
44425 return 0;
44426
44427 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44428@@ -1278,7 +1279,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44429 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44430 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44431 } else {
44432- ret = ops->iova_to_phys(ops, iova);
44433+ ret = iop->ops->iova_to_phys(iop, iova);
44434 }
44435
44436 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44437@@ -1668,7 +1669,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44438 size |= SZ_64K | SZ_512M;
44439 }
44440
44441- arm_smmu_ops.pgsize_bitmap &= size;
44442+ pax_open_kernel();
44443+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44444+ pax_close_kernel();
44445 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44446
44447 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44448diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
44449index 5ecfaf2..c87c4b1 100644
44450--- a/drivers/iommu/intel-iommu.c
44451+++ b/drivers/iommu/intel-iommu.c
44452@@ -1756,8 +1756,9 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
44453
44454 static void domain_exit(struct dmar_domain *domain)
44455 {
44456+ struct dmar_drhd_unit *drhd;
44457+ struct intel_iommu *iommu;
44458 struct page *freelist = NULL;
44459- int i;
44460
44461 /* Domain 0 is reserved, so dont process it */
44462 if (!domain)
44463@@ -1777,8 +1778,10 @@ static void domain_exit(struct dmar_domain *domain)
44464
44465 /* clear attached or cached domains */
44466 rcu_read_lock();
44467- for_each_set_bit(i, domain->iommu_bmp, g_num_of_iommus)
44468- iommu_detach_domain(domain, g_iommus[i]);
44469+ for_each_active_iommu(iommu, drhd)
44470+ if (domain_type_is_vm(domain) ||
44471+ test_bit(iommu->seq_id, domain->iommu_bmp))
44472+ iommu_detach_domain(domain, iommu);
44473 rcu_read_unlock();
44474
44475 dma_free_pagelist(freelist);
44476diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44477index 4e46021..f0a24fef 100644
44478--- a/drivers/iommu/io-pgtable-arm.c
44479+++ b/drivers/iommu/io-pgtable-arm.c
44480@@ -36,12 +36,6 @@
44481 #define io_pgtable_to_data(x) \
44482 container_of((x), struct arm_lpae_io_pgtable, iop)
44483
44484-#define io_pgtable_ops_to_pgtable(x) \
44485- container_of((x), struct io_pgtable, ops)
44486-
44487-#define io_pgtable_ops_to_data(x) \
44488- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44489-
44490 /*
44491 * For consistency with the architecture, we always consider
44492 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44493@@ -304,10 +298,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44494 return pte;
44495 }
44496
44497-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44498+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44499 phys_addr_t paddr, size_t size, int iommu_prot)
44500 {
44501- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44502+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44503 arm_lpae_iopte *ptep = data->pgd;
44504 int lvl = ARM_LPAE_START_LVL(data);
44505 arm_lpae_iopte prot;
44506@@ -447,12 +441,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44507 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44508 }
44509
44510-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44511+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44512 size_t size)
44513 {
44514 size_t unmapped;
44515- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44516- struct io_pgtable *iop = &data->iop;
44517+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44518 arm_lpae_iopte *ptep = data->pgd;
44519 int lvl = ARM_LPAE_START_LVL(data);
44520
44521@@ -463,10 +456,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44522 return unmapped;
44523 }
44524
44525-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44526+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44527 unsigned long iova)
44528 {
44529- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44530+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44531 arm_lpae_iopte pte, *ptep = data->pgd;
44532 int lvl = ARM_LPAE_START_LVL(data);
44533
44534@@ -533,6 +526,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44535 }
44536 }
44537
44538+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44539+ .map = arm_lpae_map,
44540+ .unmap = arm_lpae_unmap,
44541+ .iova_to_phys = arm_lpae_iova_to_phys,
44542+};
44543+
44544 static struct arm_lpae_io_pgtable *
44545 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44546 {
44547@@ -564,11 +563,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44548 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44549 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44550
44551- data->iop.ops = (struct io_pgtable_ops) {
44552- .map = arm_lpae_map,
44553- .unmap = arm_lpae_unmap,
44554- .iova_to_phys = arm_lpae_iova_to_phys,
44555- };
44556+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44557
44558 return data;
44559 }
44560@@ -830,9 +825,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44561 .flush_pgtable = dummy_flush_pgtable,
44562 };
44563
44564-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44565+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44566 {
44567- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44568+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44569 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44570
44571 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44572@@ -842,9 +837,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44573 data->bits_per_level, data->pgd);
44574 }
44575
44576-#define __FAIL(ops, i) ({ \
44577+#define __FAIL(iop, i) ({ \
44578 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44579- arm_lpae_dump_ops(ops); \
44580+ arm_lpae_dump_ops(iop); \
44581 selftest_running = false; \
44582 -EFAULT; \
44583 })
44584@@ -859,30 +854,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44585 int i, j;
44586 unsigned long iova;
44587 size_t size;
44588- struct io_pgtable_ops *ops;
44589+ struct io_pgtable *iop;
44590+ const struct io_pgtable_ops *ops;
44591
44592 selftest_running = true;
44593
44594 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44595 cfg_cookie = cfg;
44596- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44597- if (!ops) {
44598+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44599+ if (!iop) {
44600 pr_err("selftest: failed to allocate io pgtable ops\n");
44601 return -ENOMEM;
44602 }
44603+ ops = iop->ops;
44604
44605 /*
44606 * Initial sanity checks.
44607 * Empty page tables shouldn't provide any translations.
44608 */
44609- if (ops->iova_to_phys(ops, 42))
44610- return __FAIL(ops, i);
44611+ if (ops->iova_to_phys(iop, 42))
44612+ return __FAIL(iop, i);
44613
44614- if (ops->iova_to_phys(ops, SZ_1G + 42))
44615- return __FAIL(ops, i);
44616+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44617+ return __FAIL(iop, i);
44618
44619- if (ops->iova_to_phys(ops, SZ_2G + 42))
44620- return __FAIL(ops, i);
44621+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44622+ return __FAIL(iop, i);
44623
44624 /*
44625 * Distinct mappings of different granule sizes.
44626@@ -892,19 +889,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44627 while (j != BITS_PER_LONG) {
44628 size = 1UL << j;
44629
44630- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44631+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44632 IOMMU_WRITE |
44633 IOMMU_NOEXEC |
44634 IOMMU_CACHE))
44635- return __FAIL(ops, i);
44636+ return __FAIL(iop, i);
44637
44638 /* Overlapping mappings */
44639- if (!ops->map(ops, iova, iova + size, size,
44640+ if (!ops->map(iop, iova, iova + size, size,
44641 IOMMU_READ | IOMMU_NOEXEC))
44642- return __FAIL(ops, i);
44643+ return __FAIL(iop, i);
44644
44645- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44646- return __FAIL(ops, i);
44647+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44648+ return __FAIL(iop, i);
44649
44650 iova += SZ_1G;
44651 j++;
44652@@ -913,15 +910,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44653
44654 /* Partial unmap */
44655 size = 1UL << __ffs(cfg->pgsize_bitmap);
44656- if (ops->unmap(ops, SZ_1G + size, size) != size)
44657- return __FAIL(ops, i);
44658+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44659+ return __FAIL(iop, i);
44660
44661 /* Remap of partial unmap */
44662- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44663- return __FAIL(ops, i);
44664+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44665+ return __FAIL(iop, i);
44666
44667- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44668- return __FAIL(ops, i);
44669+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44670+ return __FAIL(iop, i);
44671
44672 /* Full unmap */
44673 iova = 0;
44674@@ -929,25 +926,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44675 while (j != BITS_PER_LONG) {
44676 size = 1UL << j;
44677
44678- if (ops->unmap(ops, iova, size) != size)
44679- return __FAIL(ops, i);
44680+ if (ops->unmap(iop, iova, size) != size)
44681+ return __FAIL(iop, i);
44682
44683- if (ops->iova_to_phys(ops, iova + 42))
44684- return __FAIL(ops, i);
44685+ if (ops->iova_to_phys(iop, iova + 42))
44686+ return __FAIL(iop, i);
44687
44688 /* Remap full block */
44689- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44690- return __FAIL(ops, i);
44691+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44692+ return __FAIL(iop, i);
44693
44694- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44695- return __FAIL(ops, i);
44696+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44697+ return __FAIL(iop, i);
44698
44699 iova += SZ_1G;
44700 j++;
44701 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44702 }
44703
44704- free_io_pgtable_ops(ops);
44705+ free_io_pgtable(iop);
44706 }
44707
44708 selftest_running = false;
44709diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44710index 6436fe2..088c965 100644
44711--- a/drivers/iommu/io-pgtable.c
44712+++ b/drivers/iommu/io-pgtable.c
44713@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44714 #endif
44715 };
44716
44717-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44718+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44719 struct io_pgtable_cfg *cfg,
44720 void *cookie)
44721 {
44722@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44723 iop->cookie = cookie;
44724 iop->cfg = *cfg;
44725
44726- return &iop->ops;
44727+ return iop;
44728 }
44729
44730 /*
44731 * It is the IOMMU driver's responsibility to ensure that the page table
44732 * is no longer accessible to the walker by this point.
44733 */
44734-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44735+void free_io_pgtable(struct io_pgtable *iop)
44736 {
44737- struct io_pgtable *iop;
44738-
44739- if (!ops)
44740+ if (!iop)
44741 return;
44742
44743- iop = container_of(ops, struct io_pgtable, ops);
44744 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44745 io_pgtable_init_table[iop->fmt]->free(iop);
44746 }
44747diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44748index 10e32f6..0b276c8 100644
44749--- a/drivers/iommu/io-pgtable.h
44750+++ b/drivers/iommu/io-pgtable.h
44751@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44752 * These functions map directly onto the iommu_ops member functions with
44753 * the same names.
44754 */
44755+struct io_pgtable;
44756 struct io_pgtable_ops {
44757- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44758+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44759 phys_addr_t paddr, size_t size, int prot);
44760- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44761+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44762 size_t size);
44763- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44764+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44765 unsigned long iova);
44766 };
44767
44768 /**
44769- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44770+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44771 *
44772 * @fmt: The page table format.
44773 * @cfg: The page table configuration. This will be modified to represent
44774@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44775 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44776 * the callback routines in cfg->tlb.
44777 */
44778-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44779- struct io_pgtable_cfg *cfg,
44780- void *cookie);
44781+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44782+ struct io_pgtable_cfg *cfg,
44783+ void *cookie);
44784
44785 /**
44786 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44787@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44788 *
44789 * @ops: The ops returned from alloc_io_pgtable_ops.
44790 */
44791-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44792+void free_io_pgtable(struct io_pgtable *iop);
44793
44794
44795 /*
44796@@ -125,7 +126,7 @@ struct io_pgtable {
44797 enum io_pgtable_fmt fmt;
44798 void *cookie;
44799 struct io_pgtable_cfg cfg;
44800- struct io_pgtable_ops ops;
44801+ const struct io_pgtable_ops *ops;
44802 };
44803
44804 /**
44805diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44806index d4f527e..8e4a4fd 100644
44807--- a/drivers/iommu/iommu.c
44808+++ b/drivers/iommu/iommu.c
44809@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44810 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44811 {
44812 int err;
44813- struct notifier_block *nb;
44814+ notifier_block_no_const *nb;
44815 struct iommu_callback_data cb = {
44816 .ops = ops,
44817 };
44818diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44819index 1a67c53..23181d8 100644
44820--- a/drivers/iommu/ipmmu-vmsa.c
44821+++ b/drivers/iommu/ipmmu-vmsa.c
44822@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44823 struct iommu_domain io_domain;
44824
44825 struct io_pgtable_cfg cfg;
44826- struct io_pgtable_ops *iop;
44827+ struct io_pgtable *iop;
44828
44829 unsigned int context_id;
44830 spinlock_t lock; /* Protects mappings */
44831@@ -328,8 +328,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44832 domain->cfg.oas = 40;
44833 domain->cfg.tlb = &ipmmu_gather_ops;
44834
44835- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44836- domain);
44837+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44838 if (!domain->iop)
44839 return -EINVAL;
44840
44841@@ -487,7 +486,7 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
44842 * been detached.
44843 */
44844 ipmmu_domain_destroy_context(domain);
44845- free_io_pgtable_ops(domain->iop);
44846+ free_io_pgtable(domain->iop);
44847 kfree(domain);
44848 }
44849
44850@@ -556,7 +555,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44851 if (!domain)
44852 return -ENODEV;
44853
44854- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44855+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44856 }
44857
44858 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44859@@ -564,7 +563,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44860 {
44861 struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
44862
44863- return domain->iop->unmap(domain->iop, iova, size);
44864+ return domain->iop->ops->unmap(domain->iop, iova, size);
44865 }
44866
44867 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44868@@ -574,7 +573,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44869
44870 /* TODO: Is locking needed ? */
44871
44872- return domain->iop->iova_to_phys(domain->iop, iova);
44873+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44874 }
44875
44876 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44877diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44878index 390079e..1da9d6c 100644
44879--- a/drivers/iommu/irq_remapping.c
44880+++ b/drivers/iommu/irq_remapping.c
44881@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44882 void panic_if_irq_remap(const char *msg)
44883 {
44884 if (irq_remapping_enabled)
44885- panic(msg);
44886+ panic("%s", msg);
44887 }
44888
44889 static void ir_ack_apic_edge(struct irq_data *data)
44890@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44891
44892 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44893 {
44894- chip->irq_print_chip = ir_print_prefix;
44895- chip->irq_ack = ir_ack_apic_edge;
44896- chip->irq_eoi = ir_ack_apic_level;
44897- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44898+ pax_open_kernel();
44899+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44900+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44901+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44902+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44903+ pax_close_kernel();
44904 }
44905
44906 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44907diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44908index 01999d7..4f14bb7 100644
44909--- a/drivers/irqchip/irq-gic.c
44910+++ b/drivers/irqchip/irq-gic.c
44911@@ -313,7 +313,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44912 chained_irq_exit(chip, desc);
44913 }
44914
44915-static struct irq_chip gic_chip = {
44916+static irq_chip_no_const gic_chip __read_only = {
44917 .name = "GIC",
44918 .irq_mask = gic_mask_irq,
44919 .irq_unmask = gic_unmask_irq,
44920diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44921index 9a0767b..5e5f86f 100644
44922--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44923+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44924@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44925 struct intc_irqpin_iomem *i;
44926 struct resource *io[INTC_IRQPIN_REG_NR];
44927 struct resource *irq;
44928- struct irq_chip *irq_chip;
44929+ irq_chip_no_const *irq_chip;
44930 void (*enable_fn)(struct irq_data *d);
44931 void (*disable_fn)(struct irq_data *d);
44932 const char *name = dev_name(dev);
44933diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44934index cdf80b7..e5c3ade 100644
44935--- a/drivers/irqchip/irq-renesas-irqc.c
44936+++ b/drivers/irqchip/irq-renesas-irqc.c
44937@@ -179,7 +179,7 @@ static int irqc_probe(struct platform_device *pdev)
44938 struct irqc_priv *p;
44939 struct resource *io;
44940 struct resource *irq;
44941- struct irq_chip *irq_chip;
44942+ irq_chip_no_const *irq_chip;
44943 const char *name = dev_name(&pdev->dev);
44944 int ret;
44945 int k;
44946diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44947index 6a2df32..dc962f1 100644
44948--- a/drivers/isdn/capi/capi.c
44949+++ b/drivers/isdn/capi/capi.c
44950@@ -81,8 +81,8 @@ struct capiminor {
44951
44952 struct capi20_appl *ap;
44953 u32 ncci;
44954- atomic_t datahandle;
44955- atomic_t msgid;
44956+ atomic_unchecked_t datahandle;
44957+ atomic_unchecked_t msgid;
44958
44959 struct tty_port port;
44960 int ttyinstop;
44961@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44962 capimsg_setu16(s, 2, mp->ap->applid);
44963 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44964 capimsg_setu8 (s, 5, CAPI_RESP);
44965- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44966+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44967 capimsg_setu32(s, 8, mp->ncci);
44968 capimsg_setu16(s, 12, datahandle);
44969 }
44970@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44971 mp->outbytes -= len;
44972 spin_unlock_bh(&mp->outlock);
44973
44974- datahandle = atomic_inc_return(&mp->datahandle);
44975+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44976 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44977 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44978 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44979 capimsg_setu16(skb->data, 2, mp->ap->applid);
44980 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44981 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44982- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44983+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44984 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44985 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44986 capimsg_setu16(skb->data, 16, len); /* Data length */
44987diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44988index aecec6d..11e13c5 100644
44989--- a/drivers/isdn/gigaset/bas-gigaset.c
44990+++ b/drivers/isdn/gigaset/bas-gigaset.c
44991@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44992
44993
44994 static const struct gigaset_ops gigops = {
44995- gigaset_write_cmd,
44996- gigaset_write_room,
44997- gigaset_chars_in_buffer,
44998- gigaset_brkchars,
44999- gigaset_init_bchannel,
45000- gigaset_close_bchannel,
45001- gigaset_initbcshw,
45002- gigaset_freebcshw,
45003- gigaset_reinitbcshw,
45004- gigaset_initcshw,
45005- gigaset_freecshw,
45006- gigaset_set_modem_ctrl,
45007- gigaset_baud_rate,
45008- gigaset_set_line_ctrl,
45009- gigaset_isoc_send_skb,
45010- gigaset_isoc_input,
45011+ .write_cmd = gigaset_write_cmd,
45012+ .write_room = gigaset_write_room,
45013+ .chars_in_buffer = gigaset_chars_in_buffer,
45014+ .brkchars = gigaset_brkchars,
45015+ .init_bchannel = gigaset_init_bchannel,
45016+ .close_bchannel = gigaset_close_bchannel,
45017+ .initbcshw = gigaset_initbcshw,
45018+ .freebcshw = gigaset_freebcshw,
45019+ .reinitbcshw = gigaset_reinitbcshw,
45020+ .initcshw = gigaset_initcshw,
45021+ .freecshw = gigaset_freecshw,
45022+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45023+ .baud_rate = gigaset_baud_rate,
45024+ .set_line_ctrl = gigaset_set_line_ctrl,
45025+ .send_skb = gigaset_isoc_send_skb,
45026+ .handle_input = gigaset_isoc_input,
45027 };
45028
45029 /* bas_gigaset_init
45030diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
45031index 600c79b..3752bab 100644
45032--- a/drivers/isdn/gigaset/interface.c
45033+++ b/drivers/isdn/gigaset/interface.c
45034@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
45035 }
45036 tty->driver_data = cs;
45037
45038- ++cs->port.count;
45039+ atomic_inc(&cs->port.count);
45040
45041- if (cs->port.count == 1) {
45042+ if (atomic_read(&cs->port.count) == 1) {
45043 tty_port_tty_set(&cs->port, tty);
45044 cs->port.low_latency = 1;
45045 }
45046@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
45047
45048 if (!cs->connected)
45049 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
45050- else if (!cs->port.count)
45051+ else if (!atomic_read(&cs->port.count))
45052 dev_warn(cs->dev, "%s: device not opened\n", __func__);
45053- else if (!--cs->port.count)
45054+ else if (!atomic_dec_return(&cs->port.count))
45055 tty_port_tty_set(&cs->port, NULL);
45056
45057 mutex_unlock(&cs->mutex);
45058diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
45059index 8c91fd5..14f13ce 100644
45060--- a/drivers/isdn/gigaset/ser-gigaset.c
45061+++ b/drivers/isdn/gigaset/ser-gigaset.c
45062@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
45063 }
45064
45065 static const struct gigaset_ops ops = {
45066- gigaset_write_cmd,
45067- gigaset_write_room,
45068- gigaset_chars_in_buffer,
45069- gigaset_brkchars,
45070- gigaset_init_bchannel,
45071- gigaset_close_bchannel,
45072- gigaset_initbcshw,
45073- gigaset_freebcshw,
45074- gigaset_reinitbcshw,
45075- gigaset_initcshw,
45076- gigaset_freecshw,
45077- gigaset_set_modem_ctrl,
45078- gigaset_baud_rate,
45079- gigaset_set_line_ctrl,
45080- gigaset_m10x_send_skb, /* asyncdata.c */
45081- gigaset_m10x_input, /* asyncdata.c */
45082+ .write_cmd = gigaset_write_cmd,
45083+ .write_room = gigaset_write_room,
45084+ .chars_in_buffer = gigaset_chars_in_buffer,
45085+ .brkchars = gigaset_brkchars,
45086+ .init_bchannel = gigaset_init_bchannel,
45087+ .close_bchannel = gigaset_close_bchannel,
45088+ .initbcshw = gigaset_initbcshw,
45089+ .freebcshw = gigaset_freebcshw,
45090+ .reinitbcshw = gigaset_reinitbcshw,
45091+ .initcshw = gigaset_initcshw,
45092+ .freecshw = gigaset_freecshw,
45093+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45094+ .baud_rate = gigaset_baud_rate,
45095+ .set_line_ctrl = gigaset_set_line_ctrl,
45096+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45097+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45098 };
45099
45100
45101diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45102index 5f306e2..5342f88 100644
45103--- a/drivers/isdn/gigaset/usb-gigaset.c
45104+++ b/drivers/isdn/gigaset/usb-gigaset.c
45105@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45106 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45107 memcpy(cs->hw.usb->bchars, buf, 6);
45108 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45109- 0, 0, &buf, 6, 2000);
45110+ 0, 0, buf, 6, 2000);
45111 }
45112
45113 static void gigaset_freebcshw(struct bc_state *bcs)
45114@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45115 }
45116
45117 static const struct gigaset_ops ops = {
45118- gigaset_write_cmd,
45119- gigaset_write_room,
45120- gigaset_chars_in_buffer,
45121- gigaset_brkchars,
45122- gigaset_init_bchannel,
45123- gigaset_close_bchannel,
45124- gigaset_initbcshw,
45125- gigaset_freebcshw,
45126- gigaset_reinitbcshw,
45127- gigaset_initcshw,
45128- gigaset_freecshw,
45129- gigaset_set_modem_ctrl,
45130- gigaset_baud_rate,
45131- gigaset_set_line_ctrl,
45132- gigaset_m10x_send_skb,
45133- gigaset_m10x_input,
45134+ .write_cmd = gigaset_write_cmd,
45135+ .write_room = gigaset_write_room,
45136+ .chars_in_buffer = gigaset_chars_in_buffer,
45137+ .brkchars = gigaset_brkchars,
45138+ .init_bchannel = gigaset_init_bchannel,
45139+ .close_bchannel = gigaset_close_bchannel,
45140+ .initbcshw = gigaset_initbcshw,
45141+ .freebcshw = gigaset_freebcshw,
45142+ .reinitbcshw = gigaset_reinitbcshw,
45143+ .initcshw = gigaset_initcshw,
45144+ .freecshw = gigaset_freecshw,
45145+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45146+ .baud_rate = gigaset_baud_rate,
45147+ .set_line_ctrl = gigaset_set_line_ctrl,
45148+ .send_skb = gigaset_m10x_send_skb,
45149+ .handle_input = gigaset_m10x_input,
45150 };
45151
45152 /*
45153diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45154index 4d9b195..455075c 100644
45155--- a/drivers/isdn/hardware/avm/b1.c
45156+++ b/drivers/isdn/hardware/avm/b1.c
45157@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45158 }
45159 if (left) {
45160 if (t4file->user) {
45161- if (copy_from_user(buf, dp, left))
45162+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45163 return -EFAULT;
45164 } else {
45165 memcpy(buf, dp, left);
45166@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45167 }
45168 if (left) {
45169 if (config->user) {
45170- if (copy_from_user(buf, dp, left))
45171+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45172 return -EFAULT;
45173 } else {
45174 memcpy(buf, dp, left);
45175diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45176index 9b856e1..fa03c92 100644
45177--- a/drivers/isdn/i4l/isdn_common.c
45178+++ b/drivers/isdn/i4l/isdn_common.c
45179@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45180 } else
45181 return -EINVAL;
45182 case IIOCDBGVAR:
45183+ if (!capable(CAP_SYS_RAWIO))
45184+ return -EPERM;
45185 if (arg) {
45186 if (copy_to_user(argp, &dev, sizeof(ulong)))
45187 return -EFAULT;
45188diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45189index 91d5730..336523e 100644
45190--- a/drivers/isdn/i4l/isdn_concap.c
45191+++ b/drivers/isdn/i4l/isdn_concap.c
45192@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45193 }
45194
45195 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45196- &isdn_concap_dl_data_req,
45197- &isdn_concap_dl_connect_req,
45198- &isdn_concap_dl_disconn_req
45199+ .data_req = &isdn_concap_dl_data_req,
45200+ .connect_req = &isdn_concap_dl_connect_req,
45201+ .disconn_req = &isdn_concap_dl_disconn_req
45202 };
45203
45204 /* The following should better go into a dedicated source file such that
45205diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45206index bc91261..2ef7e36 100644
45207--- a/drivers/isdn/i4l/isdn_tty.c
45208+++ b/drivers/isdn/i4l/isdn_tty.c
45209@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45210
45211 #ifdef ISDN_DEBUG_MODEM_OPEN
45212 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45213- port->count);
45214+ atomic_read(&port->count));
45215 #endif
45216- port->count++;
45217+ atomic_inc(&port->count);
45218 port->tty = tty;
45219 /*
45220 * Start up serial port
45221@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45222 #endif
45223 return;
45224 }
45225- if ((tty->count == 1) && (port->count != 1)) {
45226+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45227 /*
45228 * Uh, oh. tty->count is 1, which means that the tty
45229 * structure will be freed. Info->count should always
45230@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45231 * serial port won't be shutdown.
45232 */
45233 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45234- "info->count is %d\n", port->count);
45235- port->count = 1;
45236+ "info->count is %d\n", atomic_read(&port->count));
45237+ atomic_set(&port->count, 1);
45238 }
45239- if (--port->count < 0) {
45240+ if (atomic_dec_return(&port->count) < 0) {
45241 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45242- info->line, port->count);
45243- port->count = 0;
45244+ info->line, atomic_read(&port->count));
45245+ atomic_set(&port->count, 0);
45246 }
45247- if (port->count) {
45248+ if (atomic_read(&port->count)) {
45249 #ifdef ISDN_DEBUG_MODEM_OPEN
45250 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45251 #endif
45252@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45253 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45254 return;
45255 isdn_tty_shutdown(info);
45256- port->count = 0;
45257+ atomic_set(&port->count, 0);
45258 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45259 port->tty = NULL;
45260 wake_up_interruptible(&port->open_wait);
45261@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45262 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45263 modem_info *info = &dev->mdm.info[i];
45264
45265- if (info->port.count == 0)
45266+ if (atomic_read(&info->port.count) == 0)
45267 continue;
45268 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45269 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45270diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45271index e2d4e58..40cd045 100644
45272--- a/drivers/isdn/i4l/isdn_x25iface.c
45273+++ b/drivers/isdn/i4l/isdn_x25iface.c
45274@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45275
45276
45277 static struct concap_proto_ops ix25_pops = {
45278- &isdn_x25iface_proto_new,
45279- &isdn_x25iface_proto_del,
45280- &isdn_x25iface_proto_restart,
45281- &isdn_x25iface_proto_close,
45282- &isdn_x25iface_xmit,
45283- &isdn_x25iface_receive,
45284- &isdn_x25iface_connect_ind,
45285- &isdn_x25iface_disconn_ind
45286+ .proto_new = &isdn_x25iface_proto_new,
45287+ .proto_del = &isdn_x25iface_proto_del,
45288+ .restart = &isdn_x25iface_proto_restart,
45289+ .close = &isdn_x25iface_proto_close,
45290+ .encap_and_xmit = &isdn_x25iface_xmit,
45291+ .data_ind = &isdn_x25iface_receive,
45292+ .connect_ind = &isdn_x25iface_connect_ind,
45293+ .disconn_ind = &isdn_x25iface_disconn_ind
45294 };
45295
45296 /* error message helper function */
45297diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45298index 358a574..b4987ea 100644
45299--- a/drivers/isdn/icn/icn.c
45300+++ b/drivers/isdn/icn/icn.c
45301@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45302 if (count > len)
45303 count = len;
45304 if (user) {
45305- if (copy_from_user(msg, buf, count))
45306+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45307 return -EFAULT;
45308 } else
45309 memcpy(msg, buf, count);
45310diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45311index 52c4382..09e0c7c 100644
45312--- a/drivers/isdn/mISDN/dsp_cmx.c
45313+++ b/drivers/isdn/mISDN/dsp_cmx.c
45314@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45315 static u16 dsp_count; /* last sample count */
45316 static int dsp_count_valid; /* if we have last sample count */
45317
45318-void
45319+void __intentional_overflow(-1)
45320 dsp_cmx_send(void *arg)
45321 {
45322 struct dsp_conf *conf;
45323diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45324index 312ffd3..9263d05 100644
45325--- a/drivers/lguest/core.c
45326+++ b/drivers/lguest/core.c
45327@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45328 * The end address needs +1 because __get_vm_area allocates an
45329 * extra guard page, so we need space for that.
45330 */
45331+
45332+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45333+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45334+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45335+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45336+#else
45337 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45338 VM_ALLOC, switcher_addr, switcher_addr
45339 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45340+#endif
45341+
45342 if (!switcher_vma) {
45343 err = -ENOMEM;
45344 printk("lguest: could not map switcher pages high\n");
45345@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45346 * Now the Switcher is mapped at the right address, we can't fail!
45347 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45348 */
45349- memcpy(switcher_vma->addr, start_switcher_text,
45350+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45351 end_switcher_text - start_switcher_text);
45352
45353 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45354diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45355index e3abebc9..6a35328 100644
45356--- a/drivers/lguest/page_tables.c
45357+++ b/drivers/lguest/page_tables.c
45358@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45359 /*:*/
45360
45361 #ifdef CONFIG_X86_PAE
45362-static void release_pmd(pmd_t *spmd)
45363+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45364 {
45365 /* If the entry's not present, there's nothing to release. */
45366 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45367diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45368index 30f2aef..391c748 100644
45369--- a/drivers/lguest/x86/core.c
45370+++ b/drivers/lguest/x86/core.c
45371@@ -60,7 +60,7 @@ static struct {
45372 /* Offset from where switcher.S was compiled to where we've copied it */
45373 static unsigned long switcher_offset(void)
45374 {
45375- return switcher_addr - (unsigned long)start_switcher_text;
45376+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45377 }
45378
45379 /* This cpu's struct lguest_pages (after the Switcher text page) */
45380@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45381 * These copies are pretty cheap, so we do them unconditionally: */
45382 /* Save the current Host top-level page directory.
45383 */
45384+
45385+#ifdef CONFIG_PAX_PER_CPU_PGD
45386+ pages->state.host_cr3 = read_cr3();
45387+#else
45388 pages->state.host_cr3 = __pa(current->mm->pgd);
45389+#endif
45390+
45391 /*
45392 * Set up the Guest's page tables to see this CPU's pages (and no
45393 * other CPU's pages).
45394@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45395 * compiled-in switcher code and the high-mapped copy we just made.
45396 */
45397 for (i = 0; i < IDT_ENTRIES; i++)
45398- default_idt_entries[i] += switcher_offset();
45399+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45400
45401 /*
45402 * Set up the Switcher's per-cpu areas.
45403@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45404 * it will be undisturbed when we switch. To change %cs and jump we
45405 * need this structure to feed to Intel's "lcall" instruction.
45406 */
45407- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45408+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45409 lguest_entry.segment = LGUEST_CS;
45410
45411 /*
45412diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45413index 40634b0..4f5855e 100644
45414--- a/drivers/lguest/x86/switcher_32.S
45415+++ b/drivers/lguest/x86/switcher_32.S
45416@@ -87,6 +87,7 @@
45417 #include <asm/page.h>
45418 #include <asm/segment.h>
45419 #include <asm/lguest.h>
45420+#include <asm/processor-flags.h>
45421
45422 // We mark the start of the code to copy
45423 // It's placed in .text tho it's never run here
45424@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45425 // Changes type when we load it: damn Intel!
45426 // For after we switch over our page tables
45427 // That entry will be read-only: we'd crash.
45428+
45429+#ifdef CONFIG_PAX_KERNEXEC
45430+ mov %cr0, %edx
45431+ xor $X86_CR0_WP, %edx
45432+ mov %edx, %cr0
45433+#endif
45434+
45435 movl $(GDT_ENTRY_TSS*8), %edx
45436 ltr %dx
45437
45438@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45439 // Let's clear it again for our return.
45440 // The GDT descriptor of the Host
45441 // Points to the table after two "size" bytes
45442- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45443+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45444 // Clear "used" from type field (byte 5, bit 2)
45445- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45446+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45447+
45448+#ifdef CONFIG_PAX_KERNEXEC
45449+ mov %cr0, %eax
45450+ xor $X86_CR0_WP, %eax
45451+ mov %eax, %cr0
45452+#endif
45453
45454 // Once our page table's switched, the Guest is live!
45455 // The Host fades as we run this final step.
45456@@ -295,13 +309,12 @@ deliver_to_host:
45457 // I consulted gcc, and it gave
45458 // These instructions, which I gladly credit:
45459 leal (%edx,%ebx,8), %eax
45460- movzwl (%eax),%edx
45461- movl 4(%eax), %eax
45462- xorw %ax, %ax
45463- orl %eax, %edx
45464+ movl 4(%eax), %edx
45465+ movw (%eax), %dx
45466 // Now the address of the handler's in %edx
45467 // We call it now: its "iret" drops us home.
45468- jmp *%edx
45469+ ljmp $__KERNEL_CS, $1f
45470+1: jmp *%edx
45471
45472 // Every interrupt can come to us here
45473 // But we must truly tell each apart.
45474diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45475index a08e3ee..df8ade2 100644
45476--- a/drivers/md/bcache/closure.h
45477+++ b/drivers/md/bcache/closure.h
45478@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45479 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45480 struct workqueue_struct *wq)
45481 {
45482- BUG_ON(object_is_on_stack(cl));
45483+ BUG_ON(object_starts_on_stack(cl));
45484 closure_set_ip(cl);
45485 cl->fn = fn;
45486 cl->wq = wq;
45487diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45488index 135a090..f7872f6 100644
45489--- a/drivers/md/bitmap.c
45490+++ b/drivers/md/bitmap.c
45491@@ -1927,7 +1927,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45492 chunk_kb ? "KB" : "B");
45493 if (bitmap->storage.file) {
45494 seq_printf(seq, ", file: ");
45495- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45496+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45497 }
45498
45499 seq_printf(seq, "\n");
45500diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45501index 720ceeb..030f1d4 100644
45502--- a/drivers/md/dm-ioctl.c
45503+++ b/drivers/md/dm-ioctl.c
45504@@ -1773,7 +1773,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45505 cmd == DM_LIST_VERSIONS_CMD)
45506 return 0;
45507
45508- if ((cmd == DM_DEV_CREATE_CMD)) {
45509+ if (cmd == DM_DEV_CREATE_CMD) {
45510 if (!*param->name) {
45511 DMWARN("name not supplied when creating device");
45512 return -EINVAL;
45513diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45514index 089d627..ef7352e 100644
45515--- a/drivers/md/dm-raid1.c
45516+++ b/drivers/md/dm-raid1.c
45517@@ -40,7 +40,7 @@ enum dm_raid1_error {
45518
45519 struct mirror {
45520 struct mirror_set *ms;
45521- atomic_t error_count;
45522+ atomic_unchecked_t error_count;
45523 unsigned long error_type;
45524 struct dm_dev *dev;
45525 sector_t offset;
45526@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45527 struct mirror *m;
45528
45529 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45530- if (!atomic_read(&m->error_count))
45531+ if (!atomic_read_unchecked(&m->error_count))
45532 return m;
45533
45534 return NULL;
45535@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45536 * simple way to tell if a device has encountered
45537 * errors.
45538 */
45539- atomic_inc(&m->error_count);
45540+ atomic_inc_unchecked(&m->error_count);
45541
45542 if (test_and_set_bit(error_type, &m->error_type))
45543 return;
45544@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45545 struct mirror *m = get_default_mirror(ms);
45546
45547 do {
45548- if (likely(!atomic_read(&m->error_count)))
45549+ if (likely(!atomic_read_unchecked(&m->error_count)))
45550 return m;
45551
45552 if (m-- == ms->mirror)
45553@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45554 {
45555 struct mirror *default_mirror = get_default_mirror(m->ms);
45556
45557- return !atomic_read(&default_mirror->error_count);
45558+ return !atomic_read_unchecked(&default_mirror->error_count);
45559 }
45560
45561 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45562@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45563 */
45564 if (likely(region_in_sync(ms, region, 1)))
45565 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45566- else if (m && atomic_read(&m->error_count))
45567+ else if (m && atomic_read_unchecked(&m->error_count))
45568 m = NULL;
45569
45570 if (likely(m))
45571@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45572 }
45573
45574 ms->mirror[mirror].ms = ms;
45575- atomic_set(&(ms->mirror[mirror].error_count), 0);
45576+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45577 ms->mirror[mirror].error_type = 0;
45578 ms->mirror[mirror].offset = offset;
45579
45580@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45581 */
45582 static char device_status_char(struct mirror *m)
45583 {
45584- if (!atomic_read(&(m->error_count)))
45585+ if (!atomic_read_unchecked(&(m->error_count)))
45586 return 'A';
45587
45588 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45589diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45590index f478a4c..4b8e5ef 100644
45591--- a/drivers/md/dm-stats.c
45592+++ b/drivers/md/dm-stats.c
45593@@ -382,7 +382,7 @@ do_sync_free:
45594 synchronize_rcu_expedited();
45595 dm_stat_free(&s->rcu_head);
45596 } else {
45597- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45598+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45599 call_rcu(&s->rcu_head, dm_stat_free);
45600 }
45601 return 0;
45602@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45603 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45604 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45605 ));
45606- ACCESS_ONCE(last->last_sector) = end_sector;
45607- ACCESS_ONCE(last->last_rw) = bi_rw;
45608+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45609+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45610 }
45611
45612 rcu_read_lock();
45613diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45614index f8b37d4..5c5cafd 100644
45615--- a/drivers/md/dm-stripe.c
45616+++ b/drivers/md/dm-stripe.c
45617@@ -21,7 +21,7 @@ struct stripe {
45618 struct dm_dev *dev;
45619 sector_t physical_start;
45620
45621- atomic_t error_count;
45622+ atomic_unchecked_t error_count;
45623 };
45624
45625 struct stripe_c {
45626@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45627 kfree(sc);
45628 return r;
45629 }
45630- atomic_set(&(sc->stripe[i].error_count), 0);
45631+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45632 }
45633
45634 ti->private = sc;
45635@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45636 DMEMIT("%d ", sc->stripes);
45637 for (i = 0; i < sc->stripes; i++) {
45638 DMEMIT("%s ", sc->stripe[i].dev->name);
45639- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45640+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45641 'D' : 'A';
45642 }
45643 buffer[i] = '\0';
45644@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45645 */
45646 for (i = 0; i < sc->stripes; i++)
45647 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45648- atomic_inc(&(sc->stripe[i].error_count));
45649- if (atomic_read(&(sc->stripe[i].error_count)) <
45650+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45651+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45652 DM_IO_ERROR_THRESHOLD)
45653 schedule_work(&sc->trigger_event);
45654 }
45655diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45656index 16ba55a..31af906 100644
45657--- a/drivers/md/dm-table.c
45658+++ b/drivers/md/dm-table.c
45659@@ -305,7 +305,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45660 if (!dev_size)
45661 return 0;
45662
45663- if ((start >= dev_size) || (start + len > dev_size)) {
45664+ if ((start >= dev_size) || (len > dev_size - start)) {
45665 DMWARN("%s: %s too small for target: "
45666 "start=%llu, len=%llu, dev_size=%llu",
45667 dm_device_name(ti->table->md), bdevname(bdev, b),
45668diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45669index 79f6941..b33b4e0 100644
45670--- a/drivers/md/dm-thin-metadata.c
45671+++ b/drivers/md/dm-thin-metadata.c
45672@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45673 {
45674 pmd->info.tm = pmd->tm;
45675 pmd->info.levels = 2;
45676- pmd->info.value_type.context = pmd->data_sm;
45677+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45678 pmd->info.value_type.size = sizeof(__le64);
45679 pmd->info.value_type.inc = data_block_inc;
45680 pmd->info.value_type.dec = data_block_dec;
45681@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45682
45683 pmd->bl_info.tm = pmd->tm;
45684 pmd->bl_info.levels = 1;
45685- pmd->bl_info.value_type.context = pmd->data_sm;
45686+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45687 pmd->bl_info.value_type.size = sizeof(__le64);
45688 pmd->bl_info.value_type.inc = data_block_inc;
45689 pmd->bl_info.value_type.dec = data_block_dec;
45690diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45691index 2caf492..0c0dcac 100644
45692--- a/drivers/md/dm.c
45693+++ b/drivers/md/dm.c
45694@@ -191,9 +191,9 @@ struct mapped_device {
45695 /*
45696 * Event handling.
45697 */
45698- atomic_t event_nr;
45699+ atomic_unchecked_t event_nr;
45700 wait_queue_head_t eventq;
45701- atomic_t uevent_seq;
45702+ atomic_unchecked_t uevent_seq;
45703 struct list_head uevent_list;
45704 spinlock_t uevent_lock; /* Protect access to uevent_list */
45705
45706@@ -2298,8 +2298,8 @@ static struct mapped_device *alloc_dev(int minor)
45707 spin_lock_init(&md->deferred_lock);
45708 atomic_set(&md->holders, 1);
45709 atomic_set(&md->open_count, 0);
45710- atomic_set(&md->event_nr, 0);
45711- atomic_set(&md->uevent_seq, 0);
45712+ atomic_set_unchecked(&md->event_nr, 0);
45713+ atomic_set_unchecked(&md->uevent_seq, 0);
45714 INIT_LIST_HEAD(&md->uevent_list);
45715 INIT_LIST_HEAD(&md->table_devices);
45716 spin_lock_init(&md->uevent_lock);
45717@@ -2466,7 +2466,7 @@ static void event_callback(void *context)
45718
45719 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45720
45721- atomic_inc(&md->event_nr);
45722+ atomic_inc_unchecked(&md->event_nr);
45723 wake_up(&md->eventq);
45724 }
45725
45726@@ -3465,18 +3465,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45727
45728 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45729 {
45730- return atomic_add_return(1, &md->uevent_seq);
45731+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45732 }
45733
45734 uint32_t dm_get_event_nr(struct mapped_device *md)
45735 {
45736- return atomic_read(&md->event_nr);
45737+ return atomic_read_unchecked(&md->event_nr);
45738 }
45739
45740 int dm_wait_event(struct mapped_device *md, int event_nr)
45741 {
45742 return wait_event_interruptible(md->eventq,
45743- (event_nr != atomic_read(&md->event_nr)));
45744+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45745 }
45746
45747 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45748diff --git a/drivers/md/md.c b/drivers/md/md.c
45749index 4dbed4a..bed2a6a 100644
45750--- a/drivers/md/md.c
45751+++ b/drivers/md/md.c
45752@@ -197,10 +197,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45753 * start build, activate spare
45754 */
45755 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45756-static atomic_t md_event_count;
45757+static atomic_unchecked_t md_event_count;
45758 void md_new_event(struct mddev *mddev)
45759 {
45760- atomic_inc(&md_event_count);
45761+ atomic_inc_unchecked(&md_event_count);
45762 wake_up(&md_event_waiters);
45763 }
45764 EXPORT_SYMBOL_GPL(md_new_event);
45765@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45766 */
45767 static void md_new_event_inintr(struct mddev *mddev)
45768 {
45769- atomic_inc(&md_event_count);
45770+ atomic_inc_unchecked(&md_event_count);
45771 wake_up(&md_event_waiters);
45772 }
45773
45774@@ -1449,7 +1449,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45775 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45776 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45777 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45778- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45779+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45780
45781 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45782 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45783@@ -1700,7 +1700,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45784 else
45785 sb->resync_offset = cpu_to_le64(0);
45786
45787- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45788+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45789
45790 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45791 sb->size = cpu_to_le64(mddev->dev_sectors);
45792@@ -2624,7 +2624,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45793 static ssize_t
45794 errors_show(struct md_rdev *rdev, char *page)
45795 {
45796- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45797+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45798 }
45799
45800 static ssize_t
45801@@ -2633,7 +2633,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45802 char *e;
45803 unsigned long n = simple_strtoul(buf, &e, 10);
45804 if (*buf && (*e == 0 || *e == '\n')) {
45805- atomic_set(&rdev->corrected_errors, n);
45806+ atomic_set_unchecked(&rdev->corrected_errors, n);
45807 return len;
45808 }
45809 return -EINVAL;
45810@@ -3069,8 +3069,8 @@ int md_rdev_init(struct md_rdev *rdev)
45811 rdev->sb_loaded = 0;
45812 rdev->bb_page = NULL;
45813 atomic_set(&rdev->nr_pending, 0);
45814- atomic_set(&rdev->read_errors, 0);
45815- atomic_set(&rdev->corrected_errors, 0);
45816+ atomic_set_unchecked(&rdev->read_errors, 0);
45817+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45818
45819 INIT_LIST_HEAD(&rdev->same_set);
45820 init_waitqueue_head(&rdev->blocked_wait);
45821@@ -7232,7 +7232,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45822
45823 spin_unlock(&pers_lock);
45824 seq_printf(seq, "\n");
45825- seq->poll_event = atomic_read(&md_event_count);
45826+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45827 return 0;
45828 }
45829 if (v == (void*)2) {
45830@@ -7335,7 +7335,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45831 return error;
45832
45833 seq = file->private_data;
45834- seq->poll_event = atomic_read(&md_event_count);
45835+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45836 return error;
45837 }
45838
45839@@ -7352,7 +7352,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45840 /* always allow read */
45841 mask = POLLIN | POLLRDNORM;
45842
45843- if (seq->poll_event != atomic_read(&md_event_count))
45844+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45845 mask |= POLLERR | POLLPRI;
45846 return mask;
45847 }
45848@@ -7448,7 +7448,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45849 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45850 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45851 (int)part_stat_read(&disk->part0, sectors[1]) -
45852- atomic_read(&disk->sync_io);
45853+ atomic_read_unchecked(&disk->sync_io);
45854 /* sync IO will cause sync_io to increase before the disk_stats
45855 * as sync_io is counted when a request starts, and
45856 * disk_stats is counted when it completes.
45857diff --git a/drivers/md/md.h b/drivers/md/md.h
45858index 4046a6c..e2f2997 100644
45859--- a/drivers/md/md.h
45860+++ b/drivers/md/md.h
45861@@ -95,13 +95,13 @@ struct md_rdev {
45862 * only maintained for arrays that
45863 * support hot removal
45864 */
45865- atomic_t read_errors; /* number of consecutive read errors that
45866+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45867 * we have tried to ignore.
45868 */
45869 struct timespec last_read_error; /* monotonic time since our
45870 * last read error
45871 */
45872- atomic_t corrected_errors; /* number of corrected read errors,
45873+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45874 * for reporting to userspace and storing
45875 * in superblock.
45876 */
45877@@ -486,7 +486,7 @@ extern void mddev_unlock(struct mddev *mddev);
45878
45879 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45880 {
45881- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45882+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45883 }
45884
45885 struct md_personality
45886diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45887index e8a9042..35bd145 100644
45888--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45889+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45890@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45891 * Flick into a mode where all blocks get allocated in the new area.
45892 */
45893 smm->begin = old_len;
45894- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45895+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45896
45897 /*
45898 * Extend.
45899@@ -714,7 +714,7 @@ out:
45900 /*
45901 * Switch back to normal behaviour.
45902 */
45903- memcpy(sm, &ops, sizeof(*sm));
45904+ memcpy((void *)sm, &ops, sizeof(*sm));
45905 return r;
45906 }
45907
45908diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45909index 3e6d115..ffecdeb 100644
45910--- a/drivers/md/persistent-data/dm-space-map.h
45911+++ b/drivers/md/persistent-data/dm-space-map.h
45912@@ -71,6 +71,7 @@ struct dm_space_map {
45913 dm_sm_threshold_fn fn,
45914 void *context);
45915 };
45916+typedef struct dm_space_map __no_const dm_space_map_no_const;
45917
45918 /*----------------------------------------------------------------*/
45919
45920diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45921index 9157a29..0d462f0 100644
45922--- a/drivers/md/raid1.c
45923+++ b/drivers/md/raid1.c
45924@@ -1934,7 +1934,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45925 if (r1_sync_page_io(rdev, sect, s,
45926 bio->bi_io_vec[idx].bv_page,
45927 READ) != 0)
45928- atomic_add(s, &rdev->corrected_errors);
45929+ atomic_add_unchecked(s, &rdev->corrected_errors);
45930 }
45931 sectors -= s;
45932 sect += s;
45933@@ -2167,7 +2167,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45934 !test_bit(Faulty, &rdev->flags)) {
45935 if (r1_sync_page_io(rdev, sect, s,
45936 conf->tmppage, READ)) {
45937- atomic_add(s, &rdev->corrected_errors);
45938+ atomic_add_unchecked(s, &rdev->corrected_errors);
45939 printk(KERN_INFO
45940 "md/raid1:%s: read error corrected "
45941 "(%d sectors at %llu on %s)\n",
45942diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45943index f55c3f3..4cca8c8 100644
45944--- a/drivers/md/raid10.c
45945+++ b/drivers/md/raid10.c
45946@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45947 /* The write handler will notice the lack of
45948 * R10BIO_Uptodate and record any errors etc
45949 */
45950- atomic_add(r10_bio->sectors,
45951+ atomic_add_unchecked(r10_bio->sectors,
45952 &conf->mirrors[d].rdev->corrected_errors);
45953
45954 /* for reconstruct, we always reschedule after a read.
45955@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45956 {
45957 struct timespec cur_time_mon;
45958 unsigned long hours_since_last;
45959- unsigned int read_errors = atomic_read(&rdev->read_errors);
45960+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45961
45962 ktime_get_ts(&cur_time_mon);
45963
45964@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45965 * overflowing the shift of read_errors by hours_since_last.
45966 */
45967 if (hours_since_last >= 8 * sizeof(read_errors))
45968- atomic_set(&rdev->read_errors, 0);
45969+ atomic_set_unchecked(&rdev->read_errors, 0);
45970 else
45971- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45972+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45973 }
45974
45975 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45976@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45977 return;
45978
45979 check_decay_read_errors(mddev, rdev);
45980- atomic_inc(&rdev->read_errors);
45981- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45982+ atomic_inc_unchecked(&rdev->read_errors);
45983+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45984 char b[BDEVNAME_SIZE];
45985 bdevname(rdev->bdev, b);
45986
45987@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45988 "md/raid10:%s: %s: Raid device exceeded "
45989 "read_error threshold [cur %d:max %d]\n",
45990 mdname(mddev), b,
45991- atomic_read(&rdev->read_errors), max_read_errors);
45992+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45993 printk(KERN_NOTICE
45994 "md/raid10:%s: %s: Failing raid device\n",
45995 mdname(mddev), b);
45996@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45997 sect +
45998 choose_data_offset(r10_bio, rdev)),
45999 bdevname(rdev->bdev, b));
46000- atomic_add(s, &rdev->corrected_errors);
46001+ atomic_add_unchecked(s, &rdev->corrected_errors);
46002 }
46003
46004 rdev_dec_pending(rdev, mddev);
46005diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
46006index b6793d2..92be2bc 100644
46007--- a/drivers/md/raid5.c
46008+++ b/drivers/md/raid5.c
46009@@ -1108,23 +1108,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
46010 struct bio_vec bvl;
46011 struct bvec_iter iter;
46012 struct page *bio_page;
46013- int page_offset;
46014+ s64 page_offset;
46015 struct async_submit_ctl submit;
46016 enum async_tx_flags flags = 0;
46017
46018 if (bio->bi_iter.bi_sector >= sector)
46019- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
46020+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
46021 else
46022- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
46023+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
46024
46025 if (frombio)
46026 flags |= ASYNC_TX_FENCE;
46027 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
46028
46029 bio_for_each_segment(bvl, bio, iter) {
46030- int len = bvl.bv_len;
46031- int clen;
46032- int b_offset = 0;
46033+ s64 len = bvl.bv_len;
46034+ s64 clen;
46035+ s64 b_offset = 0;
46036
46037 if (page_offset < 0) {
46038 b_offset = -page_offset;
46039@@ -2017,6 +2017,10 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
46040 return 1;
46041 }
46042
46043+#ifdef CONFIG_GRKERNSEC_HIDESYM
46044+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
46045+#endif
46046+
46047 static int grow_stripes(struct r5conf *conf, int num)
46048 {
46049 struct kmem_cache *sc;
46050@@ -2027,7 +2031,11 @@ static int grow_stripes(struct r5conf *conf, int num)
46051 "raid%d-%s", conf->level, mdname(conf->mddev));
46052 else
46053 sprintf(conf->cache_name[0],
46054+#ifdef CONFIG_GRKERNSEC_HIDESYM
46055+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
46056+#else
46057 "raid%d-%p", conf->level, conf->mddev);
46058+#endif
46059 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
46060
46061 conf->active_name = 0;
46062@@ -2315,21 +2323,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
46063 mdname(conf->mddev), STRIPE_SECTORS,
46064 (unsigned long long)s,
46065 bdevname(rdev->bdev, b));
46066- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
46067+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
46068 clear_bit(R5_ReadError, &sh->dev[i].flags);
46069 clear_bit(R5_ReWrite, &sh->dev[i].flags);
46070 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
46071 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
46072
46073- if (atomic_read(&rdev->read_errors))
46074- atomic_set(&rdev->read_errors, 0);
46075+ if (atomic_read_unchecked(&rdev->read_errors))
46076+ atomic_set_unchecked(&rdev->read_errors, 0);
46077 } else {
46078 const char *bdn = bdevname(rdev->bdev, b);
46079 int retry = 0;
46080 int set_bad = 0;
46081
46082 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46083- atomic_inc(&rdev->read_errors);
46084+ atomic_inc_unchecked(&rdev->read_errors);
46085 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46086 printk_ratelimited(
46087 KERN_WARNING
46088@@ -2357,7 +2365,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46089 mdname(conf->mddev),
46090 (unsigned long long)s,
46091 bdn);
46092- } else if (atomic_read(&rdev->read_errors)
46093+ } else if (atomic_read_unchecked(&rdev->read_errors)
46094 > conf->max_nr_stripes)
46095 printk(KERN_WARNING
46096 "md/raid:%s: Too many read errors, failing device %s.\n",
46097diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46098index 13bb57f..0ca21b2 100644
46099--- a/drivers/media/dvb-core/dvbdev.c
46100+++ b/drivers/media/dvb-core/dvbdev.c
46101@@ -272,7 +272,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46102 const struct dvb_device *template, void *priv, int type)
46103 {
46104 struct dvb_device *dvbdev;
46105- struct file_operations *dvbdevfops;
46106+ file_operations_no_const *dvbdevfops;
46107 struct device *clsdev;
46108 int minor;
46109 int id;
46110diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46111index 6ad22b6..6e90e2a 100644
46112--- a/drivers/media/dvb-frontends/af9033.h
46113+++ b/drivers/media/dvb-frontends/af9033.h
46114@@ -96,6 +96,6 @@ struct af9033_ops {
46115 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46116 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46117 int onoff);
46118-};
46119+} __no_const;
46120
46121 #endif /* AF9033_H */
46122diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46123index 6ae9899..07d8543 100644
46124--- a/drivers/media/dvb-frontends/dib3000.h
46125+++ b/drivers/media/dvb-frontends/dib3000.h
46126@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46127 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46128 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46129 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46130-};
46131+} __no_const;
46132
46133 #if IS_REACHABLE(CONFIG_DVB_DIB3000MB)
46134 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46135diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46136index baa2789..c8de7fe 100644
46137--- a/drivers/media/dvb-frontends/dib7000p.h
46138+++ b/drivers/media/dvb-frontends/dib7000p.h
46139@@ -64,7 +64,7 @@ struct dib7000p_ops {
46140 int (*get_adc_power)(struct dvb_frontend *fe);
46141 int (*slave_reset)(struct dvb_frontend *fe);
46142 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46143-};
46144+} __no_const;
46145
46146 #if IS_REACHABLE(CONFIG_DVB_DIB7000P)
46147 void *dib7000p_attach(struct dib7000p_ops *ops);
46148diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46149index 780c37b..50e2620 100644
46150--- a/drivers/media/dvb-frontends/dib8000.h
46151+++ b/drivers/media/dvb-frontends/dib8000.h
46152@@ -61,7 +61,7 @@ struct dib8000_ops {
46153 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46154 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46155 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46156-};
46157+} __no_const;
46158
46159 #if IS_REACHABLE(CONFIG_DVB_DIB8000)
46160 void *dib8000_attach(struct dib8000_ops *ops);
46161diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46162index c9decd8..7849cec 100644
46163--- a/drivers/media/pci/cx88/cx88-video.c
46164+++ b/drivers/media/pci/cx88/cx88-video.c
46165@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46166
46167 /* ------------------------------------------------------------------ */
46168
46169-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46170-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46171-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46172+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46173+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46174+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46175
46176 module_param_array(video_nr, int, NULL, 0444);
46177 module_param_array(vbi_nr, int, NULL, 0444);
46178diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46179index c2e60b4..5eeccc0 100644
46180--- a/drivers/media/pci/ivtv/ivtv-driver.c
46181+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46182@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46183 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46184
46185 /* ivtv instance counter */
46186-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46187+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46188
46189 /* Parameter declarations */
46190 static int cardtype[IVTV_MAX_CARDS];
46191diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46192index 570d119..ed25830 100644
46193--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46194+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46195@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46196
46197 static int solo_sysfs_init(struct solo_dev *solo_dev)
46198 {
46199- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46200+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46201 struct device *dev = &solo_dev->dev;
46202 const char *driver;
46203 int i;
46204diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46205index 7ddc767..1c24361 100644
46206--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46207+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46208@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46209
46210 int solo_g723_init(struct solo_dev *solo_dev)
46211 {
46212- static struct snd_device_ops ops = { NULL };
46213+ static struct snd_device_ops ops = { };
46214 struct snd_card *card;
46215 struct snd_kcontrol_new kctl;
46216 char name[32];
46217diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46218index 8c84846..27b4f83 100644
46219--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46220+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46221@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46222
46223 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46224 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46225- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46226+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46227 if (p2m_id < 0)
46228 p2m_id = -p2m_id;
46229 }
46230diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46231index 1ca54b0..7d7cb9a 100644
46232--- a/drivers/media/pci/solo6x10/solo6x10.h
46233+++ b/drivers/media/pci/solo6x10/solo6x10.h
46234@@ -218,7 +218,7 @@ struct solo_dev {
46235
46236 /* P2M DMA Engine */
46237 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46238- atomic_t p2m_count;
46239+ atomic_unchecked_t p2m_count;
46240 int p2m_jiffies;
46241 unsigned int p2m_timeouts;
46242
46243diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46244index c135165..dc69499 100644
46245--- a/drivers/media/pci/tw68/tw68-core.c
46246+++ b/drivers/media/pci/tw68/tw68-core.c
46247@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46248 module_param_array(card, int, NULL, 0444);
46249 MODULE_PARM_DESC(card, "card type");
46250
46251-static atomic_t tw68_instance = ATOMIC_INIT(0);
46252+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46253
46254 /* ------------------------------------------------------------------ */
46255
46256diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46257index 17b189a..b78aa6b 100644
46258--- a/drivers/media/platform/omap/omap_vout.c
46259+++ b/drivers/media/platform/omap/omap_vout.c
46260@@ -63,7 +63,6 @@ enum omap_vout_channels {
46261 OMAP_VIDEO2,
46262 };
46263
46264-static struct videobuf_queue_ops video_vbq_ops;
46265 /* Variables configurable through module params*/
46266 static u32 video1_numbuffers = 3;
46267 static u32 video2_numbuffers = 3;
46268@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46269 {
46270 struct videobuf_queue *q;
46271 struct omap_vout_device *vout = NULL;
46272+ static struct videobuf_queue_ops video_vbq_ops = {
46273+ .buf_setup = omap_vout_buffer_setup,
46274+ .buf_prepare = omap_vout_buffer_prepare,
46275+ .buf_release = omap_vout_buffer_release,
46276+ .buf_queue = omap_vout_buffer_queue,
46277+ };
46278
46279 vout = video_drvdata(file);
46280 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46281@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46282 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46283
46284 q = &vout->vbq;
46285- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46286- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46287- video_vbq_ops.buf_release = omap_vout_buffer_release;
46288- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46289 spin_lock_init(&vout->vbq_lock);
46290
46291 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46292diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46293index fb2acc5..a2fcbdc4 100644
46294--- a/drivers/media/platform/s5p-tv/mixer.h
46295+++ b/drivers/media/platform/s5p-tv/mixer.h
46296@@ -156,7 +156,7 @@ struct mxr_layer {
46297 /** layer index (unique identifier) */
46298 int idx;
46299 /** callbacks for layer methods */
46300- struct mxr_layer_ops ops;
46301+ struct mxr_layer_ops *ops;
46302 /** format array */
46303 const struct mxr_format **fmt_array;
46304 /** size of format array */
46305diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46306index 74344c7..a39e70e 100644
46307--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46308+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46309@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46310 {
46311 struct mxr_layer *layer;
46312 int ret;
46313- struct mxr_layer_ops ops = {
46314+ static struct mxr_layer_ops ops = {
46315 .release = mxr_graph_layer_release,
46316 .buffer_set = mxr_graph_buffer_set,
46317 .stream_set = mxr_graph_stream_set,
46318diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46319index b713403..53cb5ad 100644
46320--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46321+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46322@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46323 layer->update_buf = next;
46324 }
46325
46326- layer->ops.buffer_set(layer, layer->update_buf);
46327+ layer->ops->buffer_set(layer, layer->update_buf);
46328
46329 if (done && done != layer->shadow_buf)
46330 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46331diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46332index 751f3b6..d829203 100644
46333--- a/drivers/media/platform/s5p-tv/mixer_video.c
46334+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46335@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46336 layer->geo.src.height = layer->geo.src.full_height;
46337
46338 mxr_geometry_dump(mdev, &layer->geo);
46339- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46340+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46341 mxr_geometry_dump(mdev, &layer->geo);
46342 }
46343
46344@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46345 layer->geo.dst.full_width = mbus_fmt.width;
46346 layer->geo.dst.full_height = mbus_fmt.height;
46347 layer->geo.dst.field = mbus_fmt.field;
46348- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46349+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46350
46351 mxr_geometry_dump(mdev, &layer->geo);
46352 }
46353@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46354 /* set source size to highest accepted value */
46355 geo->src.full_width = max(geo->dst.full_width, pix->width);
46356 geo->src.full_height = max(geo->dst.full_height, pix->height);
46357- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46358+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46359 mxr_geometry_dump(mdev, &layer->geo);
46360 /* set cropping to total visible screen */
46361 geo->src.width = pix->width;
46362@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46363 geo->src.x_offset = 0;
46364 geo->src.y_offset = 0;
46365 /* assure consistency of geometry */
46366- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46367+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46368 mxr_geometry_dump(mdev, &layer->geo);
46369 /* set full size to lowest possible value */
46370 geo->src.full_width = 0;
46371 geo->src.full_height = 0;
46372- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46373+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46374 mxr_geometry_dump(mdev, &layer->geo);
46375
46376 /* returning results */
46377@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46378 target->width = s->r.width;
46379 target->height = s->r.height;
46380
46381- layer->ops.fix_geometry(layer, stage, s->flags);
46382+ layer->ops->fix_geometry(layer, stage, s->flags);
46383
46384 /* retrieve update selection rectangle */
46385 res.left = target->x_offset;
46386@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46387 mxr_output_get(mdev);
46388
46389 mxr_layer_update_output(layer);
46390- layer->ops.format_set(layer);
46391+ layer->ops->format_set(layer);
46392 /* enabling layer in hardware */
46393 spin_lock_irqsave(&layer->enq_slock, flags);
46394 layer->state = MXR_LAYER_STREAMING;
46395 spin_unlock_irqrestore(&layer->enq_slock, flags);
46396
46397- layer->ops.stream_set(layer, MXR_ENABLE);
46398+ layer->ops->stream_set(layer, MXR_ENABLE);
46399 mxr_streamer_get(mdev);
46400
46401 return 0;
46402@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46403 spin_unlock_irqrestore(&layer->enq_slock, flags);
46404
46405 /* disabling layer in hardware */
46406- layer->ops.stream_set(layer, MXR_DISABLE);
46407+ layer->ops->stream_set(layer, MXR_DISABLE);
46408 /* remove one streamer */
46409 mxr_streamer_put(mdev);
46410 /* allow changes in output configuration */
46411@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46412
46413 void mxr_layer_release(struct mxr_layer *layer)
46414 {
46415- if (layer->ops.release)
46416- layer->ops.release(layer);
46417+ if (layer->ops->release)
46418+ layer->ops->release(layer);
46419 }
46420
46421 void mxr_base_layer_release(struct mxr_layer *layer)
46422@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46423
46424 layer->mdev = mdev;
46425 layer->idx = idx;
46426- layer->ops = *ops;
46427+ layer->ops = ops;
46428
46429 spin_lock_init(&layer->enq_slock);
46430 INIT_LIST_HEAD(&layer->enq_list);
46431diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46432index c9388c4..ce71ece 100644
46433--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46434+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46435@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46436 {
46437 struct mxr_layer *layer;
46438 int ret;
46439- struct mxr_layer_ops ops = {
46440+ static struct mxr_layer_ops ops = {
46441 .release = mxr_vp_layer_release,
46442 .buffer_set = mxr_vp_buffer_set,
46443 .stream_set = mxr_vp_stream_set,
46444diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46445index 82affae..42833ec 100644
46446--- a/drivers/media/radio/radio-cadet.c
46447+++ b/drivers/media/radio/radio-cadet.c
46448@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46449 unsigned char readbuf[RDS_BUFFER];
46450 int i = 0;
46451
46452+ if (count > RDS_BUFFER)
46453+ return -EFAULT;
46454 mutex_lock(&dev->lock);
46455 if (dev->rdsstat == 0)
46456 cadet_start_rds(dev);
46457@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46458 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46459 mutex_unlock(&dev->lock);
46460
46461- if (i && copy_to_user(data, readbuf, i))
46462- return -EFAULT;
46463+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46464+ i = -EFAULT;
46465+
46466 return i;
46467 }
46468
46469diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46470index 5236035..c622c74 100644
46471--- a/drivers/media/radio/radio-maxiradio.c
46472+++ b/drivers/media/radio/radio-maxiradio.c
46473@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46474 /* TEA5757 pin mappings */
46475 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46476
46477-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46478+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46479
46480 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46481 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46482diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46483index 050b3bb..79f62b9 100644
46484--- a/drivers/media/radio/radio-shark.c
46485+++ b/drivers/media/radio/radio-shark.c
46486@@ -79,7 +79,7 @@ struct shark_device {
46487 u32 last_val;
46488 };
46489
46490-static atomic_t shark_instance = ATOMIC_INIT(0);
46491+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46492
46493 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46494 {
46495diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46496index 8654e0d..0608a64 100644
46497--- a/drivers/media/radio/radio-shark2.c
46498+++ b/drivers/media/radio/radio-shark2.c
46499@@ -74,7 +74,7 @@ struct shark_device {
46500 u8 *transfer_buffer;
46501 };
46502
46503-static atomic_t shark_instance = ATOMIC_INIT(0);
46504+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46505
46506 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46507 {
46508diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46509index dccf586..d5db411 100644
46510--- a/drivers/media/radio/radio-si476x.c
46511+++ b/drivers/media/radio/radio-si476x.c
46512@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46513 struct si476x_radio *radio;
46514 struct v4l2_ctrl *ctrl;
46515
46516- static atomic_t instance = ATOMIC_INIT(0);
46517+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46518
46519 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46520 if (!radio)
46521diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46522index 704397f..4d05977 100644
46523--- a/drivers/media/radio/wl128x/fmdrv_common.c
46524+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46525@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46526 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46527
46528 /* Radio Nr */
46529-static u32 radio_nr = -1;
46530+static int radio_nr = -1;
46531 module_param(radio_nr, int, 0444);
46532 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46533
46534diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46535index 9fd1527..8927230 100644
46536--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46537+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46538@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46539
46540 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46541 {
46542- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46543- char result[64];
46544- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46545- sizeof(result), 0);
46546+ char *buf;
46547+ char *result;
46548+ int retval;
46549+
46550+ buf = kmalloc(2, GFP_KERNEL);
46551+ if (buf == NULL)
46552+ return -ENOMEM;
46553+ result = kmalloc(64, GFP_KERNEL);
46554+ if (result == NULL) {
46555+ kfree(buf);
46556+ return -ENOMEM;
46557+ }
46558+
46559+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46560+ buf[1] = enable ? 1 : 0;
46561+
46562+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46563+
46564+ kfree(buf);
46565+ kfree(result);
46566+ return retval;
46567 }
46568
46569 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46570 {
46571- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46572- char state[3];
46573- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46574+ char *buf;
46575+ char *state;
46576+ int retval;
46577+
46578+ buf = kmalloc(2, GFP_KERNEL);
46579+ if (buf == NULL)
46580+ return -ENOMEM;
46581+ state = kmalloc(3, GFP_KERNEL);
46582+ if (state == NULL) {
46583+ kfree(buf);
46584+ return -ENOMEM;
46585+ }
46586+
46587+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46588+ buf[1] = enable ? 1 : 0;
46589+
46590+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46591+
46592+ kfree(buf);
46593+ kfree(state);
46594+ return retval;
46595 }
46596
46597 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46598 {
46599- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46600- char state[3];
46601+ char *query;
46602+ char *state;
46603 int ret;
46604+ query = kmalloc(1, GFP_KERNEL);
46605+ if (query == NULL)
46606+ return -ENOMEM;
46607+ state = kmalloc(3, GFP_KERNEL);
46608+ if (state == NULL) {
46609+ kfree(query);
46610+ return -ENOMEM;
46611+ }
46612+
46613+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46614
46615 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46616
46617- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46618- sizeof(state), 0);
46619+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46620 if (ret < 0) {
46621 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46622 "state info\n");
46623@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46624
46625 /* Copy this pointer as we are gonna need it in the release phase */
46626 cinergyt2_usb_device = adap->dev;
46627-
46628+ kfree(query);
46629+ kfree(state);
46630 return 0;
46631 }
46632
46633@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46634 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46635 {
46636 struct cinergyt2_state *st = d->priv;
46637- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46638+ u8 *key, *cmd;
46639 int i;
46640
46641+ cmd = kmalloc(1, GFP_KERNEL);
46642+ if (cmd == NULL)
46643+ return -EINVAL;
46644+ key = kzalloc(5, GFP_KERNEL);
46645+ if (key == NULL) {
46646+ kfree(cmd);
46647+ return -EINVAL;
46648+ }
46649+
46650+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46651+
46652 *state = REMOTE_NO_KEY_PRESSED;
46653
46654- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46655+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46656 if (key[4] == 0xff) {
46657 /* key repeat */
46658 st->rc_counter++;
46659@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46660 *event = d->last_event;
46661 deb_rc("repeat key, event %x\n",
46662 *event);
46663- return 0;
46664+ goto out;
46665 }
46666 }
46667 deb_rc("repeated key (non repeatable)\n");
46668 }
46669- return 0;
46670+ goto out;
46671 }
46672
46673 /* hack to pass checksum on the custom field */
46674@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46675
46676 deb_rc("key: %*ph\n", 5, key);
46677 }
46678+out:
46679+ kfree(cmd);
46680+ kfree(key);
46681 return 0;
46682 }
46683
46684diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46685index c890fe4..f9b2ae6 100644
46686--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46687+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46688@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46689 fe_status_t *status)
46690 {
46691 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46692- struct dvbt_get_status_msg result;
46693- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46694+ struct dvbt_get_status_msg *result;
46695+ u8 *cmd;
46696 int ret;
46697
46698- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46699- sizeof(result), 0);
46700+ cmd = kmalloc(1, GFP_KERNEL);
46701+ if (cmd == NULL)
46702+ return -ENOMEM;
46703+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46704+ if (result == NULL) {
46705+ kfree(cmd);
46706+ return -ENOMEM;
46707+ }
46708+
46709+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46710+
46711+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46712+ sizeof(*result), 0);
46713 if (ret < 0)
46714- return ret;
46715+ goto out;
46716
46717 *status = 0;
46718
46719- if (0xffff - le16_to_cpu(result.gain) > 30)
46720+ if (0xffff - le16_to_cpu(result->gain) > 30)
46721 *status |= FE_HAS_SIGNAL;
46722- if (result.lock_bits & (1 << 6))
46723+ if (result->lock_bits & (1 << 6))
46724 *status |= FE_HAS_LOCK;
46725- if (result.lock_bits & (1 << 5))
46726+ if (result->lock_bits & (1 << 5))
46727 *status |= FE_HAS_SYNC;
46728- if (result.lock_bits & (1 << 4))
46729+ if (result->lock_bits & (1 << 4))
46730 *status |= FE_HAS_CARRIER;
46731- if (result.lock_bits & (1 << 1))
46732+ if (result->lock_bits & (1 << 1))
46733 *status |= FE_HAS_VITERBI;
46734
46735 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46736 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46737 *status &= ~FE_HAS_LOCK;
46738
46739- return 0;
46740+out:
46741+ kfree(cmd);
46742+ kfree(result);
46743+ return ret;
46744 }
46745
46746 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46747 {
46748 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46749- struct dvbt_get_status_msg status;
46750- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46751+ struct dvbt_get_status_msg *status;
46752+ char *cmd;
46753 int ret;
46754
46755- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46756- sizeof(status), 0);
46757+ cmd = kmalloc(1, GFP_KERNEL);
46758+ if (cmd == NULL)
46759+ return -ENOMEM;
46760+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46761+ if (status == NULL) {
46762+ kfree(cmd);
46763+ return -ENOMEM;
46764+ }
46765+
46766+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46767+
46768+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46769+ sizeof(*status), 0);
46770 if (ret < 0)
46771- return ret;
46772+ goto out;
46773
46774- *ber = le32_to_cpu(status.viterbi_error_rate);
46775+ *ber = le32_to_cpu(status->viterbi_error_rate);
46776+out:
46777+ kfree(cmd);
46778+ kfree(status);
46779 return 0;
46780 }
46781
46782 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46783 {
46784 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46785- struct dvbt_get_status_msg status;
46786- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46787+ struct dvbt_get_status_msg *status;
46788+ u8 *cmd;
46789 int ret;
46790
46791- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46792- sizeof(status), 0);
46793+ cmd = kmalloc(1, GFP_KERNEL);
46794+ if (cmd == NULL)
46795+ return -ENOMEM;
46796+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46797+ if (status == NULL) {
46798+ kfree(cmd);
46799+ return -ENOMEM;
46800+ }
46801+
46802+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46803+
46804+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46805+ sizeof(*status), 0);
46806 if (ret < 0) {
46807 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46808 ret);
46809- return ret;
46810+ goto out;
46811 }
46812- *unc = le32_to_cpu(status.uncorrected_block_count);
46813- return 0;
46814+ *unc = le32_to_cpu(status->uncorrected_block_count);
46815+
46816+out:
46817+ kfree(cmd);
46818+ kfree(status);
46819+ return ret;
46820 }
46821
46822 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46823 u16 *strength)
46824 {
46825 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46826- struct dvbt_get_status_msg status;
46827- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46828+ struct dvbt_get_status_msg *status;
46829+ char *cmd;
46830 int ret;
46831
46832- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46833- sizeof(status), 0);
46834+ cmd = kmalloc(1, GFP_KERNEL);
46835+ if (cmd == NULL)
46836+ return -ENOMEM;
46837+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46838+ if (status == NULL) {
46839+ kfree(cmd);
46840+ return -ENOMEM;
46841+ }
46842+
46843+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46844+
46845+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46846+ sizeof(*status), 0);
46847 if (ret < 0) {
46848 err("cinergyt2_fe_read_signal_strength() Failed!"
46849 " (Error=%d)\n", ret);
46850- return ret;
46851+ goto out;
46852 }
46853- *strength = (0xffff - le16_to_cpu(status.gain));
46854+ *strength = (0xffff - le16_to_cpu(status->gain));
46855+
46856+out:
46857+ kfree(cmd);
46858+ kfree(status);
46859 return 0;
46860 }
46861
46862 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46863 {
46864 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46865- struct dvbt_get_status_msg status;
46866- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46867+ struct dvbt_get_status_msg *status;
46868+ char *cmd;
46869 int ret;
46870
46871- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46872- sizeof(status), 0);
46873+ cmd = kmalloc(1, GFP_KERNEL);
46874+ if (cmd == NULL)
46875+ return -ENOMEM;
46876+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46877+ if (status == NULL) {
46878+ kfree(cmd);
46879+ return -ENOMEM;
46880+ }
46881+
46882+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46883+
46884+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46885+ sizeof(*status), 0);
46886 if (ret < 0) {
46887 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46888- return ret;
46889+ goto out;
46890 }
46891- *snr = (status.snr << 8) | status.snr;
46892- return 0;
46893+ *snr = (status->snr << 8) | status->snr;
46894+
46895+out:
46896+ kfree(cmd);
46897+ kfree(status);
46898+ return ret;
46899 }
46900
46901 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46902@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46903 {
46904 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46905 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46906- struct dvbt_set_parameters_msg param;
46907- char result[2];
46908+ struct dvbt_set_parameters_msg *param;
46909+ char *result;
46910 int err;
46911
46912- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46913- param.tps = cpu_to_le16(compute_tps(fep));
46914- param.freq = cpu_to_le32(fep->frequency / 1000);
46915- param.flags = 0;
46916+ result = kmalloc(2, GFP_KERNEL);
46917+ if (result == NULL)
46918+ return -ENOMEM;
46919+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46920+ if (param == NULL) {
46921+ kfree(result);
46922+ return -ENOMEM;
46923+ }
46924+
46925+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46926+ param->tps = cpu_to_le16(compute_tps(fep));
46927+ param->freq = cpu_to_le32(fep->frequency / 1000);
46928+ param->flags = 0;
46929
46930 switch (fep->bandwidth_hz) {
46931 default:
46932 case 8000000:
46933- param.bandwidth = 8;
46934+ param->bandwidth = 8;
46935 break;
46936 case 7000000:
46937- param.bandwidth = 7;
46938+ param->bandwidth = 7;
46939 break;
46940 case 6000000:
46941- param.bandwidth = 6;
46942+ param->bandwidth = 6;
46943 break;
46944 }
46945
46946 err = dvb_usb_generic_rw(state->d,
46947- (char *)&param, sizeof(param),
46948- result, sizeof(result), 0);
46949+ (char *)param, sizeof(*param),
46950+ result, 2, 0);
46951 if (err < 0)
46952 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46953
46954- return (err < 0) ? err : 0;
46955+ kfree(result);
46956+ kfree(param);
46957+ return err;
46958 }
46959
46960 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46961diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46962index 733a7ff..f8b52e3 100644
46963--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46964+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46965@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46966
46967 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46968 {
46969- struct hexline hx;
46970- u8 reset;
46971+ struct hexline *hx;
46972+ u8 *reset;
46973 int ret,pos=0;
46974
46975+ reset = kmalloc(1, GFP_KERNEL);
46976+ if (reset == NULL)
46977+ return -ENOMEM;
46978+
46979+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46980+ if (hx == NULL) {
46981+ kfree(reset);
46982+ return -ENOMEM;
46983+ }
46984+
46985 /* stop the CPU */
46986- reset = 1;
46987- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46988+ reset[0] = 1;
46989+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46990 err("could not stop the USB controller CPU.");
46991
46992- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46993- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46994- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46995+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46996+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46997+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46998
46999- if (ret != hx.len) {
47000+ if (ret != hx->len) {
47001 err("error while transferring firmware "
47002 "(transferred size: %d, block size: %d)",
47003- ret,hx.len);
47004+ ret,hx->len);
47005 ret = -EINVAL;
47006 break;
47007 }
47008 }
47009 if (ret < 0) {
47010 err("firmware download failed at %d with %d",pos,ret);
47011+ kfree(reset);
47012+ kfree(hx);
47013 return ret;
47014 }
47015
47016 if (ret == 0) {
47017 /* restart the CPU */
47018- reset = 0;
47019- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
47020+ reset[0] = 0;
47021+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
47022 err("could not restart the USB controller CPU.");
47023 ret = -EINVAL;
47024 }
47025 } else
47026 ret = -EIO;
47027
47028+ kfree(reset);
47029+ kfree(hx);
47030+
47031 return ret;
47032 }
47033 EXPORT_SYMBOL(usb_cypress_load_firmware);
47034diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
47035index 5801ae7..83f71fa 100644
47036--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
47037+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
47038@@ -87,8 +87,11 @@ struct technisat_usb2_state {
47039 static int technisat_usb2_i2c_access(struct usb_device *udev,
47040 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
47041 {
47042- u8 b[64];
47043- int ret, actual_length;
47044+ u8 *b = kmalloc(64, GFP_KERNEL);
47045+ int ret, actual_length, error = 0;
47046+
47047+ if (b == NULL)
47048+ return -ENOMEM;
47049
47050 deb_i2c("i2c-access: %02x, tx: ", device_addr);
47051 debug_dump(tx, txlen, deb_i2c);
47052@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47053
47054 if (ret < 0) {
47055 err("i2c-error: out failed %02x = %d", device_addr, ret);
47056- return -ENODEV;
47057+ error = -ENODEV;
47058+ goto out;
47059 }
47060
47061 ret = usb_bulk_msg(udev,
47062@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47063 b, 64, &actual_length, 1000);
47064 if (ret < 0) {
47065 err("i2c-error: in failed %02x = %d", device_addr, ret);
47066- return -ENODEV;
47067+ error = -ENODEV;
47068+ goto out;
47069 }
47070
47071 if (b[0] != I2C_STATUS_OK) {
47072@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47073 /* handle tuner-i2c-nak */
47074 if (!(b[0] == I2C_STATUS_NAK &&
47075 device_addr == 0x60
47076- /* && device_is_technisat_usb2 */))
47077- return -ENODEV;
47078+ /* && device_is_technisat_usb2 */)) {
47079+ error = -ENODEV;
47080+ goto out;
47081+ }
47082 }
47083
47084 deb_i2c("status: %d, ", b[0]);
47085@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47086
47087 deb_i2c("\n");
47088
47089- return 0;
47090+out:
47091+ kfree(b);
47092+ return error;
47093 }
47094
47095 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47096@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47097 {
47098 int ret;
47099
47100- u8 led[8] = {
47101- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47102- 0
47103- };
47104+ u8 *led = kzalloc(8, GFP_KERNEL);
47105+
47106+ if (led == NULL)
47107+ return -ENOMEM;
47108
47109 if (disable_led_control && state != TECH_LED_OFF)
47110 return 0;
47111
47112+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47113+
47114 switch (state) {
47115 case TECH_LED_ON:
47116 led[1] = 0x82;
47117@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47118 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47119 USB_TYPE_VENDOR | USB_DIR_OUT,
47120 0, 0,
47121- led, sizeof(led), 500);
47122+ led, 8, 500);
47123
47124 mutex_unlock(&d->i2c_mutex);
47125+
47126+ kfree(led);
47127+
47128 return ret;
47129 }
47130
47131 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47132 {
47133 int ret;
47134- u8 b = 0;
47135+ u8 *b = kzalloc(1, GFP_KERNEL);
47136+
47137+ if (b == NULL)
47138+ return -ENOMEM;
47139
47140 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47141 return -EAGAIN;
47142@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47143 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47144 USB_TYPE_VENDOR | USB_DIR_OUT,
47145 (red << 8) | green, 0,
47146- &b, 1, 500);
47147+ b, 1, 500);
47148
47149 mutex_unlock(&d->i2c_mutex);
47150
47151+ kfree(b);
47152+
47153 return ret;
47154 }
47155
47156@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47157 struct dvb_usb_device_description **desc, int *cold)
47158 {
47159 int ret;
47160- u8 version[3];
47161+ u8 *version = kmalloc(3, GFP_KERNEL);
47162
47163 /* first select the interface */
47164 if (usb_set_interface(udev, 0, 1) != 0)
47165@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47166
47167 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47168
47169+ if (version == NULL)
47170+ return 0;
47171+
47172 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47173 GET_VERSION_INFO_VENDOR_REQUEST,
47174 USB_TYPE_VENDOR | USB_DIR_IN,
47175 0, 0,
47176- version, sizeof(version), 500);
47177+ version, 3, 500);
47178
47179 if (ret < 0)
47180 *cold = 1;
47181@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47182 *cold = 0;
47183 }
47184
47185+ kfree(version);
47186+
47187 return 0;
47188 }
47189
47190@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47191
47192 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47193 {
47194- u8 buf[62], *b;
47195+ u8 *buf, *b;
47196 int ret;
47197 struct ir_raw_event ev;
47198
47199+ buf = kmalloc(62, GFP_KERNEL);
47200+
47201+ if (buf == NULL)
47202+ return -ENOMEM;
47203+
47204 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47205 buf[1] = 0x08;
47206 buf[2] = 0x8f;
47207@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47208 GET_IR_DATA_VENDOR_REQUEST,
47209 USB_TYPE_VENDOR | USB_DIR_IN,
47210 0x8080, 0,
47211- buf, sizeof(buf), 500);
47212+ buf, 62, 500);
47213
47214 unlock:
47215 mutex_unlock(&d->i2c_mutex);
47216
47217- if (ret < 0)
47218+ if (ret < 0) {
47219+ kfree(buf);
47220 return ret;
47221+ }
47222
47223- if (ret == 1)
47224+ if (ret == 1) {
47225+ kfree(buf);
47226 return 0; /* no key pressed */
47227+ }
47228
47229 /* decoding */
47230 b = buf+1;
47231@@ -656,6 +689,8 @@ unlock:
47232
47233 ir_raw_event_handle(d->rc_dev);
47234
47235+ kfree(buf);
47236+
47237 return 1;
47238 }
47239
47240diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47241index af63543..0436f20 100644
47242--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47243+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47244@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47245 * by passing a very big num_planes value */
47246 uplane = compat_alloc_user_space(num_planes *
47247 sizeof(struct v4l2_plane));
47248- kp->m.planes = (__force struct v4l2_plane *)uplane;
47249+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47250
47251 while (--num_planes >= 0) {
47252 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47253@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47254 if (num_planes == 0)
47255 return 0;
47256
47257- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47258+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47259 if (get_user(p, &up->m.planes))
47260 return -EFAULT;
47261 uplane32 = compat_ptr(p);
47262@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47263 get_user(kp->flags, &up->flags) ||
47264 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47265 return -EFAULT;
47266- kp->base = (__force void *)compat_ptr(tmp);
47267+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47268 return 0;
47269 }
47270
47271@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47272 n * sizeof(struct v4l2_ext_control32)))
47273 return -EFAULT;
47274 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47275- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47276+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47277 while (--n >= 0) {
47278 u32 id;
47279
47280@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47281 {
47282 struct v4l2_ext_control32 __user *ucontrols;
47283 struct v4l2_ext_control __user *kcontrols =
47284- (__force struct v4l2_ext_control __user *)kp->controls;
47285+ (struct v4l2_ext_control __force_user *)kp->controls;
47286 int n = kp->count;
47287 compat_caddr_t p;
47288
47289@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47290 get_user(tmp, &up->edid) ||
47291 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47292 return -EFAULT;
47293- kp->edid = (__force u8 *)compat_ptr(tmp);
47294+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47295 return 0;
47296 }
47297
47298diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47299index 5b0a30b..1974b38 100644
47300--- a/drivers/media/v4l2-core/v4l2-device.c
47301+++ b/drivers/media/v4l2-core/v4l2-device.c
47302@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47303 EXPORT_SYMBOL_GPL(v4l2_device_put);
47304
47305 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47306- atomic_t *instance)
47307+ atomic_unchecked_t *instance)
47308 {
47309- int num = atomic_inc_return(instance) - 1;
47310+ int num = atomic_inc_return_unchecked(instance) - 1;
47311 int len = strlen(basename);
47312
47313 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47314diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47315index aa407cb..ee847d4 100644
47316--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47317+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47318@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47319 struct file *file, void *fh, void *p);
47320 } u;
47321 void (*debug)(const void *arg, bool write_only);
47322-};
47323+} __do_const;
47324+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47325
47326 /* This control needs a priority check */
47327 #define INFO_FL_PRIO (1 << 0)
47328@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47329 struct video_device *vfd = video_devdata(file);
47330 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47331 bool write_only = false;
47332- struct v4l2_ioctl_info default_info;
47333+ v4l2_ioctl_info_no_const default_info;
47334 const struct v4l2_ioctl_info *info;
47335 void *fh = file->private_data;
47336 struct v4l2_fh *vfh = NULL;
47337@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47338 ret = -EINVAL;
47339 break;
47340 }
47341- *user_ptr = (void __user *)buf->m.planes;
47342+ *user_ptr = (void __force_user *)buf->m.planes;
47343 *kernel_ptr = (void **)&buf->m.planes;
47344 *array_size = sizeof(struct v4l2_plane) * buf->length;
47345 ret = 1;
47346@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47347 ret = -EINVAL;
47348 break;
47349 }
47350- *user_ptr = (void __user *)edid->edid;
47351+ *user_ptr = (void __force_user *)edid->edid;
47352 *kernel_ptr = (void **)&edid->edid;
47353 *array_size = edid->blocks * 128;
47354 ret = 1;
47355@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47356 ret = -EINVAL;
47357 break;
47358 }
47359- *user_ptr = (void __user *)ctrls->controls;
47360+ *user_ptr = (void __force_user *)ctrls->controls;
47361 *kernel_ptr = (void **)&ctrls->controls;
47362 *array_size = sizeof(struct v4l2_ext_control)
47363 * ctrls->count;
47364@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47365 }
47366
47367 if (has_array_args) {
47368- *kernel_ptr = (void __force *)user_ptr;
47369+ *kernel_ptr = (void __force_kernel *)user_ptr;
47370 if (copy_to_user(user_ptr, mbuf, array_size))
47371 err = -EFAULT;
47372 goto out_array_args;
47373diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47374index c94ea0d..b8a9f88 100644
47375--- a/drivers/memory/omap-gpmc.c
47376+++ b/drivers/memory/omap-gpmc.c
47377@@ -232,7 +232,6 @@ struct omap3_gpmc_regs {
47378 };
47379
47380 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47381-static struct irq_chip gpmc_irq_chip;
47382 static int gpmc_irq_start;
47383
47384 static struct resource gpmc_mem_root;
47385@@ -1146,6 +1145,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47386
47387 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47388
47389+static struct irq_chip gpmc_irq_chip = {
47390+ .name = "gpmc",
47391+ .irq_startup = gpmc_irq_noop_ret,
47392+ .irq_enable = gpmc_irq_enable,
47393+ .irq_disable = gpmc_irq_disable,
47394+ .irq_shutdown = gpmc_irq_noop,
47395+ .irq_ack = gpmc_irq_noop,
47396+ .irq_mask = gpmc_irq_noop,
47397+ .irq_unmask = gpmc_irq_noop,
47398+};
47399+
47400 static int gpmc_setup_irq(void)
47401 {
47402 int i;
47403@@ -1160,15 +1170,6 @@ static int gpmc_setup_irq(void)
47404 return gpmc_irq_start;
47405 }
47406
47407- gpmc_irq_chip.name = "gpmc";
47408- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47409- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47410- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47411- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47412- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47413- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47414- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47415-
47416 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47417 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47418
47419diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47420index 187f836..679544b 100644
47421--- a/drivers/message/fusion/mptbase.c
47422+++ b/drivers/message/fusion/mptbase.c
47423@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47424 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47425 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47426
47427+#ifdef CONFIG_GRKERNSEC_HIDESYM
47428+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47429+#else
47430 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47431 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47432+#endif
47433+
47434 /*
47435 * Rounding UP to nearest 4-kB boundary here...
47436 */
47437@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47438 ioc->facts.GlobalCredits);
47439
47440 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47441+#ifdef CONFIG_GRKERNSEC_HIDESYM
47442+ NULL, NULL);
47443+#else
47444 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47445+#endif
47446 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47447 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47448 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47449diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47450index 5bdaae1..eced16f 100644
47451--- a/drivers/message/fusion/mptsas.c
47452+++ b/drivers/message/fusion/mptsas.c
47453@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47454 return 0;
47455 }
47456
47457+static inline void
47458+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47459+{
47460+ if (phy_info->port_details) {
47461+ phy_info->port_details->rphy = rphy;
47462+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47463+ ioc->name, rphy));
47464+ }
47465+
47466+ if (rphy) {
47467+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47468+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47469+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47470+ ioc->name, rphy, rphy->dev.release));
47471+ }
47472+}
47473+
47474 /* no mutex */
47475 static void
47476 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47477@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47478 return NULL;
47479 }
47480
47481-static inline void
47482-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47483-{
47484- if (phy_info->port_details) {
47485- phy_info->port_details->rphy = rphy;
47486- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47487- ioc->name, rphy));
47488- }
47489-
47490- if (rphy) {
47491- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47492- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47493- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47494- ioc->name, rphy, rphy->dev.release));
47495- }
47496-}
47497-
47498 static inline struct sas_port *
47499 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47500 {
47501diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47502index cdd6f3d..1907a98 100644
47503--- a/drivers/mfd/ab8500-debugfs.c
47504+++ b/drivers/mfd/ab8500-debugfs.c
47505@@ -100,7 +100,7 @@ static int irq_last;
47506 static u32 *irq_count;
47507 static int num_irqs;
47508
47509-static struct device_attribute **dev_attr;
47510+static device_attribute_no_const **dev_attr;
47511 static char **event_name;
47512
47513 static u8 avg_sample = SAMPLE_16;
47514diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47515index 8057849..0550fdf 100644
47516--- a/drivers/mfd/kempld-core.c
47517+++ b/drivers/mfd/kempld-core.c
47518@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47519 .remove = kempld_remove,
47520 };
47521
47522-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47523+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47524 {
47525 .ident = "BHL6",
47526 .matches = {
47527diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47528index c880c89..45a7c68 100644
47529--- a/drivers/mfd/max8925-i2c.c
47530+++ b/drivers/mfd/max8925-i2c.c
47531@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47532 const struct i2c_device_id *id)
47533 {
47534 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47535- static struct max8925_chip *chip;
47536+ struct max8925_chip *chip;
47537 struct device_node *node = client->dev.of_node;
47538
47539 if (node && !pdata) {
47540diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47541index 7612d89..70549c2 100644
47542--- a/drivers/mfd/tps65910.c
47543+++ b/drivers/mfd/tps65910.c
47544@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47545 struct tps65910_platform_data *pdata)
47546 {
47547 int ret = 0;
47548- static struct regmap_irq_chip *tps6591x_irqs_chip;
47549+ struct regmap_irq_chip *tps6591x_irqs_chip;
47550
47551 if (!irq) {
47552 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47553diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47554index 1b772ef..01e77d33 100644
47555--- a/drivers/mfd/twl4030-irq.c
47556+++ b/drivers/mfd/twl4030-irq.c
47557@@ -34,6 +34,7 @@
47558 #include <linux/of.h>
47559 #include <linux/irqdomain.h>
47560 #include <linux/i2c/twl.h>
47561+#include <asm/pgtable.h>
47562
47563 #include "twl-core.h"
47564
47565@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47566 * Install an irq handler for each of the SIH modules;
47567 * clone dummy irq_chip since PIH can't *do* anything
47568 */
47569- twl4030_irq_chip = dummy_irq_chip;
47570- twl4030_irq_chip.name = "twl4030";
47571+ pax_open_kernel();
47572+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47573+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47574
47575- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47576+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47577+ pax_close_kernel();
47578
47579 for (i = irq_base; i < irq_end; i++) {
47580 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47581diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47582index 464419b..64bae8d 100644
47583--- a/drivers/misc/c2port/core.c
47584+++ b/drivers/misc/c2port/core.c
47585@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47586 goto error_idr_alloc;
47587 c2dev->id = ret;
47588
47589- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47590+ pax_open_kernel();
47591+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47592+ pax_close_kernel();
47593
47594 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47595 "c2port%d", c2dev->id);
47596diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47597index 8385177..2f54635 100644
47598--- a/drivers/misc/eeprom/sunxi_sid.c
47599+++ b/drivers/misc/eeprom/sunxi_sid.c
47600@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47601
47602 platform_set_drvdata(pdev, sid_data);
47603
47604- sid_bin_attr.size = sid_data->keysize;
47605+ pax_open_kernel();
47606+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47607+ pax_close_kernel();
47608 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47609 return -ENODEV;
47610
47611diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47612index 36f5d52..32311c3 100644
47613--- a/drivers/misc/kgdbts.c
47614+++ b/drivers/misc/kgdbts.c
47615@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47616 char before[BREAK_INSTR_SIZE];
47617 char after[BREAK_INSTR_SIZE];
47618
47619- probe_kernel_read(before, (char *)kgdbts_break_test,
47620+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47621 BREAK_INSTR_SIZE);
47622 init_simple_test();
47623 ts.tst = plant_and_detach_test;
47624@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47625 /* Activate test with initial breakpoint */
47626 if (!is_early)
47627 kgdb_breakpoint();
47628- probe_kernel_read(after, (char *)kgdbts_break_test,
47629+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47630 BREAK_INSTR_SIZE);
47631 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47632 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47633diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47634index 4739689..8a52950 100644
47635--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47636+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47637@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47638 * the lid is closed. This leads to interrupts as soon as a little move
47639 * is done.
47640 */
47641- atomic_inc(&lis3->count);
47642+ atomic_inc_unchecked(&lis3->count);
47643
47644 wake_up_interruptible(&lis3->misc_wait);
47645 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47646@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47647 if (lis3->pm_dev)
47648 pm_runtime_get_sync(lis3->pm_dev);
47649
47650- atomic_set(&lis3->count, 0);
47651+ atomic_set_unchecked(&lis3->count, 0);
47652 return 0;
47653 }
47654
47655@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47656 add_wait_queue(&lis3->misc_wait, &wait);
47657 while (true) {
47658 set_current_state(TASK_INTERRUPTIBLE);
47659- data = atomic_xchg(&lis3->count, 0);
47660+ data = atomic_xchg_unchecked(&lis3->count, 0);
47661 if (data)
47662 break;
47663
47664@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47665 struct lis3lv02d, miscdev);
47666
47667 poll_wait(file, &lis3->misc_wait, wait);
47668- if (atomic_read(&lis3->count))
47669+ if (atomic_read_unchecked(&lis3->count))
47670 return POLLIN | POLLRDNORM;
47671 return 0;
47672 }
47673diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47674index c439c82..1f20f57 100644
47675--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47676+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47677@@ -297,7 +297,7 @@ struct lis3lv02d {
47678 struct input_polled_dev *idev; /* input device */
47679 struct platform_device *pdev; /* platform device */
47680 struct regulator_bulk_data regulators[2];
47681- atomic_t count; /* interrupt count after last read */
47682+ atomic_unchecked_t count; /* interrupt count after last read */
47683 union axis_conversion ac; /* hw -> logical axis */
47684 int mapped_btns[3];
47685
47686diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47687index 2f30bad..c4c13d0 100644
47688--- a/drivers/misc/sgi-gru/gruhandles.c
47689+++ b/drivers/misc/sgi-gru/gruhandles.c
47690@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47691 unsigned long nsec;
47692
47693 nsec = CLKS2NSEC(clks);
47694- atomic_long_inc(&mcs_op_statistics[op].count);
47695- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47696+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47697+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47698 if (mcs_op_statistics[op].max < nsec)
47699 mcs_op_statistics[op].max = nsec;
47700 }
47701diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47702index 4f76359..cdfcb2e 100644
47703--- a/drivers/misc/sgi-gru/gruprocfs.c
47704+++ b/drivers/misc/sgi-gru/gruprocfs.c
47705@@ -32,9 +32,9 @@
47706
47707 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47708
47709-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47710+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47711 {
47712- unsigned long val = atomic_long_read(v);
47713+ unsigned long val = atomic_long_read_unchecked(v);
47714
47715 seq_printf(s, "%16lu %s\n", val, id);
47716 }
47717@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47718
47719 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47720 for (op = 0; op < mcsop_last; op++) {
47721- count = atomic_long_read(&mcs_op_statistics[op].count);
47722- total = atomic_long_read(&mcs_op_statistics[op].total);
47723+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47724+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47725 max = mcs_op_statistics[op].max;
47726 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47727 count ? total / count : 0, max);
47728diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47729index 5c3ce24..4915ccb 100644
47730--- a/drivers/misc/sgi-gru/grutables.h
47731+++ b/drivers/misc/sgi-gru/grutables.h
47732@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47733 * GRU statistics.
47734 */
47735 struct gru_stats_s {
47736- atomic_long_t vdata_alloc;
47737- atomic_long_t vdata_free;
47738- atomic_long_t gts_alloc;
47739- atomic_long_t gts_free;
47740- atomic_long_t gms_alloc;
47741- atomic_long_t gms_free;
47742- atomic_long_t gts_double_allocate;
47743- atomic_long_t assign_context;
47744- atomic_long_t assign_context_failed;
47745- atomic_long_t free_context;
47746- atomic_long_t load_user_context;
47747- atomic_long_t load_kernel_context;
47748- atomic_long_t lock_kernel_context;
47749- atomic_long_t unlock_kernel_context;
47750- atomic_long_t steal_user_context;
47751- atomic_long_t steal_kernel_context;
47752- atomic_long_t steal_context_failed;
47753- atomic_long_t nopfn;
47754- atomic_long_t asid_new;
47755- atomic_long_t asid_next;
47756- atomic_long_t asid_wrap;
47757- atomic_long_t asid_reuse;
47758- atomic_long_t intr;
47759- atomic_long_t intr_cbr;
47760- atomic_long_t intr_tfh;
47761- atomic_long_t intr_spurious;
47762- atomic_long_t intr_mm_lock_failed;
47763- atomic_long_t call_os;
47764- atomic_long_t call_os_wait_queue;
47765- atomic_long_t user_flush_tlb;
47766- atomic_long_t user_unload_context;
47767- atomic_long_t user_exception;
47768- atomic_long_t set_context_option;
47769- atomic_long_t check_context_retarget_intr;
47770- atomic_long_t check_context_unload;
47771- atomic_long_t tlb_dropin;
47772- atomic_long_t tlb_preload_page;
47773- atomic_long_t tlb_dropin_fail_no_asid;
47774- atomic_long_t tlb_dropin_fail_upm;
47775- atomic_long_t tlb_dropin_fail_invalid;
47776- atomic_long_t tlb_dropin_fail_range_active;
47777- atomic_long_t tlb_dropin_fail_idle;
47778- atomic_long_t tlb_dropin_fail_fmm;
47779- atomic_long_t tlb_dropin_fail_no_exception;
47780- atomic_long_t tfh_stale_on_fault;
47781- atomic_long_t mmu_invalidate_range;
47782- atomic_long_t mmu_invalidate_page;
47783- atomic_long_t flush_tlb;
47784- atomic_long_t flush_tlb_gru;
47785- atomic_long_t flush_tlb_gru_tgh;
47786- atomic_long_t flush_tlb_gru_zero_asid;
47787+ atomic_long_unchecked_t vdata_alloc;
47788+ atomic_long_unchecked_t vdata_free;
47789+ atomic_long_unchecked_t gts_alloc;
47790+ atomic_long_unchecked_t gts_free;
47791+ atomic_long_unchecked_t gms_alloc;
47792+ atomic_long_unchecked_t gms_free;
47793+ atomic_long_unchecked_t gts_double_allocate;
47794+ atomic_long_unchecked_t assign_context;
47795+ atomic_long_unchecked_t assign_context_failed;
47796+ atomic_long_unchecked_t free_context;
47797+ atomic_long_unchecked_t load_user_context;
47798+ atomic_long_unchecked_t load_kernel_context;
47799+ atomic_long_unchecked_t lock_kernel_context;
47800+ atomic_long_unchecked_t unlock_kernel_context;
47801+ atomic_long_unchecked_t steal_user_context;
47802+ atomic_long_unchecked_t steal_kernel_context;
47803+ atomic_long_unchecked_t steal_context_failed;
47804+ atomic_long_unchecked_t nopfn;
47805+ atomic_long_unchecked_t asid_new;
47806+ atomic_long_unchecked_t asid_next;
47807+ atomic_long_unchecked_t asid_wrap;
47808+ atomic_long_unchecked_t asid_reuse;
47809+ atomic_long_unchecked_t intr;
47810+ atomic_long_unchecked_t intr_cbr;
47811+ atomic_long_unchecked_t intr_tfh;
47812+ atomic_long_unchecked_t intr_spurious;
47813+ atomic_long_unchecked_t intr_mm_lock_failed;
47814+ atomic_long_unchecked_t call_os;
47815+ atomic_long_unchecked_t call_os_wait_queue;
47816+ atomic_long_unchecked_t user_flush_tlb;
47817+ atomic_long_unchecked_t user_unload_context;
47818+ atomic_long_unchecked_t user_exception;
47819+ atomic_long_unchecked_t set_context_option;
47820+ atomic_long_unchecked_t check_context_retarget_intr;
47821+ atomic_long_unchecked_t check_context_unload;
47822+ atomic_long_unchecked_t tlb_dropin;
47823+ atomic_long_unchecked_t tlb_preload_page;
47824+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47825+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47826+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47827+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47828+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47829+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47830+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47831+ atomic_long_unchecked_t tfh_stale_on_fault;
47832+ atomic_long_unchecked_t mmu_invalidate_range;
47833+ atomic_long_unchecked_t mmu_invalidate_page;
47834+ atomic_long_unchecked_t flush_tlb;
47835+ atomic_long_unchecked_t flush_tlb_gru;
47836+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47837+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47838
47839- atomic_long_t copy_gpa;
47840- atomic_long_t read_gpa;
47841+ atomic_long_unchecked_t copy_gpa;
47842+ atomic_long_unchecked_t read_gpa;
47843
47844- atomic_long_t mesq_receive;
47845- atomic_long_t mesq_receive_none;
47846- atomic_long_t mesq_send;
47847- atomic_long_t mesq_send_failed;
47848- atomic_long_t mesq_noop;
47849- atomic_long_t mesq_send_unexpected_error;
47850- atomic_long_t mesq_send_lb_overflow;
47851- atomic_long_t mesq_send_qlimit_reached;
47852- atomic_long_t mesq_send_amo_nacked;
47853- atomic_long_t mesq_send_put_nacked;
47854- atomic_long_t mesq_page_overflow;
47855- atomic_long_t mesq_qf_locked;
47856- atomic_long_t mesq_qf_noop_not_full;
47857- atomic_long_t mesq_qf_switch_head_failed;
47858- atomic_long_t mesq_qf_unexpected_error;
47859- atomic_long_t mesq_noop_unexpected_error;
47860- atomic_long_t mesq_noop_lb_overflow;
47861- atomic_long_t mesq_noop_qlimit_reached;
47862- atomic_long_t mesq_noop_amo_nacked;
47863- atomic_long_t mesq_noop_put_nacked;
47864- atomic_long_t mesq_noop_page_overflow;
47865+ atomic_long_unchecked_t mesq_receive;
47866+ atomic_long_unchecked_t mesq_receive_none;
47867+ atomic_long_unchecked_t mesq_send;
47868+ atomic_long_unchecked_t mesq_send_failed;
47869+ atomic_long_unchecked_t mesq_noop;
47870+ atomic_long_unchecked_t mesq_send_unexpected_error;
47871+ atomic_long_unchecked_t mesq_send_lb_overflow;
47872+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47873+ atomic_long_unchecked_t mesq_send_amo_nacked;
47874+ atomic_long_unchecked_t mesq_send_put_nacked;
47875+ atomic_long_unchecked_t mesq_page_overflow;
47876+ atomic_long_unchecked_t mesq_qf_locked;
47877+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47878+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47879+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47880+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47881+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47882+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47883+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47884+ atomic_long_unchecked_t mesq_noop_put_nacked;
47885+ atomic_long_unchecked_t mesq_noop_page_overflow;
47886
47887 };
47888
47889@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47890 tghop_invalidate, mcsop_last};
47891
47892 struct mcs_op_statistic {
47893- atomic_long_t count;
47894- atomic_long_t total;
47895+ atomic_long_unchecked_t count;
47896+ atomic_long_unchecked_t total;
47897 unsigned long max;
47898 };
47899
47900@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47901
47902 #define STAT(id) do { \
47903 if (gru_options & OPT_STATS) \
47904- atomic_long_inc(&gru_stats.id); \
47905+ atomic_long_inc_unchecked(&gru_stats.id); \
47906 } while (0)
47907
47908 #ifdef CONFIG_SGI_GRU_DEBUG
47909diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47910index c862cd4..0d176fe 100644
47911--- a/drivers/misc/sgi-xp/xp.h
47912+++ b/drivers/misc/sgi-xp/xp.h
47913@@ -288,7 +288,7 @@ struct xpc_interface {
47914 xpc_notify_func, void *);
47915 void (*received) (short, int, void *);
47916 enum xp_retval (*partid_to_nasids) (short, void *);
47917-};
47918+} __no_const;
47919
47920 extern struct xpc_interface xpc_interface;
47921
47922diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47923index 01be66d..e3a0c7e 100644
47924--- a/drivers/misc/sgi-xp/xp_main.c
47925+++ b/drivers/misc/sgi-xp/xp_main.c
47926@@ -78,13 +78,13 @@ xpc_notloaded(void)
47927 }
47928
47929 struct xpc_interface xpc_interface = {
47930- (void (*)(int))xpc_notloaded,
47931- (void (*)(int))xpc_notloaded,
47932- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47933- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47934+ .connect = (void (*)(int))xpc_notloaded,
47935+ .disconnect = (void (*)(int))xpc_notloaded,
47936+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47937+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47938 void *))xpc_notloaded,
47939- (void (*)(short, int, void *))xpc_notloaded,
47940- (enum xp_retval(*)(short, void *))xpc_notloaded
47941+ .received = (void (*)(short, int, void *))xpc_notloaded,
47942+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47943 };
47944 EXPORT_SYMBOL_GPL(xpc_interface);
47945
47946diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47947index b94d5f7..7f494c5 100644
47948--- a/drivers/misc/sgi-xp/xpc.h
47949+++ b/drivers/misc/sgi-xp/xpc.h
47950@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47951 void (*received_payload) (struct xpc_channel *, void *);
47952 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47953 };
47954+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47955
47956 /* struct xpc_partition act_state values (for XPC HB) */
47957
47958@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47959 /* found in xpc_main.c */
47960 extern struct device *xpc_part;
47961 extern struct device *xpc_chan;
47962-extern struct xpc_arch_operations xpc_arch_ops;
47963+extern xpc_arch_operations_no_const xpc_arch_ops;
47964 extern int xpc_disengage_timelimit;
47965 extern int xpc_disengage_timedout;
47966 extern int xpc_activate_IRQ_rcvd;
47967diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47968index 7f32712..8539ab2 100644
47969--- a/drivers/misc/sgi-xp/xpc_main.c
47970+++ b/drivers/misc/sgi-xp/xpc_main.c
47971@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47972 .notifier_call = xpc_system_die,
47973 };
47974
47975-struct xpc_arch_operations xpc_arch_ops;
47976+xpc_arch_operations_no_const xpc_arch_ops;
47977
47978 /*
47979 * Timer function to enforce the timelimit on the partition disengage.
47980diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47981index 60f7141..ba97c1a 100644
47982--- a/drivers/mmc/card/block.c
47983+++ b/drivers/mmc/card/block.c
47984@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47985 if (idata->ic.postsleep_min_us)
47986 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47987
47988- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47989+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47990 err = -EFAULT;
47991 goto cmd_rel_host;
47992 }
47993diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47994index f45ab91..9f50d8f 100644
47995--- a/drivers/mmc/host/dw_mmc.h
47996+++ b/drivers/mmc/host/dw_mmc.h
47997@@ -287,5 +287,5 @@ struct dw_mci_drv_data {
47998 int (*execute_tuning)(struct dw_mci_slot *slot);
47999 int (*prepare_hs400_tuning)(struct dw_mci *host,
48000 struct mmc_ios *ios);
48001-};
48002+} __do_const;
48003 #endif /* _DW_MMC_H_ */
48004diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
48005index fb26674..3172c2b 100644
48006--- a/drivers/mmc/host/mmci.c
48007+++ b/drivers/mmc/host/mmci.c
48008@@ -1633,7 +1633,9 @@ static int mmci_probe(struct amba_device *dev,
48009 mmc->caps |= MMC_CAP_CMD23;
48010
48011 if (variant->busy_detect) {
48012- mmci_ops.card_busy = mmci_card_busy;
48013+ pax_open_kernel();
48014+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
48015+ pax_close_kernel();
48016 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
48017 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
48018 mmc->max_busy_timeout = 0;
48019diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
48020index 9df2b68..6d5ed1a 100644
48021--- a/drivers/mmc/host/omap_hsmmc.c
48022+++ b/drivers/mmc/host/omap_hsmmc.c
48023@@ -2004,7 +2004,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
48024
48025 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
48026 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
48027- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48028+ pax_open_kernel();
48029+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48030+ pax_close_kernel();
48031 }
48032
48033 pm_runtime_enable(host->dev);
48034diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
48035index 82f512d..5a228bb 100644
48036--- a/drivers/mmc/host/sdhci-esdhc-imx.c
48037+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
48038@@ -993,9 +993,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
48039 host->mmc->caps |= MMC_CAP_1_8V_DDR;
48040 }
48041
48042- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
48043- sdhci_esdhc_ops.platform_execute_tuning =
48044+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
48045+ pax_open_kernel();
48046+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
48047 esdhc_executing_tuning;
48048+ pax_close_kernel();
48049+ }
48050
48051 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
48052 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48053diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48054index c6d2dd7..81b1ca3 100644
48055--- a/drivers/mmc/host/sdhci-s3c.c
48056+++ b/drivers/mmc/host/sdhci-s3c.c
48057@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48058 * we can use overriding functions instead of default.
48059 */
48060 if (sc->no_divider) {
48061- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48062- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48063- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48064+ pax_open_kernel();
48065+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48066+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48067+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48068+ pax_close_kernel();
48069 }
48070
48071 /* It supports additional host capabilities if needed */
48072diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48073index 9a1a6ff..b8f1a57 100644
48074--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48075+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48076@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48077 size_t totlen = 0, thislen;
48078 int ret = 0;
48079 size_t buflen = 0;
48080- static char *buffer;
48081+ char *buffer;
48082
48083 if (!ECCBUF_SIZE) {
48084 /* We should fall back to a general writev implementation.
48085diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48086index 870c7fc..c7d6440 100644
48087--- a/drivers/mtd/nand/denali.c
48088+++ b/drivers/mtd/nand/denali.c
48089@@ -24,6 +24,7 @@
48090 #include <linux/slab.h>
48091 #include <linux/mtd/mtd.h>
48092 #include <linux/module.h>
48093+#include <linux/slab.h>
48094
48095 #include "denali.h"
48096
48097diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48098index 1b8f350..990f2e9 100644
48099--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48100+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48101@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48102
48103 /* first try to map the upper buffer directly */
48104 if (virt_addr_valid(this->upper_buf) &&
48105- !object_is_on_stack(this->upper_buf)) {
48106+ !object_starts_on_stack(this->upper_buf)) {
48107 sg_init_one(sgl, this->upper_buf, this->upper_len);
48108 ret = dma_map_sg(this->dev, sgl, 1, dr);
48109 if (ret == 0)
48110diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48111index a5dfbfb..8042ab4 100644
48112--- a/drivers/mtd/nftlmount.c
48113+++ b/drivers/mtd/nftlmount.c
48114@@ -24,6 +24,7 @@
48115 #include <asm/errno.h>
48116 #include <linux/delay.h>
48117 #include <linux/slab.h>
48118+#include <linux/sched.h>
48119 #include <linux/mtd/mtd.h>
48120 #include <linux/mtd/nand.h>
48121 #include <linux/mtd/nftl.h>
48122diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48123index c23184a..4115c41 100644
48124--- a/drivers/mtd/sm_ftl.c
48125+++ b/drivers/mtd/sm_ftl.c
48126@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48127 #define SM_CIS_VENDOR_OFFSET 0x59
48128 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48129 {
48130- struct attribute_group *attr_group;
48131+ attribute_group_no_const *attr_group;
48132 struct attribute **attributes;
48133 struct sm_sysfs_attribute *vendor_attribute;
48134 char *vendor;
48135diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48136index 7b11243..b3278a3 100644
48137--- a/drivers/net/bonding/bond_netlink.c
48138+++ b/drivers/net/bonding/bond_netlink.c
48139@@ -585,7 +585,7 @@ nla_put_failure:
48140 return -EMSGSIZE;
48141 }
48142
48143-struct rtnl_link_ops bond_link_ops __read_mostly = {
48144+struct rtnl_link_ops bond_link_ops = {
48145 .kind = "bond",
48146 .priv_size = sizeof(struct bonding),
48147 .setup = bond_setup,
48148diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48149index b3b922a..80bba38 100644
48150--- a/drivers/net/caif/caif_hsi.c
48151+++ b/drivers/net/caif/caif_hsi.c
48152@@ -1444,7 +1444,7 @@ err:
48153 return -ENODEV;
48154 }
48155
48156-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48157+static struct rtnl_link_ops caif_hsi_link_ops = {
48158 .kind = "cfhsi",
48159 .priv_size = sizeof(struct cfhsi),
48160 .setup = cfhsi_setup,
48161diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48162index e8c96b8..516a96c 100644
48163--- a/drivers/net/can/Kconfig
48164+++ b/drivers/net/can/Kconfig
48165@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48166
48167 config CAN_FLEXCAN
48168 tristate "Support for Freescale FLEXCAN based chips"
48169- depends on ARM || PPC
48170+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48171 ---help---
48172 Say Y here if you want to support for Freescale FlexCAN.
48173
48174diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48175index e9b1810..5c2f3f9 100644
48176--- a/drivers/net/can/dev.c
48177+++ b/drivers/net/can/dev.c
48178@@ -964,7 +964,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48179 return -EOPNOTSUPP;
48180 }
48181
48182-static struct rtnl_link_ops can_link_ops __read_mostly = {
48183+static struct rtnl_link_ops can_link_ops = {
48184 .kind = "can",
48185 .maxtype = IFLA_CAN_MAX,
48186 .policy = can_policy,
48187diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48188index 0ce868d..e5dc8bd 100644
48189--- a/drivers/net/can/vcan.c
48190+++ b/drivers/net/can/vcan.c
48191@@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
48192 dev->destructor = free_netdev;
48193 }
48194
48195-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48196+static struct rtnl_link_ops vcan_link_ops = {
48197 .kind = "vcan",
48198 .setup = vcan_setup,
48199 };
48200diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48201index 49adbf1..fff7ff8 100644
48202--- a/drivers/net/dummy.c
48203+++ b/drivers/net/dummy.c
48204@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48205 return 0;
48206 }
48207
48208-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48209+static struct rtnl_link_ops dummy_link_ops = {
48210 .kind = DRV_NAME,
48211 .setup = dummy_setup,
48212 .validate = dummy_validate,
48213diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48214index 0443654..4f0aa18 100644
48215--- a/drivers/net/ethernet/8390/ax88796.c
48216+++ b/drivers/net/ethernet/8390/ax88796.c
48217@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48218 if (ax->plat->reg_offsets)
48219 ei_local->reg_offset = ax->plat->reg_offsets;
48220 else {
48221+ resource_size_t _mem_size = mem_size;
48222+ do_div(_mem_size, 0x18);
48223 ei_local->reg_offset = ax->reg_offsets;
48224 for (ret = 0; ret < 0x18; ret++)
48225- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48226+ ax->reg_offsets[ret] = _mem_size * ret;
48227 }
48228
48229 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48230diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48231index da48e66..2dbec80 100644
48232--- a/drivers/net/ethernet/altera/altera_tse_main.c
48233+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48234@@ -1256,7 +1256,7 @@ static int tse_shutdown(struct net_device *dev)
48235 return 0;
48236 }
48237
48238-static struct net_device_ops altera_tse_netdev_ops = {
48239+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48240 .ndo_open = tse_open,
48241 .ndo_stop = tse_shutdown,
48242 .ndo_start_xmit = tse_start_xmit,
48243@@ -1493,11 +1493,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48244 ndev->netdev_ops = &altera_tse_netdev_ops;
48245 altera_tse_set_ethtool_ops(ndev);
48246
48247+ pax_open_kernel();
48248 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48249
48250 if (priv->hash_filter)
48251 altera_tse_netdev_ops.ndo_set_rx_mode =
48252 tse_set_rx_mode_hashfilter;
48253+ pax_close_kernel();
48254
48255 /* Scatter/gather IO is not supported,
48256 * so it is turned off
48257diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48258index 34c28aa..5e06567 100644
48259--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48260+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48261@@ -1124,14 +1124,14 @@ do { \
48262 * operations, everything works on mask values.
48263 */
48264 #define XMDIO_READ(_pdata, _mmd, _reg) \
48265- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48266+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48267 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48268
48269 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48270 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48271
48272 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48273- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48274+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48275 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48276
48277 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48278diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48279index 8a50b01..39c1ad0 100644
48280--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48281+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48282@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48283
48284 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48285
48286- pdata->hw_if.config_dcb_tc(pdata);
48287+ pdata->hw_if->config_dcb_tc(pdata);
48288
48289 return 0;
48290 }
48291@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48292
48293 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48294
48295- pdata->hw_if.config_dcb_pfc(pdata);
48296+ pdata->hw_if->config_dcb_pfc(pdata);
48297
48298 return 0;
48299 }
48300diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48301index 5c92fb7..08be735 100644
48302--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48303+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48304@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48305
48306 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48307 {
48308- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48309+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48310 struct xgbe_channel *channel;
48311 struct xgbe_ring *ring;
48312 struct xgbe_ring_data *rdata;
48313@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48314
48315 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48316 {
48317- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48318+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48319 struct xgbe_channel *channel;
48320 struct xgbe_ring *ring;
48321 struct xgbe_ring_desc *rdesc;
48322@@ -620,17 +620,12 @@ err_out:
48323 return 0;
48324 }
48325
48326-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48327-{
48328- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48329-
48330- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48331- desc_if->free_ring_resources = xgbe_free_ring_resources;
48332- desc_if->map_tx_skb = xgbe_map_tx_skb;
48333- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48334- desc_if->unmap_rdata = xgbe_unmap_rdata;
48335- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48336- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48337-
48338- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48339-}
48340+struct xgbe_desc_if default_xgbe_desc_if = {
48341+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48342+ .free_ring_resources = xgbe_free_ring_resources,
48343+ .map_tx_skb = xgbe_map_tx_skb,
48344+ .map_rx_buffer = xgbe_map_rx_buffer,
48345+ .unmap_rdata = xgbe_unmap_rdata,
48346+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48347+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48348+};
48349diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48350index 21d9497..c74b40f 100644
48351--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48352+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48353@@ -2772,7 +2772,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48354
48355 static int xgbe_init(struct xgbe_prv_data *pdata)
48356 {
48357- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48358+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48359 int ret;
48360
48361 DBGPR("-->xgbe_init\n");
48362@@ -2838,106 +2838,101 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48363 return 0;
48364 }
48365
48366-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48367-{
48368- DBGPR("-->xgbe_init_function_ptrs\n");
48369-
48370- hw_if->tx_complete = xgbe_tx_complete;
48371-
48372- hw_if->set_mac_address = xgbe_set_mac_address;
48373- hw_if->config_rx_mode = xgbe_config_rx_mode;
48374-
48375- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48376- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48377-
48378- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48379- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48380- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48381- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48382- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48383-
48384- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48385- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48386-
48387- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48388- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48389- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48390-
48391- hw_if->enable_tx = xgbe_enable_tx;
48392- hw_if->disable_tx = xgbe_disable_tx;
48393- hw_if->enable_rx = xgbe_enable_rx;
48394- hw_if->disable_rx = xgbe_disable_rx;
48395-
48396- hw_if->powerup_tx = xgbe_powerup_tx;
48397- hw_if->powerdown_tx = xgbe_powerdown_tx;
48398- hw_if->powerup_rx = xgbe_powerup_rx;
48399- hw_if->powerdown_rx = xgbe_powerdown_rx;
48400-
48401- hw_if->dev_xmit = xgbe_dev_xmit;
48402- hw_if->dev_read = xgbe_dev_read;
48403- hw_if->enable_int = xgbe_enable_int;
48404- hw_if->disable_int = xgbe_disable_int;
48405- hw_if->init = xgbe_init;
48406- hw_if->exit = xgbe_exit;
48407+struct xgbe_hw_if default_xgbe_hw_if = {
48408+ .tx_complete = xgbe_tx_complete,
48409+
48410+ .set_mac_address = xgbe_set_mac_address,
48411+ .config_rx_mode = xgbe_config_rx_mode,
48412+
48413+ .enable_rx_csum = xgbe_enable_rx_csum,
48414+ .disable_rx_csum = xgbe_disable_rx_csum,
48415+
48416+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48417+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48418+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48419+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48420+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48421+
48422+ .read_mmd_regs = xgbe_read_mmd_regs,
48423+ .write_mmd_regs = xgbe_write_mmd_regs,
48424+
48425+ .set_gmii_speed = xgbe_set_gmii_speed,
48426+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48427+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48428+
48429+ .enable_tx = xgbe_enable_tx,
48430+ .disable_tx = xgbe_disable_tx,
48431+ .enable_rx = xgbe_enable_rx,
48432+ .disable_rx = xgbe_disable_rx,
48433+
48434+ .powerup_tx = xgbe_powerup_tx,
48435+ .powerdown_tx = xgbe_powerdown_tx,
48436+ .powerup_rx = xgbe_powerup_rx,
48437+ .powerdown_rx = xgbe_powerdown_rx,
48438+
48439+ .dev_xmit = xgbe_dev_xmit,
48440+ .dev_read = xgbe_dev_read,
48441+ .enable_int = xgbe_enable_int,
48442+ .disable_int = xgbe_disable_int,
48443+ .init = xgbe_init,
48444+ .exit = xgbe_exit,
48445
48446 /* Descriptor related Sequences have to be initialized here */
48447- hw_if->tx_desc_init = xgbe_tx_desc_init;
48448- hw_if->rx_desc_init = xgbe_rx_desc_init;
48449- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48450- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48451- hw_if->is_last_desc = xgbe_is_last_desc;
48452- hw_if->is_context_desc = xgbe_is_context_desc;
48453- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48454+ .tx_desc_init = xgbe_tx_desc_init,
48455+ .rx_desc_init = xgbe_rx_desc_init,
48456+ .tx_desc_reset = xgbe_tx_desc_reset,
48457+ .rx_desc_reset = xgbe_rx_desc_reset,
48458+ .is_last_desc = xgbe_is_last_desc,
48459+ .is_context_desc = xgbe_is_context_desc,
48460+ .tx_start_xmit = xgbe_tx_start_xmit,
48461
48462 /* For FLOW ctrl */
48463- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48464- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48465+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48466+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48467
48468 /* For RX coalescing */
48469- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48470- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48471- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48472- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48473+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48474+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48475+ .usec_to_riwt = xgbe_usec_to_riwt,
48476+ .riwt_to_usec = xgbe_riwt_to_usec,
48477
48478 /* For RX and TX threshold config */
48479- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48480- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48481+ .config_rx_threshold = xgbe_config_rx_threshold,
48482+ .config_tx_threshold = xgbe_config_tx_threshold,
48483
48484 /* For RX and TX Store and Forward Mode config */
48485- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48486- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48487+ .config_rsf_mode = xgbe_config_rsf_mode,
48488+ .config_tsf_mode = xgbe_config_tsf_mode,
48489
48490 /* For TX DMA Operating on Second Frame config */
48491- hw_if->config_osp_mode = xgbe_config_osp_mode;
48492+ .config_osp_mode = xgbe_config_osp_mode,
48493
48494 /* For RX and TX PBL config */
48495- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48496- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48497- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48498- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48499- hw_if->config_pblx8 = xgbe_config_pblx8;
48500+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48501+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48502+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48503+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48504+ .config_pblx8 = xgbe_config_pblx8,
48505
48506 /* For MMC statistics support */
48507- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48508- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48509- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48510+ .tx_mmc_int = xgbe_tx_mmc_int,
48511+ .rx_mmc_int = xgbe_rx_mmc_int,
48512+ .read_mmc_stats = xgbe_read_mmc_stats,
48513
48514 /* For PTP config */
48515- hw_if->config_tstamp = xgbe_config_tstamp;
48516- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48517- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48518- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48519- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48520+ .config_tstamp = xgbe_config_tstamp,
48521+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48522+ .set_tstamp_time = xgbe_set_tstamp_time,
48523+ .get_tstamp_time = xgbe_get_tstamp_time,
48524+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48525
48526 /* For Data Center Bridging config */
48527- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48528- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48529+ .config_dcb_tc = xgbe_config_dcb_tc,
48530+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48531
48532 /* For Receive Side Scaling */
48533- hw_if->enable_rss = xgbe_enable_rss;
48534- hw_if->disable_rss = xgbe_disable_rss;
48535- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48536- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48537-
48538- DBGPR("<--xgbe_init_function_ptrs\n");
48539-}
48540+ .enable_rss = xgbe_enable_rss,
48541+ .disable_rss = xgbe_disable_rss,
48542+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48543+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48544+};
48545diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48546index 9fd6c69..588ff02 100644
48547--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48548+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48549@@ -243,7 +243,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48550 * support, tell it now
48551 */
48552 if (ring->tx.xmit_more)
48553- pdata->hw_if.tx_start_xmit(channel, ring);
48554+ pdata->hw_if->tx_start_xmit(channel, ring);
48555
48556 return NETDEV_TX_BUSY;
48557 }
48558@@ -271,7 +271,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48559
48560 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48561 {
48562- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48563+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48564 struct xgbe_channel *channel;
48565 enum xgbe_int int_id;
48566 unsigned int i;
48567@@ -293,7 +293,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48568
48569 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48570 {
48571- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48572+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48573 struct xgbe_channel *channel;
48574 enum xgbe_int int_id;
48575 unsigned int i;
48576@@ -316,7 +316,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48577 static irqreturn_t xgbe_isr(int irq, void *data)
48578 {
48579 struct xgbe_prv_data *pdata = data;
48580- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48581+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48582 struct xgbe_channel *channel;
48583 unsigned int dma_isr, dma_ch_isr;
48584 unsigned int mac_isr, mac_tssr;
48585@@ -682,7 +682,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48586
48587 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48588 {
48589- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48590+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48591
48592 DBGPR("-->xgbe_init_tx_coalesce\n");
48593
48594@@ -696,7 +696,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48595
48596 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48597 {
48598- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48599+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48600
48601 DBGPR("-->xgbe_init_rx_coalesce\n");
48602
48603@@ -711,7 +711,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48604
48605 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48606 {
48607- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48608+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48609 struct xgbe_channel *channel;
48610 struct xgbe_ring *ring;
48611 struct xgbe_ring_data *rdata;
48612@@ -736,7 +736,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48613
48614 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48615 {
48616- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48617+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48618 struct xgbe_channel *channel;
48619 struct xgbe_ring *ring;
48620 struct xgbe_ring_data *rdata;
48621@@ -762,7 +762,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48622 static void xgbe_adjust_link(struct net_device *netdev)
48623 {
48624 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48625- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48626+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48627 struct phy_device *phydev = pdata->phydev;
48628 int new_state = 0;
48629
48630@@ -870,7 +870,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48631 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48632 {
48633 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48634- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48635+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48636 unsigned long flags;
48637
48638 DBGPR("-->xgbe_powerdown\n");
48639@@ -908,7 +908,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48640 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48641 {
48642 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48643- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48644+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48645 unsigned long flags;
48646
48647 DBGPR("-->xgbe_powerup\n");
48648@@ -945,7 +945,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48649
48650 static int xgbe_start(struct xgbe_prv_data *pdata)
48651 {
48652- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48653+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48654 struct net_device *netdev = pdata->netdev;
48655 int ret;
48656
48657@@ -984,7 +984,7 @@ err_napi:
48658
48659 static void xgbe_stop(struct xgbe_prv_data *pdata)
48660 {
48661- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48662+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48663 struct xgbe_channel *channel;
48664 struct net_device *netdev = pdata->netdev;
48665 struct netdev_queue *txq;
48666@@ -1211,7 +1211,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48667 return -ERANGE;
48668 }
48669
48670- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48671+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48672
48673 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48674
48675@@ -1360,7 +1360,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48676 static int xgbe_open(struct net_device *netdev)
48677 {
48678 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48679- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48680+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48681 int ret;
48682
48683 DBGPR("-->xgbe_open\n");
48684@@ -1432,7 +1432,7 @@ err_phy_init:
48685 static int xgbe_close(struct net_device *netdev)
48686 {
48687 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48688- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48689+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48690
48691 DBGPR("-->xgbe_close\n");
48692
48693@@ -1460,8 +1460,8 @@ static int xgbe_close(struct net_device *netdev)
48694 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48695 {
48696 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48697- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48698- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48699+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48700+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48701 struct xgbe_channel *channel;
48702 struct xgbe_ring *ring;
48703 struct xgbe_packet_data *packet;
48704@@ -1529,7 +1529,7 @@ tx_netdev_return:
48705 static void xgbe_set_rx_mode(struct net_device *netdev)
48706 {
48707 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48708- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48709+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48710
48711 DBGPR("-->xgbe_set_rx_mode\n");
48712
48713@@ -1541,7 +1541,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48714 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48715 {
48716 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48717- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48718+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48719 struct sockaddr *saddr = addr;
48720
48721 DBGPR("-->xgbe_set_mac_address\n");
48722@@ -1616,7 +1616,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48723
48724 DBGPR("-->%s\n", __func__);
48725
48726- pdata->hw_if.read_mmc_stats(pdata);
48727+ pdata->hw_if->read_mmc_stats(pdata);
48728
48729 s->rx_packets = pstats->rxframecount_gb;
48730 s->rx_bytes = pstats->rxoctetcount_gb;
48731@@ -1643,7 +1643,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48732 u16 vid)
48733 {
48734 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48735- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48736+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48737
48738 DBGPR("-->%s\n", __func__);
48739
48740@@ -1659,7 +1659,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48741 u16 vid)
48742 {
48743 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48744- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48745+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48746
48747 DBGPR("-->%s\n", __func__);
48748
48749@@ -1725,7 +1725,7 @@ static int xgbe_set_features(struct net_device *netdev,
48750 netdev_features_t features)
48751 {
48752 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48753- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48754+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48755 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48756 int ret = 0;
48757
48758@@ -1791,8 +1791,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48759 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48760 {
48761 struct xgbe_prv_data *pdata = channel->pdata;
48762- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48763- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48764+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48765+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48766 struct xgbe_ring *ring = channel->rx_ring;
48767 struct xgbe_ring_data *rdata;
48768
48769@@ -1847,8 +1847,8 @@ static struct sk_buff *xgbe_create_skb(struct napi_struct *napi,
48770 static int xgbe_tx_poll(struct xgbe_channel *channel)
48771 {
48772 struct xgbe_prv_data *pdata = channel->pdata;
48773- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48774- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48775+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48776+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48777 struct xgbe_ring *ring = channel->tx_ring;
48778 struct xgbe_ring_data *rdata;
48779 struct xgbe_ring_desc *rdesc;
48780@@ -1913,7 +1913,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48781 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48782 {
48783 struct xgbe_prv_data *pdata = channel->pdata;
48784- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48785+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48786 struct xgbe_ring *ring = channel->rx_ring;
48787 struct xgbe_ring_data *rdata;
48788 struct xgbe_packet_data *packet;
48789diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48790index 5f149e8..6736bf4 100644
48791--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48792+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48793@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48794
48795 DBGPR("-->%s\n", __func__);
48796
48797- pdata->hw_if.read_mmc_stats(pdata);
48798+ pdata->hw_if->read_mmc_stats(pdata);
48799 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48800 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48801 *data++ = *(u64 *)stat;
48802@@ -396,7 +396,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48803 struct ethtool_coalesce *ec)
48804 {
48805 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48806- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48807+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48808 unsigned int rx_frames, rx_riwt, rx_usecs;
48809 unsigned int tx_frames;
48810
48811@@ -521,7 +521,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48812 const u8 *key, const u8 hfunc)
48813 {
48814 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48815- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48816+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48817 unsigned int ret;
48818
48819 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48820diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48821index 7149053..889c5492 100644
48822--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48823+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48824@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48825 DBGPR("<--xgbe_default_config\n");
48826 }
48827
48828-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48829-{
48830- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48831- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48832-}
48833-
48834 #ifdef CONFIG_ACPI
48835 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48836 {
48837@@ -387,9 +381,8 @@ static int xgbe_probe(struct platform_device *pdev)
48838 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48839
48840 /* Set all the function pointers */
48841- xgbe_init_all_fptrs(pdata);
48842- hw_if = &pdata->hw_if;
48843- desc_if = &pdata->desc_if;
48844+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48845+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48846
48847 /* Issue software reset to device */
48848 hw_if->exit(pdata);
48849diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48850index 59e267f..0842a88 100644
48851--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48852+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48853@@ -126,7 +126,7 @@
48854 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48855 {
48856 struct xgbe_prv_data *pdata = mii->priv;
48857- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48858+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48859 int mmd_data;
48860
48861 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48862@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48863 u16 mmd_val)
48864 {
48865 struct xgbe_prv_data *pdata = mii->priv;
48866- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48867+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48868 int mmd_data = mmd_val;
48869
48870 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48871diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48872index b03e4f5..78e4cc4 100644
48873--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48874+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48875@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48876 tstamp_cc);
48877 u64 nsec;
48878
48879- nsec = pdata->hw_if.get_tstamp_time(pdata);
48880+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48881
48882 return nsec;
48883 }
48884@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48885
48886 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48887
48888- pdata->hw_if.update_tstamp_addend(pdata, addend);
48889+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48890
48891 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48892
48893diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48894index e62dfa2..7df28d5 100644
48895--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48896+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48897@@ -673,8 +673,8 @@ struct xgbe_prv_data {
48898 int dev_irq;
48899 unsigned int per_channel_irq;
48900
48901- struct xgbe_hw_if hw_if;
48902- struct xgbe_desc_if desc_if;
48903+ struct xgbe_hw_if *hw_if;
48904+ struct xgbe_desc_if *desc_if;
48905
48906 /* AXI DMA settings */
48907 unsigned int coherent;
48908@@ -797,6 +797,9 @@ struct xgbe_prv_data {
48909 #endif
48910 };
48911
48912+extern struct xgbe_hw_if default_xgbe_hw_if;
48913+extern struct xgbe_desc_if default_xgbe_desc_if;
48914+
48915 /* Function prototypes*/
48916
48917 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48918diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
48919index 783543a..a472348 100644
48920--- a/drivers/net/ethernet/broadcom/bcmsysport.c
48921+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
48922@@ -1721,7 +1721,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
48923 macaddr = of_get_mac_address(dn);
48924 if (!macaddr || !is_valid_ether_addr(macaddr)) {
48925 dev_warn(&pdev->dev, "using random Ethernet MAC\n");
48926- random_ether_addr(dev->dev_addr);
48927+ eth_hw_addr_random(dev);
48928 } else {
48929 ether_addr_copy(dev->dev_addr, macaddr);
48930 }
48931diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48932index d7a7175..7011194 100644
48933--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48934+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48935@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48936 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48937 {
48938 /* RX_MODE controlling object */
48939- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48940+ bnx2x_init_rx_mode_obj(bp);
48941
48942 /* multicast configuration controlling object */
48943 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48944diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48945index 07cdf9b..b08ecc7 100644
48946--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48947+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48948@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48949 return rc;
48950 }
48951
48952-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48953- struct bnx2x_rx_mode_obj *o)
48954+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48955 {
48956 if (CHIP_IS_E1x(bp)) {
48957- o->wait_comp = bnx2x_empty_rx_mode_wait;
48958- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48959+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48960+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48961 } else {
48962- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48963- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48964+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48965+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48966 }
48967 }
48968
48969diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48970index 86baecb..ff3bb46 100644
48971--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48972+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48973@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48974
48975 /********************* RX MODE ****************/
48976
48977-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48978- struct bnx2x_rx_mode_obj *o);
48979+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48980
48981 /**
48982 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48983diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48984index 31c9f82..e65e986 100644
48985--- a/drivers/net/ethernet/broadcom/tg3.h
48986+++ b/drivers/net/ethernet/broadcom/tg3.h
48987@@ -150,6 +150,7 @@
48988 #define CHIPREV_ID_5750_A0 0x4000
48989 #define CHIPREV_ID_5750_A1 0x4001
48990 #define CHIPREV_ID_5750_A3 0x4003
48991+#define CHIPREV_ID_5750_C1 0x4201
48992 #define CHIPREV_ID_5750_C2 0x4202
48993 #define CHIPREV_ID_5752_A0_HW 0x5000
48994 #define CHIPREV_ID_5752_A0 0x6000
48995diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48996index deb8da6..45d473b 100644
48997--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48998+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48999@@ -1694,10 +1694,10 @@ bna_cb_ioceth_reset(void *arg)
49000 }
49001
49002 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
49003- bna_cb_ioceth_enable,
49004- bna_cb_ioceth_disable,
49005- bna_cb_ioceth_hbfail,
49006- bna_cb_ioceth_reset
49007+ .enable_cbfn = bna_cb_ioceth_enable,
49008+ .disable_cbfn = bna_cb_ioceth_disable,
49009+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
49010+ .reset_cbfn = bna_cb_ioceth_reset
49011 };
49012
49013 static void bna_attr_init(struct bna_ioceth *ioceth)
49014diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49015index 8cffcdf..aadf043 100644
49016--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49017+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49018@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
49019 */
49020 struct l2t_skb_cb {
49021 arp_failure_handler_func arp_failure_handler;
49022-};
49023+} __no_const;
49024
49025 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
49026
49027diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
49028index badff18..e15c4ec 100644
49029--- a/drivers/net/ethernet/dec/tulip/de4x5.c
49030+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
49031@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49032 for (i=0; i<ETH_ALEN; i++) {
49033 tmp.addr[i] = dev->dev_addr[i];
49034 }
49035- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49036+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49037 break;
49038
49039 case DE4X5_SET_HWADDR: /* Set the hardware address */
49040@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49041 spin_lock_irqsave(&lp->lock, flags);
49042 memcpy(&statbuf, &lp->pktStats, ioc->len);
49043 spin_unlock_irqrestore(&lp->lock, flags);
49044- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49045+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49046 return -EFAULT;
49047 break;
49048 }
49049diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49050index e43cc8a..f1cf67c 100644
49051--- a/drivers/net/ethernet/emulex/benet/be_main.c
49052+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49053@@ -539,7 +539,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49054
49055 if (wrapped)
49056 newacc += 65536;
49057- ACCESS_ONCE(*acc) = newacc;
49058+ ACCESS_ONCE_RW(*acc) = newacc;
49059 }
49060
49061 static void populate_erx_stats(struct be_adapter *adapter,
49062diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49063index 6d0c5d5..55be363 100644
49064--- a/drivers/net/ethernet/faraday/ftgmac100.c
49065+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49066@@ -30,6 +30,8 @@
49067 #include <linux/netdevice.h>
49068 #include <linux/phy.h>
49069 #include <linux/platform_device.h>
49070+#include <linux/interrupt.h>
49071+#include <linux/irqreturn.h>
49072 #include <net/ip.h>
49073
49074 #include "ftgmac100.h"
49075diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49076index dce5f7b..2433466 100644
49077--- a/drivers/net/ethernet/faraday/ftmac100.c
49078+++ b/drivers/net/ethernet/faraday/ftmac100.c
49079@@ -31,6 +31,8 @@
49080 #include <linux/module.h>
49081 #include <linux/netdevice.h>
49082 #include <linux/platform_device.h>
49083+#include <linux/interrupt.h>
49084+#include <linux/irqreturn.h>
49085
49086 #include "ftmac100.h"
49087
49088diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49089index a92b772..250fe69 100644
49090--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49091+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49092@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49093 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49094
49095 /* Update the base adjustement value. */
49096- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49097+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49098 smp_mb(); /* Force the above update. */
49099 }
49100
49101diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49102index e5ba040..d47531c 100644
49103--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49104+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49105@@ -782,7 +782,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49106 }
49107
49108 /* update the base incval used to calculate frequency adjustment */
49109- ACCESS_ONCE(adapter->base_incval) = incval;
49110+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49111 smp_mb();
49112
49113 /* need lock to prevent incorrect read while modifying cyclecounter */
49114diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
49115index 74d0389..086ac03 100644
49116--- a/drivers/net/ethernet/marvell/mvneta.c
49117+++ b/drivers/net/ethernet/marvell/mvneta.c
49118@@ -1462,7 +1462,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49119 struct mvneta_rx_queue *rxq)
49120 {
49121 struct net_device *dev = pp->dev;
49122- int rx_done, rx_filled;
49123+ int rx_done;
49124 u32 rcvd_pkts = 0;
49125 u32 rcvd_bytes = 0;
49126
49127@@ -1473,7 +1473,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49128 rx_todo = rx_done;
49129
49130 rx_done = 0;
49131- rx_filled = 0;
49132
49133 /* Fairness NAPI loop */
49134 while (rx_done < rx_todo) {
49135@@ -1484,7 +1483,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49136 int rx_bytes, err;
49137
49138 rx_done++;
49139- rx_filled++;
49140 rx_status = rx_desc->status;
49141 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
49142 data = (unsigned char *)rx_desc->buf_cookie;
49143@@ -1524,6 +1522,14 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49144 continue;
49145 }
49146
49147+ /* Refill processing */
49148+ err = mvneta_rx_refill(pp, rx_desc);
49149+ if (err) {
49150+ netdev_err(dev, "Linux processing - Can't refill\n");
49151+ rxq->missed++;
49152+ goto err_drop_frame;
49153+ }
49154+
49155 skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size);
49156 if (!skb)
49157 goto err_drop_frame;
49158@@ -1543,14 +1549,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49159 mvneta_rx_csum(pp, rx_status, skb);
49160
49161 napi_gro_receive(&pp->napi, skb);
49162-
49163- /* Refill processing */
49164- err = mvneta_rx_refill(pp, rx_desc);
49165- if (err) {
49166- netdev_err(dev, "Linux processing - Can't refill\n");
49167- rxq->missed++;
49168- rx_filled--;
49169- }
49170 }
49171
49172 if (rcvd_pkts) {
49173@@ -1563,7 +1561,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49174 }
49175
49176 /* Update rxq management counters */
49177- mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_filled);
49178+ mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
49179
49180 return rx_done;
49181 }
49182diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49183index c10d98f..72914c6 100644
49184--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49185+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49186@@ -475,8 +475,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49187 wmb();
49188
49189 /* we want to dirty this cache line once */
49190- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49191- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49192+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49193+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49194
49195 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49196
49197diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49198index 6223930..975033d 100644
49199--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49200+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49201@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49202 struct __vxge_hw_fifo *fifo;
49203 struct vxge_hw_fifo_config *config;
49204 u32 txdl_size, txdl_per_memblock;
49205- struct vxge_hw_mempool_cbs fifo_mp_callback;
49206+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49207+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49208+ };
49209+
49210 struct __vxge_hw_virtualpath *vpath;
49211
49212 if ((vp == NULL) || (attr == NULL)) {
49213@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49214 goto exit;
49215 }
49216
49217- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49218-
49219 fifo->mempool =
49220 __vxge_hw_mempool_create(vpath->hldev,
49221 fifo->config->memblock_size,
49222diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49223index 33669c2..a29c75e 100644
49224--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49225+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49226@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49227 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49228 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49229 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49230- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49231+ pax_open_kernel();
49232+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49233+ pax_close_kernel();
49234 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49235 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49236 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49237diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49238index be7d7a6..a8983f8 100644
49239--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49240+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49241@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49242 case QLCNIC_NON_PRIV_FUNC:
49243 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49244 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49245- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49246+ pax_open_kernel();
49247+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49248+ pax_close_kernel();
49249 break;
49250 case QLCNIC_PRIV_FUNC:
49251 ahw->op_mode = QLCNIC_PRIV_FUNC;
49252 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49253- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49254+ pax_open_kernel();
49255+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49256+ pax_close_kernel();
49257 break;
49258 case QLCNIC_MGMT_FUNC:
49259 ahw->op_mode = QLCNIC_MGMT_FUNC;
49260 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49261- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49262+ pax_open_kernel();
49263+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49264+ pax_close_kernel();
49265 break;
49266 default:
49267 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49268diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49269index 332bb8a..e6adcd1 100644
49270--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49271+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49272@@ -1285,7 +1285,7 @@ flash_temp:
49273 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49274 {
49275 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49276- static const struct qlcnic_dump_operations *fw_dump_ops;
49277+ const struct qlcnic_dump_operations *fw_dump_ops;
49278 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49279 u32 entry_offset, dump, no_entries, buf_offset = 0;
49280 int i, k, ops_cnt, ops_index, dump_size = 0;
49281diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49282index 3df51fa..e9b517f 100644
49283--- a/drivers/net/ethernet/realtek/r8169.c
49284+++ b/drivers/net/ethernet/realtek/r8169.c
49285@@ -788,22 +788,22 @@ struct rtl8169_private {
49286 struct mdio_ops {
49287 void (*write)(struct rtl8169_private *, int, int);
49288 int (*read)(struct rtl8169_private *, int);
49289- } mdio_ops;
49290+ } __no_const mdio_ops;
49291
49292 struct pll_power_ops {
49293 void (*down)(struct rtl8169_private *);
49294 void (*up)(struct rtl8169_private *);
49295- } pll_power_ops;
49296+ } __no_const pll_power_ops;
49297
49298 struct jumbo_ops {
49299 void (*enable)(struct rtl8169_private *);
49300 void (*disable)(struct rtl8169_private *);
49301- } jumbo_ops;
49302+ } __no_const jumbo_ops;
49303
49304 struct csi_ops {
49305 void (*write)(struct rtl8169_private *, int, int);
49306 u32 (*read)(struct rtl8169_private *, int);
49307- } csi_ops;
49308+ } __no_const csi_ops;
49309
49310 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49311 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49312diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49313index a2e9aee..af41a0e 100644
49314--- a/drivers/net/ethernet/sfc/ptp.c
49315+++ b/drivers/net/ethernet/sfc/ptp.c
49316@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49317 ptp->start.dma_addr);
49318
49319 /* Clear flag that signals MC ready */
49320- ACCESS_ONCE(*start) = 0;
49321+ ACCESS_ONCE_RW(*start) = 0;
49322 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49323 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49324 EFX_BUG_ON_PARANOID(rc);
49325diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49326index 08c483b..2c4a553 100644
49327--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49328+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49329@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49330
49331 writel(value, ioaddr + MMC_CNTRL);
49332
49333- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49334- MMC_CNTRL, value);
49335+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49336+// MMC_CNTRL, value);
49337 }
49338
49339 /* To mask all all interrupts.*/
49340diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49341index de28504..7f1c1cd 100644
49342--- a/drivers/net/ethernet/via/via-rhine.c
49343+++ b/drivers/net/ethernet/via/via-rhine.c
49344@@ -2525,7 +2525,7 @@ static struct platform_driver rhine_driver_platform = {
49345 }
49346 };
49347
49348-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49349+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49350 {
49351 .ident = "EPIA-M",
49352 .matches = {
49353diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49354index 41071d3..6e362e1 100644
49355--- a/drivers/net/hyperv/hyperv_net.h
49356+++ b/drivers/net/hyperv/hyperv_net.h
49357@@ -176,7 +176,7 @@ struct rndis_device {
49358 enum rndis_device_state state;
49359 bool link_state;
49360 bool link_change;
49361- atomic_t new_req_id;
49362+ atomic_unchecked_t new_req_id;
49363
49364 spinlock_t request_lock;
49365 struct list_head req_list;
49366diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49367index 9118cea..1a8e06a 100644
49368--- a/drivers/net/hyperv/rndis_filter.c
49369+++ b/drivers/net/hyperv/rndis_filter.c
49370@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49371 * template
49372 */
49373 set = &rndis_msg->msg.set_req;
49374- set->req_id = atomic_inc_return(&dev->new_req_id);
49375+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49376
49377 /* Add to the request list */
49378 spin_lock_irqsave(&dev->request_lock, flags);
49379@@ -923,7 +923,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49380
49381 /* Setup the rndis set */
49382 halt = &request->request_msg.msg.halt_req;
49383- halt->req_id = atomic_inc_return(&dev->new_req_id);
49384+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49385
49386 /* Ignore return since this msg is optional. */
49387 rndis_filter_send_request(dev, request);
49388diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49389index 94570aa..1a798e1 100644
49390--- a/drivers/net/ifb.c
49391+++ b/drivers/net/ifb.c
49392@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49393 return 0;
49394 }
49395
49396-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49397+static struct rtnl_link_ops ifb_link_ops = {
49398 .kind = "ifb",
49399 .priv_size = sizeof(struct ifb_private),
49400 .setup = ifb_setup,
49401diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
49402index 54549a6..0799442 100644
49403--- a/drivers/net/ipvlan/ipvlan.h
49404+++ b/drivers/net/ipvlan/ipvlan.h
49405@@ -102,6 +102,11 @@ static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
49406 return rcu_dereference(d->rx_handler_data);
49407 }
49408
49409+static inline struct ipvl_port *ipvlan_port_get_rcu_bh(const struct net_device *d)
49410+{
49411+ return rcu_dereference_bh(d->rx_handler_data);
49412+}
49413+
49414 static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
49415 {
49416 return rtnl_dereference(d->rx_handler_data);
49417diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
49418index c30b5c3..b349dad 100644
49419--- a/drivers/net/ipvlan/ipvlan_core.c
49420+++ b/drivers/net/ipvlan/ipvlan_core.c
49421@@ -507,7 +507,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
49422 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
49423 {
49424 struct ipvl_dev *ipvlan = netdev_priv(dev);
49425- struct ipvl_port *port = ipvlan_port_get_rcu(ipvlan->phy_dev);
49426+ struct ipvl_port *port = ipvlan_port_get_rcu_bh(ipvlan->phy_dev);
49427
49428 if (!port)
49429 goto out;
49430diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49431index 9f59f17..52cb38f 100644
49432--- a/drivers/net/macvlan.c
49433+++ b/drivers/net/macvlan.c
49434@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49435 free_nskb:
49436 kfree_skb(nskb);
49437 err:
49438- atomic_long_inc(&skb->dev->rx_dropped);
49439+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49440 }
49441
49442 static void macvlan_flush_sources(struct macvlan_port *port,
49443@@ -1480,13 +1480,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49444 int macvlan_link_register(struct rtnl_link_ops *ops)
49445 {
49446 /* common fields */
49447- ops->priv_size = sizeof(struct macvlan_dev);
49448- ops->validate = macvlan_validate;
49449- ops->maxtype = IFLA_MACVLAN_MAX;
49450- ops->policy = macvlan_policy;
49451- ops->changelink = macvlan_changelink;
49452- ops->get_size = macvlan_get_size;
49453- ops->fill_info = macvlan_fill_info;
49454+ pax_open_kernel();
49455+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49456+ *(void **)&ops->validate = macvlan_validate;
49457+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49458+ *(const void **)&ops->policy = macvlan_policy;
49459+ *(void **)&ops->changelink = macvlan_changelink;
49460+ *(void **)&ops->get_size = macvlan_get_size;
49461+ *(void **)&ops->fill_info = macvlan_fill_info;
49462+ pax_close_kernel();
49463
49464 return rtnl_link_register(ops);
49465 };
49466@@ -1572,7 +1574,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49467 return NOTIFY_DONE;
49468 }
49469
49470-static struct notifier_block macvlan_notifier_block __read_mostly = {
49471+static struct notifier_block macvlan_notifier_block = {
49472 .notifier_call = macvlan_device_event,
49473 };
49474
49475diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49476index 8c350c5..30fdc98 100644
49477--- a/drivers/net/macvtap.c
49478+++ b/drivers/net/macvtap.c
49479@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49480 dev->tx_queue_len = TUN_READQ_SIZE;
49481 }
49482
49483-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49484+static struct rtnl_link_ops macvtap_link_ops = {
49485 .kind = "macvtap",
49486 .setup = macvtap_setup,
49487 .newlink = macvtap_newlink,
49488@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49489
49490 ret = 0;
49491 u = q->flags;
49492- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49493+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49494 put_user(u, &ifr->ifr_flags))
49495 ret = -EFAULT;
49496 macvtap_put_vlan(vlan);
49497@@ -1214,7 +1214,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49498 return NOTIFY_DONE;
49499 }
49500
49501-static struct notifier_block macvtap_notifier_block __read_mostly = {
49502+static struct notifier_block macvtap_notifier_block = {
49503 .notifier_call = macvtap_device_event,
49504 };
49505
49506@@ -1268,6 +1268,7 @@ static void macvtap_exit(void)
49507 class_unregister(macvtap_class);
49508 cdev_del(&macvtap_cdev);
49509 unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS);
49510+ idr_destroy(&minor_idr);
49511 }
49512 module_exit(macvtap_exit);
49513
49514diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49515index 34924df..a747360 100644
49516--- a/drivers/net/nlmon.c
49517+++ b/drivers/net/nlmon.c
49518@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49519 return 0;
49520 }
49521
49522-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49523+static struct rtnl_link_ops nlmon_link_ops = {
49524 .kind = "nlmon",
49525 .priv_size = sizeof(struct nlmon),
49526 .setup = nlmon_setup,
49527diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49528index d551df6..fa4c2df 100644
49529--- a/drivers/net/phy/phy_device.c
49530+++ b/drivers/net/phy/phy_device.c
49531@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49532 * zero on success.
49533 *
49534 */
49535-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49536+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49537 struct phy_c45_device_ids *c45_ids) {
49538 int phy_reg;
49539 int i, reg_addr;
49540@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49541 * its return value is in turn returned.
49542 *
49543 */
49544-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49545+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49546 bool is_c45, struct phy_c45_device_ids *c45_ids)
49547 {
49548 int phy_reg;
49549@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49550 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49551 {
49552 struct phy_c45_device_ids c45_ids = {0};
49553- u32 phy_id = 0;
49554+ int phy_id = 0;
49555 int r;
49556
49557 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49558diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49559index 9d15566..5ad4ef6 100644
49560--- a/drivers/net/ppp/ppp_generic.c
49561+++ b/drivers/net/ppp/ppp_generic.c
49562@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49563 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49564 struct ppp_stats stats;
49565 struct ppp_comp_stats cstats;
49566- char *vers;
49567
49568 switch (cmd) {
49569 case SIOCGPPPSTATS:
49570@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49571 break;
49572
49573 case SIOCGPPPVER:
49574- vers = PPP_VERSION;
49575- if (copy_to_user(addr, vers, strlen(vers) + 1))
49576+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49577 break;
49578 err = 0;
49579 break;
49580diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49581index 079f7ad..b2a2bfa7 100644
49582--- a/drivers/net/slip/slhc.c
49583+++ b/drivers/net/slip/slhc.c
49584@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49585 register struct tcphdr *thp;
49586 register struct iphdr *ip;
49587 register struct cstate *cs;
49588- int len, hdrlen;
49589+ long len, hdrlen;
49590 unsigned char *cp = icp;
49591
49592 /* We've got a compressed packet; read the change byte */
49593diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49594index 6928448..e30c57f 100644
49595--- a/drivers/net/team/team.c
49596+++ b/drivers/net/team/team.c
49597@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
49598 return TEAM_DEFAULT_NUM_RX_QUEUES;
49599 }
49600
49601-static struct rtnl_link_ops team_link_ops __read_mostly = {
49602+static struct rtnl_link_ops team_link_ops = {
49603 .kind = DRV_NAME,
49604 .priv_size = sizeof(struct team),
49605 .setup = team_setup,
49606@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
49607 return NOTIFY_DONE;
49608 }
49609
49610-static struct notifier_block team_notifier_block __read_mostly = {
49611+static struct notifier_block team_notifier_block = {
49612 .notifier_call = team_device_event,
49613 };
49614
49615diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49616index e470ae5..e812f5e 100644
49617--- a/drivers/net/tun.c
49618+++ b/drivers/net/tun.c
49619@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49620 return -EINVAL;
49621 }
49622
49623-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49624+static struct rtnl_link_ops tun_link_ops = {
49625 .kind = DRV_NAME,
49626 .priv_size = sizeof(struct tun_struct),
49627 .setup = tun_setup,
49628@@ -1828,7 +1828,7 @@ unlock:
49629 }
49630
49631 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49632- unsigned long arg, int ifreq_len)
49633+ unsigned long arg, size_t ifreq_len)
49634 {
49635 struct tun_file *tfile = file->private_data;
49636 struct tun_struct *tun;
49637@@ -1842,6 +1842,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49638 int le;
49639 int ret;
49640
49641+ if (ifreq_len > sizeof ifr)
49642+ return -EFAULT;
49643+
49644 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49645 if (copy_from_user(&ifr, argp, ifreq_len))
49646 return -EFAULT;
49647diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49648index 111d907..1ee643e 100644
49649--- a/drivers/net/usb/hso.c
49650+++ b/drivers/net/usb/hso.c
49651@@ -70,7 +70,7 @@
49652 #include <asm/byteorder.h>
49653 #include <linux/serial_core.h>
49654 #include <linux/serial.h>
49655-
49656+#include <asm/local.h>
49657
49658 #define MOD_AUTHOR "Option Wireless"
49659 #define MOD_DESCRIPTION "USB High Speed Option driver"
49660@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49661 struct urb *urb;
49662
49663 urb = serial->rx_urb[0];
49664- if (serial->port.count > 0) {
49665+ if (atomic_read(&serial->port.count) > 0) {
49666 count = put_rxbuf_data(urb, serial);
49667 if (count == -1)
49668 return;
49669@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49670 DUMP1(urb->transfer_buffer, urb->actual_length);
49671
49672 /* Anyone listening? */
49673- if (serial->port.count == 0)
49674+ if (atomic_read(&serial->port.count) == 0)
49675 return;
49676
49677 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49678@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49679 tty_port_tty_set(&serial->port, tty);
49680
49681 /* check for port already opened, if not set the termios */
49682- serial->port.count++;
49683- if (serial->port.count == 1) {
49684+ if (atomic_inc_return(&serial->port.count) == 1) {
49685 serial->rx_state = RX_IDLE;
49686 /* Force default termio settings */
49687 _hso_serial_set_termios(tty, NULL);
49688@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49689 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49690 if (result) {
49691 hso_stop_serial_device(serial->parent);
49692- serial->port.count--;
49693+ atomic_dec(&serial->port.count);
49694 } else {
49695 kref_get(&serial->parent->ref);
49696 }
49697@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49698
49699 /* reset the rts and dtr */
49700 /* do the actual close */
49701- serial->port.count--;
49702+ atomic_dec(&serial->port.count);
49703
49704- if (serial->port.count <= 0) {
49705- serial->port.count = 0;
49706+ if (atomic_read(&serial->port.count) <= 0) {
49707+ atomic_set(&serial->port.count, 0);
49708 tty_port_tty_set(&serial->port, NULL);
49709 if (!usb_gone)
49710 hso_stop_serial_device(serial->parent);
49711@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49712
49713 /* the actual setup */
49714 spin_lock_irqsave(&serial->serial_lock, flags);
49715- if (serial->port.count)
49716+ if (atomic_read(&serial->port.count))
49717 _hso_serial_set_termios(tty, old);
49718 else
49719 tty->termios = *old;
49720@@ -1891,7 +1890,7 @@ static void intr_callback(struct urb *urb)
49721 D1("Pending read interrupt on port %d\n", i);
49722 spin_lock(&serial->serial_lock);
49723 if (serial->rx_state == RX_IDLE &&
49724- serial->port.count > 0) {
49725+ atomic_read(&serial->port.count) > 0) {
49726 /* Setup and send a ctrl req read on
49727 * port i */
49728 if (!serial->rx_urb_filled[0]) {
49729@@ -3058,7 +3057,7 @@ static int hso_resume(struct usb_interface *iface)
49730 /* Start all serial ports */
49731 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49732 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49733- if (dev2ser(serial_table[i])->port.count) {
49734+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49735 result =
49736 hso_start_serial_device(serial_table[i], GFP_NOIO);
49737 hso_kick_transmit(dev2ser(serial_table[i]));
49738diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49739index aafa1a1..f59c651 100644
49740--- a/drivers/net/usb/r8152.c
49741+++ b/drivers/net/usb/r8152.c
49742@@ -602,7 +602,7 @@ struct r8152 {
49743 void (*unload)(struct r8152 *);
49744 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49745 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49746- } rtl_ops;
49747+ } __no_const rtl_ops;
49748
49749 int intr_interval;
49750 u32 saved_wolopts;
49751diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49752index a2515887..6d13233 100644
49753--- a/drivers/net/usb/sierra_net.c
49754+++ b/drivers/net/usb/sierra_net.c
49755@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49756 /* atomic counter partially included in MAC address to make sure 2 devices
49757 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49758 */
49759-static atomic_t iface_counter = ATOMIC_INIT(0);
49760+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49761
49762 /*
49763 * SYNC Timer Delay definition used to set the expiry time
49764@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49765 dev->net->netdev_ops = &sierra_net_device_ops;
49766
49767 /* change MAC addr to include, ifacenum, and to be unique */
49768- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49769+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49770 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49771
49772 /* we will have to manufacture ethernet headers, prepare template */
49773diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49774index 63c7810..4ad33aa 100644
49775--- a/drivers/net/virtio_net.c
49776+++ b/drivers/net/virtio_net.c
49777@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49778 #define RECEIVE_AVG_WEIGHT 64
49779
49780 /* Minimum alignment for mergeable packet buffers. */
49781-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49782+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49783
49784 #define VIRTNET_DRIVER_VERSION "1.0.0"
49785
49786diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
49787index 61c0840..92e7f7e 100644
49788--- a/drivers/net/vmxnet3/vmxnet3_drv.c
49789+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
49790@@ -1167,7 +1167,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49791 static const u32 rxprod_reg[2] = {
49792 VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
49793 };
49794- u32 num_rxd = 0;
49795+ u32 num_pkts = 0;
49796 bool skip_page_frags = false;
49797 struct Vmxnet3_RxCompDesc *rcd;
49798 struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
49799@@ -1185,13 +1185,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49800 struct Vmxnet3_RxDesc *rxd;
49801 u32 idx, ring_idx;
49802 struct vmxnet3_cmd_ring *ring = NULL;
49803- if (num_rxd >= quota) {
49804+ if (num_pkts >= quota) {
49805 /* we may stop even before we see the EOP desc of
49806 * the current pkt
49807 */
49808 break;
49809 }
49810- num_rxd++;
49811 BUG_ON(rcd->rqID != rq->qid && rcd->rqID != rq->qid2);
49812 idx = rcd->rxdIdx;
49813 ring_idx = rcd->rqID < adapter->num_rx_queues ? 0 : 1;
49814@@ -1323,6 +1322,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49815 napi_gro_receive(&rq->napi, skb);
49816
49817 ctx->skb = NULL;
49818+ num_pkts++;
49819 }
49820
49821 rcd_done:
49822@@ -1353,7 +1353,7 @@ rcd_done:
49823 &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
49824 }
49825
49826- return num_rxd;
49827+ return num_pkts;
49828 }
49829
49830
49831diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49832index 21a0fbf..055b54f 100644
49833--- a/drivers/net/vxlan.c
49834+++ b/drivers/net/vxlan.c
49835@@ -2878,7 +2878,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49836 return vxlan->net;
49837 }
49838
49839-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49840+static struct rtnl_link_ops vxlan_link_ops = {
49841 .kind = "vxlan",
49842 .maxtype = IFLA_VXLAN_MAX,
49843 .policy = vxlan_policy,
49844@@ -2926,7 +2926,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49845 return NOTIFY_DONE;
49846 }
49847
49848-static struct notifier_block vxlan_notifier_block __read_mostly = {
49849+static struct notifier_block vxlan_notifier_block = {
49850 .notifier_call = vxlan_lowerdev_event,
49851 };
49852
49853diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49854index 5920c99..ff2e4a5 100644
49855--- a/drivers/net/wan/lmc/lmc_media.c
49856+++ b/drivers/net/wan/lmc/lmc_media.c
49857@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49858 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49859
49860 lmc_media_t lmc_ds3_media = {
49861- lmc_ds3_init, /* special media init stuff */
49862- lmc_ds3_default, /* reset to default state */
49863- lmc_ds3_set_status, /* reset status to state provided */
49864- lmc_dummy_set_1, /* set clock source */
49865- lmc_dummy_set2_1, /* set line speed */
49866- lmc_ds3_set_100ft, /* set cable length */
49867- lmc_ds3_set_scram, /* set scrambler */
49868- lmc_ds3_get_link_status, /* get link status */
49869- lmc_dummy_set_1, /* set link status */
49870- lmc_ds3_set_crc_length, /* set CRC length */
49871- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49872- lmc_ds3_watchdog
49873+ .init = lmc_ds3_init, /* special media init stuff */
49874+ .defaults = lmc_ds3_default, /* reset to default state */
49875+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49876+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49877+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49878+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49879+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49880+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49881+ .set_link_status = lmc_dummy_set_1, /* set link status */
49882+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49883+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49884+ .watchdog = lmc_ds3_watchdog
49885 };
49886
49887 lmc_media_t lmc_hssi_media = {
49888- lmc_hssi_init, /* special media init stuff */
49889- lmc_hssi_default, /* reset to default state */
49890- lmc_hssi_set_status, /* reset status to state provided */
49891- lmc_hssi_set_clock, /* set clock source */
49892- lmc_dummy_set2_1, /* set line speed */
49893- lmc_dummy_set_1, /* set cable length */
49894- lmc_dummy_set_1, /* set scrambler */
49895- lmc_hssi_get_link_status, /* get link status */
49896- lmc_hssi_set_link_status, /* set link status */
49897- lmc_hssi_set_crc_length, /* set CRC length */
49898- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49899- lmc_hssi_watchdog
49900+ .init = lmc_hssi_init, /* special media init stuff */
49901+ .defaults = lmc_hssi_default, /* reset to default state */
49902+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49903+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49904+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49905+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49906+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49907+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49908+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49909+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49910+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49911+ .watchdog = lmc_hssi_watchdog
49912 };
49913
49914-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49915- lmc_ssi_default, /* reset to default state */
49916- lmc_ssi_set_status, /* reset status to state provided */
49917- lmc_ssi_set_clock, /* set clock source */
49918- lmc_ssi_set_speed, /* set line speed */
49919- lmc_dummy_set_1, /* set cable length */
49920- lmc_dummy_set_1, /* set scrambler */
49921- lmc_ssi_get_link_status, /* get link status */
49922- lmc_ssi_set_link_status, /* set link status */
49923- lmc_ssi_set_crc_length, /* set CRC length */
49924- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49925- lmc_ssi_watchdog
49926+lmc_media_t lmc_ssi_media = {
49927+ .init = lmc_ssi_init, /* special media init stuff */
49928+ .defaults = lmc_ssi_default, /* reset to default state */
49929+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49930+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49931+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49932+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49933+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49934+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49935+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49936+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49937+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49938+ .watchdog = lmc_ssi_watchdog
49939 };
49940
49941 lmc_media_t lmc_t1_media = {
49942- lmc_t1_init, /* special media init stuff */
49943- lmc_t1_default, /* reset to default state */
49944- lmc_t1_set_status, /* reset status to state provided */
49945- lmc_t1_set_clock, /* set clock source */
49946- lmc_dummy_set2_1, /* set line speed */
49947- lmc_dummy_set_1, /* set cable length */
49948- lmc_dummy_set_1, /* set scrambler */
49949- lmc_t1_get_link_status, /* get link status */
49950- lmc_dummy_set_1, /* set link status */
49951- lmc_t1_set_crc_length, /* set CRC length */
49952- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49953- lmc_t1_watchdog
49954+ .init = lmc_t1_init, /* special media init stuff */
49955+ .defaults = lmc_t1_default, /* reset to default state */
49956+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49957+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49958+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49959+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49960+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49961+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49962+ .set_link_status = lmc_dummy_set_1, /* set link status */
49963+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49964+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49965+ .watchdog = lmc_t1_watchdog
49966 };
49967
49968 static void
49969diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49970index feacc3b..5bac0de 100644
49971--- a/drivers/net/wan/z85230.c
49972+++ b/drivers/net/wan/z85230.c
49973@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49974
49975 struct z8530_irqhandler z8530_sync =
49976 {
49977- z8530_rx,
49978- z8530_tx,
49979- z8530_status
49980+ .rx = z8530_rx,
49981+ .tx = z8530_tx,
49982+ .status = z8530_status
49983 };
49984
49985 EXPORT_SYMBOL(z8530_sync);
49986@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49987 }
49988
49989 static struct z8530_irqhandler z8530_dma_sync = {
49990- z8530_dma_rx,
49991- z8530_dma_tx,
49992- z8530_dma_status
49993+ .rx = z8530_dma_rx,
49994+ .tx = z8530_dma_tx,
49995+ .status = z8530_dma_status
49996 };
49997
49998 static struct z8530_irqhandler z8530_txdma_sync = {
49999- z8530_rx,
50000- z8530_dma_tx,
50001- z8530_dma_status
50002+ .rx = z8530_rx,
50003+ .tx = z8530_dma_tx,
50004+ .status = z8530_dma_status
50005 };
50006
50007 /**
50008@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
50009
50010 struct z8530_irqhandler z8530_nop=
50011 {
50012- z8530_rx_clear,
50013- z8530_tx_clear,
50014- z8530_status_clear
50015+ .rx = z8530_rx_clear,
50016+ .tx = z8530_tx_clear,
50017+ .status = z8530_status_clear
50018 };
50019
50020
50021diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
50022index 0b60295..b8bfa5b 100644
50023--- a/drivers/net/wimax/i2400m/rx.c
50024+++ b/drivers/net/wimax/i2400m/rx.c
50025@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
50026 if (i2400m->rx_roq == NULL)
50027 goto error_roq_alloc;
50028
50029- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
50030+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
50031 GFP_KERNEL);
50032 if (rd == NULL) {
50033 result = -ENOMEM;
50034diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
50035index d0c97c2..108f59b 100644
50036--- a/drivers/net/wireless/airo.c
50037+++ b/drivers/net/wireless/airo.c
50038@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
50039 struct airo_info *ai = dev->ml_priv;
50040 int ridcode;
50041 int enabled;
50042- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
50043+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
50044 unsigned char *iobuf;
50045
50046 /* Only super-user can write RIDs */
50047diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
50048index 49219c5..3625441 100644
50049--- a/drivers/net/wireless/at76c50x-usb.c
50050+++ b/drivers/net/wireless/at76c50x-usb.c
50051@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
50052 }
50053
50054 /* Convert timeout from the DFU status to jiffies */
50055-static inline unsigned long at76_get_timeout(struct dfu_status *s)
50056+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
50057 {
50058 return msecs_to_jiffies((s->poll_timeout[2] << 16)
50059 | (s->poll_timeout[1] << 8)
50060diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
50061index 2fd9e18..3f55bdd 100644
50062--- a/drivers/net/wireless/ath/ath10k/htc.c
50063+++ b/drivers/net/wireless/ath/ath10k/htc.c
50064@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
50065 /* registered target arrival callback from the HIF layer */
50066 int ath10k_htc_init(struct ath10k *ar)
50067 {
50068- struct ath10k_hif_cb htc_callbacks;
50069+ static struct ath10k_hif_cb htc_callbacks = {
50070+ .rx_completion = ath10k_htc_rx_completion_handler,
50071+ .tx_completion = ath10k_htc_tx_completion_handler,
50072+ };
50073 struct ath10k_htc_ep *ep = NULL;
50074 struct ath10k_htc *htc = &ar->htc;
50075
50076@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
50077 ath10k_htc_reset_endpoint_states(htc);
50078
50079 /* setup HIF layer callbacks */
50080- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
50081- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
50082 htc->ar = ar;
50083
50084 /* Get HIF default pipe for HTC message exchange */
50085diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
50086index 527179c..a890150 100644
50087--- a/drivers/net/wireless/ath/ath10k/htc.h
50088+++ b/drivers/net/wireless/ath/ath10k/htc.h
50089@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
50090
50091 struct ath10k_htc_ops {
50092 void (*target_send_suspend_complete)(struct ath10k *ar);
50093-};
50094+} __no_const;
50095
50096 struct ath10k_htc_ep_ops {
50097 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
50098 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
50099 void (*ep_tx_credits)(struct ath10k *);
50100-};
50101+} __no_const;
50102
50103 /* service connection information */
50104 struct ath10k_htc_svc_conn_req {
50105diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50106index f816909..e56cd8b 100644
50107--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50108+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50109@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50110 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
50111 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
50112
50113- ACCESS_ONCE(ads->ds_link) = i->link;
50114- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
50115+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
50116+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
50117
50118 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
50119 ctl6 = SM(i->keytype, AR_EncrType);
50120@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50121
50122 if ((i->is_first || i->is_last) &&
50123 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
50124- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
50125+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
50126 | set11nTries(i->rates, 1)
50127 | set11nTries(i->rates, 2)
50128 | set11nTries(i->rates, 3)
50129 | (i->dur_update ? AR_DurUpdateEna : 0)
50130 | SM(0, AR_BurstDur);
50131
50132- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
50133+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
50134 | set11nRate(i->rates, 1)
50135 | set11nRate(i->rates, 2)
50136 | set11nRate(i->rates, 3);
50137 } else {
50138- ACCESS_ONCE(ads->ds_ctl2) = 0;
50139- ACCESS_ONCE(ads->ds_ctl3) = 0;
50140+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
50141+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
50142 }
50143
50144 if (!i->is_first) {
50145- ACCESS_ONCE(ads->ds_ctl0) = 0;
50146- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50147- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50148+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
50149+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50150+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50151 return;
50152 }
50153
50154@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50155 break;
50156 }
50157
50158- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50159+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50160 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50161 | SM(i->txpower[0], AR_XmitPower0)
50162 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50163@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50164 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50165 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50166
50167- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50168- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50169+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50170+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50171
50172 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50173 return;
50174
50175- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50176+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50177 | set11nPktDurRTSCTS(i->rates, 1);
50178
50179- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50180+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50181 | set11nPktDurRTSCTS(i->rates, 3);
50182
50183- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50184+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50185 | set11nRateFlags(i->rates, 1)
50186 | set11nRateFlags(i->rates, 2)
50187 | set11nRateFlags(i->rates, 3)
50188 | SM(i->rtscts_rate, AR_RTSCTSRate);
50189
50190- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50191- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50192- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50193+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50194+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50195+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50196 }
50197
50198 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50199diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50200index da84b70..83e4978 100644
50201--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50202+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50203@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50204 (i->qcu << AR_TxQcuNum_S) | desc_len;
50205
50206 checksum += val;
50207- ACCESS_ONCE(ads->info) = val;
50208+ ACCESS_ONCE_RW(ads->info) = val;
50209
50210 checksum += i->link;
50211- ACCESS_ONCE(ads->link) = i->link;
50212+ ACCESS_ONCE_RW(ads->link) = i->link;
50213
50214 checksum += i->buf_addr[0];
50215- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50216+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50217 checksum += i->buf_addr[1];
50218- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50219+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50220 checksum += i->buf_addr[2];
50221- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50222+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50223 checksum += i->buf_addr[3];
50224- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50225+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50226
50227 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50228- ACCESS_ONCE(ads->ctl3) = val;
50229+ ACCESS_ONCE_RW(ads->ctl3) = val;
50230 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50231- ACCESS_ONCE(ads->ctl5) = val;
50232+ ACCESS_ONCE_RW(ads->ctl5) = val;
50233 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50234- ACCESS_ONCE(ads->ctl7) = val;
50235+ ACCESS_ONCE_RW(ads->ctl7) = val;
50236 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50237- ACCESS_ONCE(ads->ctl9) = val;
50238+ ACCESS_ONCE_RW(ads->ctl9) = val;
50239
50240 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50241- ACCESS_ONCE(ads->ctl10) = checksum;
50242+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50243
50244 if (i->is_first || i->is_last) {
50245- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50246+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50247 | set11nTries(i->rates, 1)
50248 | set11nTries(i->rates, 2)
50249 | set11nTries(i->rates, 3)
50250 | (i->dur_update ? AR_DurUpdateEna : 0)
50251 | SM(0, AR_BurstDur);
50252
50253- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50254+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50255 | set11nRate(i->rates, 1)
50256 | set11nRate(i->rates, 2)
50257 | set11nRate(i->rates, 3);
50258 } else {
50259- ACCESS_ONCE(ads->ctl13) = 0;
50260- ACCESS_ONCE(ads->ctl14) = 0;
50261+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50262+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50263 }
50264
50265 ads->ctl20 = 0;
50266@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50267
50268 ctl17 = SM(i->keytype, AR_EncrType);
50269 if (!i->is_first) {
50270- ACCESS_ONCE(ads->ctl11) = 0;
50271- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50272- ACCESS_ONCE(ads->ctl15) = 0;
50273- ACCESS_ONCE(ads->ctl16) = 0;
50274- ACCESS_ONCE(ads->ctl17) = ctl17;
50275- ACCESS_ONCE(ads->ctl18) = 0;
50276- ACCESS_ONCE(ads->ctl19) = 0;
50277+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50278+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50279+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50280+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50281+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50282+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50283+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50284 return;
50285 }
50286
50287- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50288+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50289 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50290 | SM(i->txpower[0], AR_XmitPower0)
50291 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50292@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50293 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50294 ctl12 |= SM(val, AR_PAPRDChainMask);
50295
50296- ACCESS_ONCE(ads->ctl12) = ctl12;
50297- ACCESS_ONCE(ads->ctl17) = ctl17;
50298+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50299+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50300
50301- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50302+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50303 | set11nPktDurRTSCTS(i->rates, 1);
50304
50305- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50306+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50307 | set11nPktDurRTSCTS(i->rates, 3);
50308
50309- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50310+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50311 | set11nRateFlags(i->rates, 1)
50312 | set11nRateFlags(i->rates, 2)
50313 | set11nRateFlags(i->rates, 3)
50314 | SM(i->rtscts_rate, AR_RTSCTSRate);
50315
50316- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50317+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50318
50319- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50320- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50321- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50322+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50323+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50324+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50325 }
50326
50327 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50328diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50329index c1d2d03..08352db 100644
50330--- a/drivers/net/wireless/ath/ath9k/hw.h
50331+++ b/drivers/net/wireless/ath/ath9k/hw.h
50332@@ -671,7 +671,7 @@ struct ath_hw_private_ops {
50333 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50334 bool (*is_aic_enabled)(struct ath_hw *ah);
50335 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
50336-};
50337+} __no_const;
50338
50339 /**
50340 * struct ath_spec_scan - parameters for Atheros spectral scan
50341@@ -747,7 +747,7 @@ struct ath_hw_ops {
50342 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50343 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50344 #endif
50345-};
50346+} __no_const;
50347
50348 struct ath_nf_limits {
50349 s16 max;
50350diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50351index b0badef..3e3464c 100644
50352--- a/drivers/net/wireless/ath/ath9k/main.c
50353+++ b/drivers/net/wireless/ath/ath9k/main.c
50354@@ -2573,16 +2573,18 @@ void ath9k_fill_chanctx_ops(void)
50355 if (!ath9k_is_chanctx_enabled())
50356 return;
50357
50358- ath9k_ops.hw_scan = ath9k_hw_scan;
50359- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50360- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50361- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50362- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50363- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50364- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50365- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50366- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50367- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50368+ pax_open_kernel();
50369+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50370+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50371+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50372+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50373+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50374+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50375+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50376+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50377+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50378+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50379+ pax_close_kernel();
50380 }
50381
50382 #endif
50383diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50384index 058a9f2..d5cb1ba 100644
50385--- a/drivers/net/wireless/b43/phy_lp.c
50386+++ b/drivers/net/wireless/b43/phy_lp.c
50387@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50388 {
50389 struct ssb_bus *bus = dev->dev->sdev->bus;
50390
50391- static const struct b206x_channel *chandata = NULL;
50392+ const struct b206x_channel *chandata = NULL;
50393 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50394 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50395 u16 old_comm15, scale;
50396diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50397index e566580..2c218ca 100644
50398--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50399+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50400@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50401 */
50402 if (il3945_mod_params.disable_hw_scan) {
50403 D_INFO("Disabling hw_scan\n");
50404- il3945_mac_ops.hw_scan = NULL;
50405+ pax_open_kernel();
50406+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50407+ pax_close_kernel();
50408 }
50409
50410 D_INFO("*** LOAD DRIVER ***\n");
50411diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50412index 0ffb6ff..c0b7f0e 100644
50413--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50414+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50415@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50416 {
50417 struct iwl_priv *priv = file->private_data;
50418 char buf[64];
50419- int buf_size;
50420+ size_t buf_size;
50421 u32 offset, len;
50422
50423 memset(buf, 0, sizeof(buf));
50424@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50425 struct iwl_priv *priv = file->private_data;
50426
50427 char buf[8];
50428- int buf_size;
50429+ size_t buf_size;
50430 u32 reset_flag;
50431
50432 memset(buf, 0, sizeof(buf));
50433@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50434 {
50435 struct iwl_priv *priv = file->private_data;
50436 char buf[8];
50437- int buf_size;
50438+ size_t buf_size;
50439 int ht40;
50440
50441 memset(buf, 0, sizeof(buf));
50442@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50443 {
50444 struct iwl_priv *priv = file->private_data;
50445 char buf[8];
50446- int buf_size;
50447+ size_t buf_size;
50448 int value;
50449
50450 memset(buf, 0, sizeof(buf));
50451@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50452 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50453 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50454
50455-static const char *fmt_value = " %-30s %10u\n";
50456-static const char *fmt_hex = " %-30s 0x%02X\n";
50457-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50458-static const char *fmt_header =
50459+static const char fmt_value[] = " %-30s %10u\n";
50460+static const char fmt_hex[] = " %-30s 0x%02X\n";
50461+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50462+static const char fmt_header[] =
50463 "%-32s current cumulative delta max\n";
50464
50465 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50466@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50467 {
50468 struct iwl_priv *priv = file->private_data;
50469 char buf[8];
50470- int buf_size;
50471+ size_t buf_size;
50472 int clear;
50473
50474 memset(buf, 0, sizeof(buf));
50475@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50476 {
50477 struct iwl_priv *priv = file->private_data;
50478 char buf[8];
50479- int buf_size;
50480+ size_t buf_size;
50481 int trace;
50482
50483 memset(buf, 0, sizeof(buf));
50484@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50485 {
50486 struct iwl_priv *priv = file->private_data;
50487 char buf[8];
50488- int buf_size;
50489+ size_t buf_size;
50490 int missed;
50491
50492 memset(buf, 0, sizeof(buf));
50493@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50494
50495 struct iwl_priv *priv = file->private_data;
50496 char buf[8];
50497- int buf_size;
50498+ size_t buf_size;
50499 int plcp;
50500
50501 memset(buf, 0, sizeof(buf));
50502@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50503
50504 struct iwl_priv *priv = file->private_data;
50505 char buf[8];
50506- int buf_size;
50507+ size_t buf_size;
50508 int flush;
50509
50510 memset(buf, 0, sizeof(buf));
50511@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50512
50513 struct iwl_priv *priv = file->private_data;
50514 char buf[8];
50515- int buf_size;
50516+ size_t buf_size;
50517 int rts;
50518
50519 if (!priv->cfg->ht_params)
50520@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50521 {
50522 struct iwl_priv *priv = file->private_data;
50523 char buf[8];
50524- int buf_size;
50525+ size_t buf_size;
50526
50527 memset(buf, 0, sizeof(buf));
50528 buf_size = min(count, sizeof(buf) - 1);
50529@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50530 struct iwl_priv *priv = file->private_data;
50531 u32 event_log_flag;
50532 char buf[8];
50533- int buf_size;
50534+ size_t buf_size;
50535
50536 /* check that the interface is up */
50537 if (!iwl_is_ready(priv))
50538@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50539 struct iwl_priv *priv = file->private_data;
50540 char buf[8];
50541 u32 calib_disabled;
50542- int buf_size;
50543+ size_t buf_size;
50544
50545 memset(buf, 0, sizeof(buf));
50546 buf_size = min(count, sizeof(buf) - 1);
50547diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50548index dc17909..989c9fb 100644
50549--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50550+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50551@@ -1919,7 +1919,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50552 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50553
50554 char buf[8];
50555- int buf_size;
50556+ size_t buf_size;
50557 u32 reset_flag;
50558
50559 memset(buf, 0, sizeof(buf));
50560@@ -1940,7 +1940,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50561 {
50562 struct iwl_trans *trans = file->private_data;
50563 char buf[8];
50564- int buf_size;
50565+ size_t buf_size;
50566 int csr;
50567
50568 memset(buf, 0, sizeof(buf));
50569diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50570index d5c0a1a..d056b20 100644
50571--- a/drivers/net/wireless/mac80211_hwsim.c
50572+++ b/drivers/net/wireless/mac80211_hwsim.c
50573@@ -3149,20 +3149,20 @@ static int __init init_mac80211_hwsim(void)
50574 if (channels < 1)
50575 return -EINVAL;
50576
50577- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50578- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50579- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50580- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50581- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50582- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50583- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50584- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50585- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50586- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50587- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50588- mac80211_hwsim_assign_vif_chanctx;
50589- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50590- mac80211_hwsim_unassign_vif_chanctx;
50591+ pax_open_kernel();
50592+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50593+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50594+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50595+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50596+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50597+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50598+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50599+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50600+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50601+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50602+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50603+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50604+ pax_close_kernel();
50605
50606 spin_lock_init(&hwsim_radio_lock);
50607 INIT_LIST_HEAD(&hwsim_radios);
50608diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50609index d72ff8e..c209a45 100644
50610--- a/drivers/net/wireless/rndis_wlan.c
50611+++ b/drivers/net/wireless/rndis_wlan.c
50612@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50613
50614 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50615
50616- if (rts_threshold < 0 || rts_threshold > 2347)
50617+ if (rts_threshold > 2347)
50618 rts_threshold = 2347;
50619
50620 tmp = cpu_to_le32(rts_threshold);
50621diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50622index 9bb398b..b0cc047 100644
50623--- a/drivers/net/wireless/rt2x00/rt2x00.h
50624+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50625@@ -375,7 +375,7 @@ struct rt2x00_intf {
50626 * for hardware which doesn't support hardware
50627 * sequence counting.
50628 */
50629- atomic_t seqno;
50630+ atomic_unchecked_t seqno;
50631 };
50632
50633 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50634diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50635index 68b620b..92ecd9e 100644
50636--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50637+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50638@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50639 * sequence counter given by mac80211.
50640 */
50641 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50642- seqno = atomic_add_return(0x10, &intf->seqno);
50643+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50644 else
50645- seqno = atomic_read(&intf->seqno);
50646+ seqno = atomic_read_unchecked(&intf->seqno);
50647
50648 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50649 hdr->seq_ctrl |= cpu_to_le16(seqno);
50650diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50651index b661f896..ddf7d2b 100644
50652--- a/drivers/net/wireless/ti/wl1251/sdio.c
50653+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50654@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50655
50656 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50657
50658- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50659- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50660+ pax_open_kernel();
50661+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50662+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50663+ pax_close_kernel();
50664
50665 wl1251_info("using dedicated interrupt line");
50666 } else {
50667- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50668- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50669+ pax_open_kernel();
50670+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50671+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50672+ pax_close_kernel();
50673
50674 wl1251_info("using SDIO interrupt");
50675 }
50676diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50677index af0fe2e..d04986b 100644
50678--- a/drivers/net/wireless/ti/wl12xx/main.c
50679+++ b/drivers/net/wireless/ti/wl12xx/main.c
50680@@ -655,7 +655,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50681 sizeof(wl->conf.mem));
50682
50683 /* read data preparation is only needed by wl127x */
50684- wl->ops->prepare_read = wl127x_prepare_read;
50685+ pax_open_kernel();
50686+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50687+ pax_close_kernel();
50688
50689 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50690 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50691@@ -680,7 +682,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50692 sizeof(wl->conf.mem));
50693
50694 /* read data preparation is only needed by wl127x */
50695- wl->ops->prepare_read = wl127x_prepare_read;
50696+ pax_open_kernel();
50697+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50698+ pax_close_kernel();
50699
50700 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50701 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50702diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50703index 717c4f5..a813aeb 100644
50704--- a/drivers/net/wireless/ti/wl18xx/main.c
50705+++ b/drivers/net/wireless/ti/wl18xx/main.c
50706@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50707 }
50708
50709 if (!checksum_param) {
50710- wl18xx_ops.set_rx_csum = NULL;
50711- wl18xx_ops.init_vif = NULL;
50712+ pax_open_kernel();
50713+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50714+ *(void **)&wl18xx_ops.init_vif = NULL;
50715+ pax_close_kernel();
50716 }
50717
50718 /* Enable 11a Band only if we have 5G antennas */
50719diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50720index a912dc0..a8225ba 100644
50721--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50722+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50723@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50724 {
50725 struct zd_usb *usb = urb->context;
50726 struct zd_usb_interrupt *intr = &usb->intr;
50727- int len;
50728+ unsigned int len;
50729 u16 int_num;
50730
50731 ZD_ASSERT(in_interrupt());
50732diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
50733index 0d25943..0866c5d 100644
50734--- a/drivers/net/xen-netback/netback.c
50735+++ b/drivers/net/xen-netback/netback.c
50736@@ -1571,13 +1571,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
50737 smp_rmb();
50738
50739 while (dc != dp) {
50740- BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
50741+ BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
50742 pending_idx =
50743 queue->dealloc_ring[pending_index(dc++)];
50744
50745- pending_idx_release[gop-queue->tx_unmap_ops] =
50746+ pending_idx_release[gop - queue->tx_unmap_ops] =
50747 pending_idx;
50748- queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
50749+ queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
50750 queue->mmap_pages[pending_idx];
50751 gnttab_set_unmap_op(gop,
50752 idx_to_kaddr(queue, pending_idx),
50753diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50754index ce2e2cf..f81e500 100644
50755--- a/drivers/nfc/nfcwilink.c
50756+++ b/drivers/nfc/nfcwilink.c
50757@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50758
50759 static int nfcwilink_probe(struct platform_device *pdev)
50760 {
50761- static struct nfcwilink *drv;
50762+ struct nfcwilink *drv;
50763 int rc;
50764 __u32 protocols;
50765
50766diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50767index d251f72..0512865 100644
50768--- a/drivers/nfc/st21nfca/st21nfca.c
50769+++ b/drivers/nfc/st21nfca/st21nfca.c
50770@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50771 ST21NFCA_DEVICE_MGNT_GATE,
50772 ST21NFCA_DEVICE_MGNT_PIPE);
50773 if (r < 0)
50774- goto free_info;
50775+ return r;
50776
50777 /* Get pipe list */
50778 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50779 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50780 &skb_pipe_list);
50781 if (r < 0)
50782- goto free_info;
50783+ return r;
50784
50785 /* Complete the existing gate_pipe table */
50786 for (i = 0; i < skb_pipe_list->len; i++) {
50787@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50788 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50789 pr_err("Unexpected apdu_reader pipe on host %x\n",
50790 info->src_host_id);
50791+ kfree_skb(skb_pipe_info);
50792 continue;
50793 }
50794
50795@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50796 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50797 info->src_host_id;
50798 }
50799+ kfree_skb(skb_pipe_info);
50800 }
50801
50802 /*
50803@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50804 st21nfca_gates[i].gate,
50805 st21nfca_gates[i].pipe);
50806 if (r < 0)
50807- goto free_info;
50808+ goto free_list;
50809 }
50810 }
50811
50812 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50813-free_info:
50814- kfree_skb(skb_pipe_info);
50815+free_list:
50816 kfree_skb(skb_pipe_list);
50817 return r;
50818 }
50819diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50820index cde35c5d01..2dbfdbbf 100644
50821--- a/drivers/of/fdt.c
50822+++ b/drivers/of/fdt.c
50823@@ -1136,7 +1136,9 @@ static int __init of_fdt_raw_init(void)
50824 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50825 return 0;
50826 }
50827- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50828+ pax_open_kernel();
50829+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50830+ pax_close_kernel();
50831 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50832 }
50833 late_initcall(of_fdt_raw_init);
50834diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50835index 82f7000..d6d0447 100644
50836--- a/drivers/oprofile/buffer_sync.c
50837+++ b/drivers/oprofile/buffer_sync.c
50838@@ -345,7 +345,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50839 if (cookie == NO_COOKIE)
50840 offset = pc;
50841 if (cookie == INVALID_COOKIE) {
50842- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50843+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50844 offset = pc;
50845 }
50846 if (cookie != last_cookie) {
50847@@ -389,14 +389,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50848 /* add userspace sample */
50849
50850 if (!mm) {
50851- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50852+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50853 return 0;
50854 }
50855
50856 cookie = lookup_dcookie(mm, s->eip, &offset);
50857
50858 if (cookie == INVALID_COOKIE) {
50859- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50860+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50861 return 0;
50862 }
50863
50864@@ -554,7 +554,7 @@ void sync_buffer(int cpu)
50865 /* ignore backtraces if failed to add a sample */
50866 if (state == sb_bt_start) {
50867 state = sb_bt_ignore;
50868- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50869+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50870 }
50871 }
50872 release_mm(mm);
50873diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50874index c0cc4e7..44d4e54 100644
50875--- a/drivers/oprofile/event_buffer.c
50876+++ b/drivers/oprofile/event_buffer.c
50877@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50878 }
50879
50880 if (buffer_pos == buffer_size) {
50881- atomic_inc(&oprofile_stats.event_lost_overflow);
50882+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50883 return;
50884 }
50885
50886diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50887index ed2c3ec..deda85a 100644
50888--- a/drivers/oprofile/oprof.c
50889+++ b/drivers/oprofile/oprof.c
50890@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50891 if (oprofile_ops.switch_events())
50892 return;
50893
50894- atomic_inc(&oprofile_stats.multiplex_counter);
50895+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50896 start_switch_worker();
50897 }
50898
50899diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50900index ee2cfce..7f8f699 100644
50901--- a/drivers/oprofile/oprofile_files.c
50902+++ b/drivers/oprofile/oprofile_files.c
50903@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50904
50905 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50906
50907-static ssize_t timeout_read(struct file *file, char __user *buf,
50908+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50909 size_t count, loff_t *offset)
50910 {
50911 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50912diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50913index 59659ce..6c860a0 100644
50914--- a/drivers/oprofile/oprofile_stats.c
50915+++ b/drivers/oprofile/oprofile_stats.c
50916@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50917 cpu_buf->sample_invalid_eip = 0;
50918 }
50919
50920- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50921- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50922- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50923- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50924- atomic_set(&oprofile_stats.multiplex_counter, 0);
50925+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50926+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50927+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50928+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50929+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50930 }
50931
50932
50933diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50934index 1fc622b..8c48fc3 100644
50935--- a/drivers/oprofile/oprofile_stats.h
50936+++ b/drivers/oprofile/oprofile_stats.h
50937@@ -13,11 +13,11 @@
50938 #include <linux/atomic.h>
50939
50940 struct oprofile_stat_struct {
50941- atomic_t sample_lost_no_mm;
50942- atomic_t sample_lost_no_mapping;
50943- atomic_t bt_lost_no_mapping;
50944- atomic_t event_lost_overflow;
50945- atomic_t multiplex_counter;
50946+ atomic_unchecked_t sample_lost_no_mm;
50947+ atomic_unchecked_t sample_lost_no_mapping;
50948+ atomic_unchecked_t bt_lost_no_mapping;
50949+ atomic_unchecked_t event_lost_overflow;
50950+ atomic_unchecked_t multiplex_counter;
50951 };
50952
50953 extern struct oprofile_stat_struct oprofile_stats;
50954diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50955index dd92c5e..dfc04b5 100644
50956--- a/drivers/oprofile/oprofilefs.c
50957+++ b/drivers/oprofile/oprofilefs.c
50958@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50959
50960 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50961 {
50962- atomic_t *val = file->private_data;
50963- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50964+ atomic_unchecked_t *val = file->private_data;
50965+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50966 }
50967
50968
50969@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50970
50971
50972 int oprofilefs_create_ro_atomic(struct dentry *root,
50973- char const *name, atomic_t *val)
50974+ char const *name, atomic_unchecked_t *val)
50975 {
50976 return __oprofilefs_create_file(root, name,
50977 &atomic_ro_fops, 0444, val);
50978diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50979index bdef916..88c7dee 100644
50980--- a/drivers/oprofile/timer_int.c
50981+++ b/drivers/oprofile/timer_int.c
50982@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50983 return NOTIFY_OK;
50984 }
50985
50986-static struct notifier_block __refdata oprofile_cpu_notifier = {
50987+static struct notifier_block oprofile_cpu_notifier = {
50988 .notifier_call = oprofile_cpu_notify,
50989 };
50990
50991diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50992index 3b47080..6cd05dd 100644
50993--- a/drivers/parport/procfs.c
50994+++ b/drivers/parport/procfs.c
50995@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50996
50997 *ppos += len;
50998
50999- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
51000+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
51001 }
51002
51003 #ifdef CONFIG_PARPORT_1284
51004@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
51005
51006 *ppos += len;
51007
51008- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
51009+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
51010 }
51011 #endif /* IEEE1284.3 support. */
51012
51013diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
51014index ba46e58..90cfc24 100644
51015--- a/drivers/pci/host/pci-host-generic.c
51016+++ b/drivers/pci/host/pci-host-generic.c
51017@@ -26,9 +26,9 @@
51018 #include <linux/platform_device.h>
51019
51020 struct gen_pci_cfg_bus_ops {
51021+ struct pci_ops ops;
51022 u32 bus_shift;
51023- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
51024-};
51025+} __do_const;
51026
51027 struct gen_pci_cfg_windows {
51028 struct resource res;
51029@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
51030 }
51031
51032 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
51033+ .ops = {
51034+ .map_bus = gen_pci_map_cfg_bus_cam,
51035+ .read = pci_generic_config_read,
51036+ .write = pci_generic_config_write,
51037+ },
51038 .bus_shift = 16,
51039- .map_bus = gen_pci_map_cfg_bus_cam,
51040 };
51041
51042 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
51043@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
51044 }
51045
51046 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
51047+ .ops = {
51048+ .map_bus = gen_pci_map_cfg_bus_ecam,
51049+ .read = pci_generic_config_read,
51050+ .write = pci_generic_config_write,
51051+ },
51052 .bus_shift = 20,
51053- .map_bus = gen_pci_map_cfg_bus_ecam,
51054-};
51055-
51056-static struct pci_ops gen_pci_ops = {
51057- .read = pci_generic_config_read,
51058- .write = pci_generic_config_write,
51059 };
51060
51061 static const struct of_device_id gen_pci_of_match[] = {
51062@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
51063 .private_data = (void **)&pci,
51064 .setup = gen_pci_setup,
51065 .map_irq = of_irq_parse_and_map_pci,
51066- .ops = &gen_pci_ops,
51067 };
51068
51069 if (!pci)
51070@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
51071
51072 of_id = of_match_node(gen_pci_of_match, np);
51073 pci->cfg.ops = of_id->data;
51074- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
51075+ hw.ops = &pci->cfg.ops->ops;
51076 pci->host.dev.parent = dev;
51077 INIT_LIST_HEAD(&pci->host.windows);
51078 INIT_LIST_HEAD(&pci->resources);
51079diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
51080index 6ca2399..68d866b 100644
51081--- a/drivers/pci/hotplug/acpiphp_ibm.c
51082+++ b/drivers/pci/hotplug/acpiphp_ibm.c
51083@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
51084 goto init_cleanup;
51085 }
51086
51087- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
51088+ pax_open_kernel();
51089+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
51090+ pax_close_kernel();
51091 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
51092
51093 return retval;
51094diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
51095index 66b7bbe..26bee78 100644
51096--- a/drivers/pci/hotplug/cpcihp_generic.c
51097+++ b/drivers/pci/hotplug/cpcihp_generic.c
51098@@ -73,7 +73,6 @@ static u16 port;
51099 static unsigned int enum_bit;
51100 static u8 enum_mask;
51101
51102-static struct cpci_hp_controller_ops generic_hpc_ops;
51103 static struct cpci_hp_controller generic_hpc;
51104
51105 static int __init validate_parameters(void)
51106@@ -139,6 +138,10 @@ static int query_enum(void)
51107 return ((value & enum_mask) == enum_mask);
51108 }
51109
51110+static struct cpci_hp_controller_ops generic_hpc_ops = {
51111+ .query_enum = query_enum,
51112+};
51113+
51114 static int __init cpcihp_generic_init(void)
51115 {
51116 int status;
51117@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
51118 pci_dev_put(dev);
51119
51120 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
51121- generic_hpc_ops.query_enum = query_enum;
51122 generic_hpc.ops = &generic_hpc_ops;
51123
51124 status = cpci_hp_register_controller(&generic_hpc);
51125diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
51126index 7ecf34e..effed62 100644
51127--- a/drivers/pci/hotplug/cpcihp_zt5550.c
51128+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
51129@@ -59,7 +59,6 @@
51130 /* local variables */
51131 static bool debug;
51132 static bool poll;
51133-static struct cpci_hp_controller_ops zt5550_hpc_ops;
51134 static struct cpci_hp_controller zt5550_hpc;
51135
51136 /* Primary cPCI bus bridge device */
51137@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
51138 return 0;
51139 }
51140
51141+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
51142+ .query_enum = zt5550_hc_query_enum,
51143+};
51144+
51145 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
51146 {
51147 int status;
51148@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
51149 dbg("returned from zt5550_hc_config");
51150
51151 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
51152- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
51153 zt5550_hpc.ops = &zt5550_hpc_ops;
51154 if (!poll) {
51155 zt5550_hpc.irq = hc_dev->irq;
51156 zt5550_hpc.irq_flags = IRQF_SHARED;
51157 zt5550_hpc.dev_id = hc_dev;
51158
51159- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51160- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51161- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51162+ pax_open_kernel();
51163+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51164+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51165+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51166+ pax_open_kernel();
51167 } else {
51168 info("using ENUM# polling mode");
51169 }
51170diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
51171index 1e08ff8c..3cd145f 100644
51172--- a/drivers/pci/hotplug/cpqphp_nvram.c
51173+++ b/drivers/pci/hotplug/cpqphp_nvram.c
51174@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
51175
51176 void compaq_nvram_init (void __iomem *rom_start)
51177 {
51178+#ifndef CONFIG_PAX_KERNEXEC
51179 if (rom_start)
51180 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
51181+#endif
51182
51183 dbg("int15 entry = %p\n", compaq_int15_entry_point);
51184
51185diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
51186index 56d8486..f26113f 100644
51187--- a/drivers/pci/hotplug/pci_hotplug_core.c
51188+++ b/drivers/pci/hotplug/pci_hotplug_core.c
51189@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
51190 return -EINVAL;
51191 }
51192
51193- slot->ops->owner = owner;
51194- slot->ops->mod_name = mod_name;
51195+ pax_open_kernel();
51196+ *(struct module **)&slot->ops->owner = owner;
51197+ *(const char **)&slot->ops->mod_name = mod_name;
51198+ pax_close_kernel();
51199
51200 mutex_lock(&pci_hp_mutex);
51201 /*
51202diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
51203index 07aa722..84514b4 100644
51204--- a/drivers/pci/hotplug/pciehp_core.c
51205+++ b/drivers/pci/hotplug/pciehp_core.c
51206@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
51207 struct slot *slot = ctrl->slot;
51208 struct hotplug_slot *hotplug = NULL;
51209 struct hotplug_slot_info *info = NULL;
51210- struct hotplug_slot_ops *ops = NULL;
51211+ hotplug_slot_ops_no_const *ops = NULL;
51212 char name[SLOT_NAME_SIZE];
51213 int retval = -ENOMEM;
51214
51215diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51216index c3e7dfc..cbd9625 100644
51217--- a/drivers/pci/msi.c
51218+++ b/drivers/pci/msi.c
51219@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51220 {
51221 struct attribute **msi_attrs;
51222 struct attribute *msi_attr;
51223- struct device_attribute *msi_dev_attr;
51224- struct attribute_group *msi_irq_group;
51225+ device_attribute_no_const *msi_dev_attr;
51226+ attribute_group_no_const *msi_irq_group;
51227 const struct attribute_group **msi_irq_groups;
51228 struct msi_desc *entry;
51229 int ret = -ENOMEM;
51230@@ -573,7 +573,7 @@ error_attrs:
51231 count = 0;
51232 msi_attr = msi_attrs[count];
51233 while (msi_attr) {
51234- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51235+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51236 kfree(msi_attr->name);
51237 kfree(msi_dev_attr);
51238 ++count;
51239diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51240index 312f23a..d21181c 100644
51241--- a/drivers/pci/pci-sysfs.c
51242+++ b/drivers/pci/pci-sysfs.c
51243@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51244 {
51245 /* allocate attribute structure, piggyback attribute name */
51246 int name_len = write_combine ? 13 : 10;
51247- struct bin_attribute *res_attr;
51248+ bin_attribute_no_const *res_attr;
51249 int retval;
51250
51251 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51252@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51253 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51254 {
51255 int retval;
51256- struct bin_attribute *attr;
51257+ bin_attribute_no_const *attr;
51258
51259 /* If the device has VPD, try to expose it in sysfs. */
51260 if (dev->vpd) {
51261@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51262 {
51263 int retval;
51264 int rom_size = 0;
51265- struct bin_attribute *attr;
51266+ bin_attribute_no_const *attr;
51267
51268 if (!sysfs_initialized)
51269 return -EACCES;
51270diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51271index 9bd762c2..6fb9504 100644
51272--- a/drivers/pci/pci.h
51273+++ b/drivers/pci/pci.h
51274@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51275 struct pci_vpd {
51276 unsigned int len;
51277 const struct pci_vpd_ops *ops;
51278- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51279+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51280 };
51281
51282 int pci_vpd_pci22_init(struct pci_dev *dev);
51283diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51284index 7d4fcdc..2f6d8f8 100644
51285--- a/drivers/pci/pcie/aspm.c
51286+++ b/drivers/pci/pcie/aspm.c
51287@@ -27,9 +27,9 @@
51288 #define MODULE_PARAM_PREFIX "pcie_aspm."
51289
51290 /* Note: those are not register definitions */
51291-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51292-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51293-#define ASPM_STATE_L1 (4) /* L1 state */
51294+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51295+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51296+#define ASPM_STATE_L1 (4U) /* L1 state */
51297 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51298 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51299
51300diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51301index be35da2..ec16cdb 100644
51302--- a/drivers/pci/pcie/portdrv_pci.c
51303+++ b/drivers/pci/pcie/portdrv_pci.c
51304@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51305 return 0;
51306 }
51307
51308-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51309+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51310 /*
51311 * Boxes that should not use MSI for PCIe PME signaling.
51312 */
51313diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51314index c911857..56f3f9d 100644
51315--- a/drivers/pci/probe.c
51316+++ b/drivers/pci/probe.c
51317@@ -176,7 +176,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51318 u16 orig_cmd;
51319 struct pci_bus_region region, inverted_region;
51320
51321- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51322+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51323
51324 /* No printks while decoding is disabled! */
51325 if (!dev->mmio_always_on) {
51326diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51327index 3f155e7..0f4b1f0 100644
51328--- a/drivers/pci/proc.c
51329+++ b/drivers/pci/proc.c
51330@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51331 static int __init pci_proc_init(void)
51332 {
51333 struct pci_dev *dev = NULL;
51334+
51335+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51336+#ifdef CONFIG_GRKERNSEC_PROC_USER
51337+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51338+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51339+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51340+#endif
51341+#else
51342 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51343+#endif
51344 proc_create("devices", 0, proc_bus_pci_dir,
51345 &proc_bus_pci_dev_operations);
51346 proc_initialized = 1;
51347diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51348index 3474920..acc9581 100644
51349--- a/drivers/platform/chrome/chromeos_pstore.c
51350+++ b/drivers/platform/chrome/chromeos_pstore.c
51351@@ -13,7 +13,7 @@
51352 #include <linux/platform_device.h>
51353 #include <linux/pstore_ram.h>
51354
51355-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51356+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51357 {
51358 /*
51359 * Today all Chromebooks/boxes ship with Google_* as version and
51360diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51361index 1e1e594..8fe59c5 100644
51362--- a/drivers/platform/x86/alienware-wmi.c
51363+++ b/drivers/platform/x86/alienware-wmi.c
51364@@ -150,7 +150,7 @@ struct wmax_led_args {
51365 } __packed;
51366
51367 static struct platform_device *platform_device;
51368-static struct device_attribute *zone_dev_attrs;
51369+static device_attribute_no_const *zone_dev_attrs;
51370 static struct attribute **zone_attrs;
51371 static struct platform_zone *zone_data;
51372
51373@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51374 }
51375 };
51376
51377-static struct attribute_group zone_attribute_group = {
51378+static attribute_group_no_const zone_attribute_group = {
51379 .name = "rgb_zones",
51380 };
51381
51382diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51383index 7543a56..367ca8ed 100644
51384--- a/drivers/platform/x86/asus-wmi.c
51385+++ b/drivers/platform/x86/asus-wmi.c
51386@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51387 int err;
51388 u32 retval = -1;
51389
51390+#ifdef CONFIG_GRKERNSEC_KMEM
51391+ return -EPERM;
51392+#endif
51393+
51394 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51395
51396 if (err < 0)
51397@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51398 int err;
51399 u32 retval = -1;
51400
51401+#ifdef CONFIG_GRKERNSEC_KMEM
51402+ return -EPERM;
51403+#endif
51404+
51405 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51406 &retval);
51407
51408@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51409 union acpi_object *obj;
51410 acpi_status status;
51411
51412+#ifdef CONFIG_GRKERNSEC_KMEM
51413+ return -EPERM;
51414+#endif
51415+
51416 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51417 1, asus->debug.method_id,
51418 &input, &output);
51419diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51420index b4e9447..9dc6ec34 100644
51421--- a/drivers/platform/x86/compal-laptop.c
51422+++ b/drivers/platform/x86/compal-laptop.c
51423@@ -765,7 +765,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51424 return 1;
51425 }
51426
51427-static struct dmi_system_id __initdata compal_dmi_table[] = {
51428+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51429 {
51430 .ident = "FL90/IFL90",
51431 .matches = {
51432diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51433index 458e6c9..089aee7 100644
51434--- a/drivers/platform/x86/hdaps.c
51435+++ b/drivers/platform/x86/hdaps.c
51436@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51437 "ThinkPad T42p", so the order of the entries matters.
51438 If your ThinkPad is not recognized, please update to latest
51439 BIOS. This is especially the case for some R52 ThinkPads. */
51440-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51441+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51442 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51443 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51444 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51445diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51446index 97c2be1..2ee50ce 100644
51447--- a/drivers/platform/x86/ibm_rtl.c
51448+++ b/drivers/platform/x86/ibm_rtl.c
51449@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51450 }
51451
51452
51453-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51454+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51455 { \
51456 .matches = { \
51457 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51458diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51459index 8037c8b..f88445c 100644
51460--- a/drivers/platform/x86/intel_oaktrail.c
51461+++ b/drivers/platform/x86/intel_oaktrail.c
51462@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51463 return 0;
51464 }
51465
51466-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51467+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51468 {
51469 .ident = "OakTrail platform",
51470 .matches = {
51471diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51472index 0859877..59d596d 100644
51473--- a/drivers/platform/x86/msi-laptop.c
51474+++ b/drivers/platform/x86/msi-laptop.c
51475@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51476 return 1;
51477 }
51478
51479-static struct dmi_system_id __initdata msi_dmi_table[] = {
51480+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51481 {
51482 .ident = "MSI S270",
51483 .matches = {
51484@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51485
51486 if (!quirks->ec_read_only) {
51487 /* allow userland write sysfs file */
51488- dev_attr_bluetooth.store = store_bluetooth;
51489- dev_attr_wlan.store = store_wlan;
51490- dev_attr_threeg.store = store_threeg;
51491- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51492- dev_attr_wlan.attr.mode |= S_IWUSR;
51493- dev_attr_threeg.attr.mode |= S_IWUSR;
51494+ pax_open_kernel();
51495+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51496+ *(void **)&dev_attr_wlan.store = store_wlan;
51497+ *(void **)&dev_attr_threeg.store = store_threeg;
51498+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51499+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51500+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51501+ pax_close_kernel();
51502 }
51503
51504 /* disable hardware control by fn key */
51505diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51506index 6d2bac0..ec2b029 100644
51507--- a/drivers/platform/x86/msi-wmi.c
51508+++ b/drivers/platform/x86/msi-wmi.c
51509@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51510 static void msi_wmi_notify(u32 value, void *context)
51511 {
51512 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51513- static struct key_entry *key;
51514+ struct key_entry *key;
51515 union acpi_object *obj;
51516 acpi_status status;
51517
51518diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51519index 9e701b2..c68a7b5 100644
51520--- a/drivers/platform/x86/samsung-laptop.c
51521+++ b/drivers/platform/x86/samsung-laptop.c
51522@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51523 return 0;
51524 }
51525
51526-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51527+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51528 {
51529 .matches = {
51530 DMI_MATCH(DMI_SYS_VENDOR,
51531diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51532index e6aac72..e11ff24 100644
51533--- a/drivers/platform/x86/samsung-q10.c
51534+++ b/drivers/platform/x86/samsung-q10.c
51535@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51536 return 1;
51537 }
51538
51539-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51540+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51541 {
51542 .ident = "Samsung Q10",
51543 .matches = {
51544diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51545index e51c1e7..71bb385 100644
51546--- a/drivers/platform/x86/sony-laptop.c
51547+++ b/drivers/platform/x86/sony-laptop.c
51548@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51549 }
51550
51551 /* High speed charging function */
51552-static struct device_attribute *hsc_handle;
51553+static device_attribute_no_const *hsc_handle;
51554
51555 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51556 struct device_attribute *attr,
51557@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51558 }
51559
51560 /* low battery function */
51561-static struct device_attribute *lowbatt_handle;
51562+static device_attribute_no_const *lowbatt_handle;
51563
51564 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51565 struct device_attribute *attr,
51566@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51567 }
51568
51569 /* fan speed function */
51570-static struct device_attribute *fan_handle, *hsf_handle;
51571+static device_attribute_no_const *fan_handle, *hsf_handle;
51572
51573 static ssize_t sony_nc_hsfan_store(struct device *dev,
51574 struct device_attribute *attr,
51575@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51576 }
51577
51578 /* USB charge function */
51579-static struct device_attribute *uc_handle;
51580+static device_attribute_no_const *uc_handle;
51581
51582 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51583 struct device_attribute *attr,
51584@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51585 }
51586
51587 /* Panel ID function */
51588-static struct device_attribute *panel_handle;
51589+static device_attribute_no_const *panel_handle;
51590
51591 static ssize_t sony_nc_panelid_show(struct device *dev,
51592 struct device_attribute *attr, char *buffer)
51593@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51594 }
51595
51596 /* smart connect function */
51597-static struct device_attribute *sc_handle;
51598+static device_attribute_no_const *sc_handle;
51599
51600 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51601 struct device_attribute *attr,
51602@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51603 .drv.pm = &sony_pic_pm,
51604 };
51605
51606-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51607+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51608 {
51609 .ident = "Sony Vaio",
51610 .matches = {
51611diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51612index 28f3281..171d8c3 100644
51613--- a/drivers/platform/x86/thinkpad_acpi.c
51614+++ b/drivers/platform/x86/thinkpad_acpi.c
51615@@ -2459,10 +2459,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51616 && !tp_features.bright_unkfw)
51617 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51618 }
51619+}
51620
51621 #undef TPACPI_COMPARE_KEY
51622 #undef TPACPI_MAY_SEND_KEY
51623-}
51624
51625 /*
51626 * Polling driver
51627diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51628index 438d4c7..ca8a2fb 100644
51629--- a/drivers/pnp/pnpbios/bioscalls.c
51630+++ b/drivers/pnp/pnpbios/bioscalls.c
51631@@ -59,7 +59,7 @@ do { \
51632 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51633 } while(0)
51634
51635-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51636+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51637 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51638
51639 /*
51640@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51641
51642 cpu = get_cpu();
51643 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51644+
51645+ pax_open_kernel();
51646 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51647+ pax_close_kernel();
51648
51649 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51650 spin_lock_irqsave(&pnp_bios_lock, flags);
51651@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51652 :"memory");
51653 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51654
51655+ pax_open_kernel();
51656 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51657+ pax_close_kernel();
51658+
51659 put_cpu();
51660
51661 /* If we get here and this is set then the PnP BIOS faulted on us. */
51662@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51663 return status;
51664 }
51665
51666-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51667+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51668 {
51669 int i;
51670
51671@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51672 pnp_bios_callpoint.offset = header->fields.pm16offset;
51673 pnp_bios_callpoint.segment = PNP_CS16;
51674
51675+ pax_open_kernel();
51676+
51677 for_each_possible_cpu(i) {
51678 struct desc_struct *gdt = get_cpu_gdt_table(i);
51679 if (!gdt)
51680@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51681 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51682 (unsigned long)__va(header->fields.pm16dseg));
51683 }
51684+
51685+ pax_close_kernel();
51686 }
51687diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51688index facd43b..b291260 100644
51689--- a/drivers/pnp/pnpbios/core.c
51690+++ b/drivers/pnp/pnpbios/core.c
51691@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51692 return 0;
51693 }
51694
51695-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51696+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51697 { /* PnPBIOS GPF on boot */
51698 .callback = exploding_pnp_bios,
51699 .ident = "Higraded P14H",
51700diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51701index dfe1ee8..67e820c 100644
51702--- a/drivers/power/pda_power.c
51703+++ b/drivers/power/pda_power.c
51704@@ -38,7 +38,11 @@ static struct power_supply *pda_psy_ac, *pda_psy_usb;
51705
51706 #if IS_ENABLED(CONFIG_USB_PHY)
51707 static struct usb_phy *transceiver;
51708-static struct notifier_block otg_nb;
51709+static int otg_handle_notification(struct notifier_block *nb,
51710+ unsigned long event, void *unused);
51711+static struct notifier_block otg_nb = {
51712+ .notifier_call = otg_handle_notification
51713+};
51714 #endif
51715
51716 static struct regulator *ac_draw;
51717@@ -373,7 +377,6 @@ static int pda_power_probe(struct platform_device *pdev)
51718
51719 #if IS_ENABLED(CONFIG_USB_PHY)
51720 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51721- otg_nb.notifier_call = otg_handle_notification;
51722 ret = usb_register_notifier(transceiver, &otg_nb);
51723 if (ret) {
51724 dev_err(dev, "failure to register otg notifier\n");
51725diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51726index cc439fd..8fa30df 100644
51727--- a/drivers/power/power_supply.h
51728+++ b/drivers/power/power_supply.h
51729@@ -16,12 +16,12 @@ struct power_supply;
51730
51731 #ifdef CONFIG_SYSFS
51732
51733-extern void power_supply_init_attrs(struct device_type *dev_type);
51734+extern void power_supply_init_attrs(void);
51735 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51736
51737 #else
51738
51739-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51740+static inline void power_supply_init_attrs(void) {}
51741 #define power_supply_uevent NULL
51742
51743 #endif /* CONFIG_SYSFS */
51744diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51745index 4bc0c7f..198c99d 100644
51746--- a/drivers/power/power_supply_core.c
51747+++ b/drivers/power/power_supply_core.c
51748@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51749 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51750 EXPORT_SYMBOL_GPL(power_supply_notifier);
51751
51752-static struct device_type power_supply_dev_type;
51753+extern const struct attribute_group *power_supply_attr_groups[];
51754+static struct device_type power_supply_dev_type = {
51755+ .groups = power_supply_attr_groups,
51756+};
51757
51758 #define POWER_SUPPLY_DEFERRED_REGISTER_TIME msecs_to_jiffies(10)
51759
51760@@ -921,7 +924,7 @@ static int __init power_supply_class_init(void)
51761 return PTR_ERR(power_supply_class);
51762
51763 power_supply_class->dev_uevent = power_supply_uevent;
51764- power_supply_init_attrs(&power_supply_dev_type);
51765+ power_supply_init_attrs();
51766
51767 return 0;
51768 }
51769diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51770index 9134e3d..45eee1e 100644
51771--- a/drivers/power/power_supply_sysfs.c
51772+++ b/drivers/power/power_supply_sysfs.c
51773@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51774 .is_visible = power_supply_attr_is_visible,
51775 };
51776
51777-static const struct attribute_group *power_supply_attr_groups[] = {
51778+const struct attribute_group *power_supply_attr_groups[] = {
51779 &power_supply_attr_group,
51780 NULL,
51781 };
51782
51783-void power_supply_init_attrs(struct device_type *dev_type)
51784+void power_supply_init_attrs(void)
51785 {
51786 int i;
51787
51788- dev_type->groups = power_supply_attr_groups;
51789-
51790 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51791 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51792 }
51793diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51794index 84419af..268ede8 100644
51795--- a/drivers/powercap/powercap_sys.c
51796+++ b/drivers/powercap/powercap_sys.c
51797@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51798 struct device_attribute name_attr;
51799 };
51800
51801+static ssize_t show_constraint_name(struct device *dev,
51802+ struct device_attribute *dev_attr,
51803+ char *buf);
51804+
51805 static struct powercap_constraint_attr
51806- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51807+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51808+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51809+ .power_limit_attr = {
51810+ .attr = {
51811+ .name = NULL,
51812+ .mode = S_IWUSR | S_IRUGO
51813+ },
51814+ .show = show_constraint_power_limit_uw,
51815+ .store = store_constraint_power_limit_uw
51816+ },
51817+
51818+ .time_window_attr = {
51819+ .attr = {
51820+ .name = NULL,
51821+ .mode = S_IWUSR | S_IRUGO
51822+ },
51823+ .show = show_constraint_time_window_us,
51824+ .store = store_constraint_time_window_us
51825+ },
51826+
51827+ .max_power_attr = {
51828+ .attr = {
51829+ .name = NULL,
51830+ .mode = S_IRUGO
51831+ },
51832+ .show = show_constraint_max_power_uw,
51833+ .store = NULL
51834+ },
51835+
51836+ .min_power_attr = {
51837+ .attr = {
51838+ .name = NULL,
51839+ .mode = S_IRUGO
51840+ },
51841+ .show = show_constraint_min_power_uw,
51842+ .store = NULL
51843+ },
51844+
51845+ .max_time_window_attr = {
51846+ .attr = {
51847+ .name = NULL,
51848+ .mode = S_IRUGO
51849+ },
51850+ .show = show_constraint_max_time_window_us,
51851+ .store = NULL
51852+ },
51853+
51854+ .min_time_window_attr = {
51855+ .attr = {
51856+ .name = NULL,
51857+ .mode = S_IRUGO
51858+ },
51859+ .show = show_constraint_min_time_window_us,
51860+ .store = NULL
51861+ },
51862+
51863+ .name_attr = {
51864+ .attr = {
51865+ .name = NULL,
51866+ .mode = S_IRUGO
51867+ },
51868+ .show = show_constraint_name,
51869+ .store = NULL
51870+ }
51871+ }
51872+};
51873
51874 /* A list of powercap control_types */
51875 static LIST_HEAD(powercap_cntrl_list);
51876@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51877 }
51878
51879 static int create_constraint_attribute(int id, const char *name,
51880- int mode,
51881- struct device_attribute *dev_attr,
51882- ssize_t (*show)(struct device *,
51883- struct device_attribute *, char *),
51884- ssize_t (*store)(struct device *,
51885- struct device_attribute *,
51886- const char *, size_t)
51887- )
51888+ struct device_attribute *dev_attr)
51889 {
51890+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51891
51892- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51893- id, name);
51894- if (!dev_attr->attr.name)
51895+ if (!name)
51896 return -ENOMEM;
51897- dev_attr->attr.mode = mode;
51898- dev_attr->show = show;
51899- dev_attr->store = store;
51900+
51901+ pax_open_kernel();
51902+ *(const char **)&dev_attr->attr.name = name;
51903+ pax_close_kernel();
51904
51905 return 0;
51906 }
51907@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51908
51909 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51910 ret = create_constraint_attribute(i, "power_limit_uw",
51911- S_IWUSR | S_IRUGO,
51912- &constraint_attrs[i].power_limit_attr,
51913- show_constraint_power_limit_uw,
51914- store_constraint_power_limit_uw);
51915+ &constraint_attrs[i].power_limit_attr);
51916 if (ret)
51917 goto err_alloc;
51918 ret = create_constraint_attribute(i, "time_window_us",
51919- S_IWUSR | S_IRUGO,
51920- &constraint_attrs[i].time_window_attr,
51921- show_constraint_time_window_us,
51922- store_constraint_time_window_us);
51923+ &constraint_attrs[i].time_window_attr);
51924 if (ret)
51925 goto err_alloc;
51926- ret = create_constraint_attribute(i, "name", S_IRUGO,
51927- &constraint_attrs[i].name_attr,
51928- show_constraint_name,
51929- NULL);
51930+ ret = create_constraint_attribute(i, "name",
51931+ &constraint_attrs[i].name_attr);
51932 if (ret)
51933 goto err_alloc;
51934- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51935- &constraint_attrs[i].max_power_attr,
51936- show_constraint_max_power_uw,
51937- NULL);
51938+ ret = create_constraint_attribute(i, "max_power_uw",
51939+ &constraint_attrs[i].max_power_attr);
51940 if (ret)
51941 goto err_alloc;
51942- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51943- &constraint_attrs[i].min_power_attr,
51944- show_constraint_min_power_uw,
51945- NULL);
51946+ ret = create_constraint_attribute(i, "min_power_uw",
51947+ &constraint_attrs[i].min_power_attr);
51948 if (ret)
51949 goto err_alloc;
51950 ret = create_constraint_attribute(i, "max_time_window_us",
51951- S_IRUGO,
51952- &constraint_attrs[i].max_time_window_attr,
51953- show_constraint_max_time_window_us,
51954- NULL);
51955+ &constraint_attrs[i].max_time_window_attr);
51956 if (ret)
51957 goto err_alloc;
51958 ret = create_constraint_attribute(i, "min_time_window_us",
51959- S_IRUGO,
51960- &constraint_attrs[i].min_time_window_attr,
51961- show_constraint_min_time_window_us,
51962- NULL);
51963+ &constraint_attrs[i].min_time_window_attr);
51964 if (ret)
51965 goto err_alloc;
51966
51967@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51968 power_zone->zone_dev_attrs[count++] =
51969 &dev_attr_max_energy_range_uj.attr;
51970 if (power_zone->ops->get_energy_uj) {
51971+ pax_open_kernel();
51972 if (power_zone->ops->reset_energy_uj)
51973- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51974+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51975 else
51976- dev_attr_energy_uj.attr.mode = S_IRUGO;
51977+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51978+ pax_close_kernel();
51979 power_zone->zone_dev_attrs[count++] =
51980 &dev_attr_energy_uj.attr;
51981 }
51982diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51983index 9c5d414..c7900ce 100644
51984--- a/drivers/ptp/ptp_private.h
51985+++ b/drivers/ptp/ptp_private.h
51986@@ -51,7 +51,7 @@ struct ptp_clock {
51987 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51988 wait_queue_head_t tsev_wq;
51989 int defunct; /* tells readers to go away when clock is being removed */
51990- struct device_attribute *pin_dev_attr;
51991+ device_attribute_no_const *pin_dev_attr;
51992 struct attribute **pin_attr;
51993 struct attribute_group pin_attr_group;
51994 };
51995diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51996index 302e626..12579af 100644
51997--- a/drivers/ptp/ptp_sysfs.c
51998+++ b/drivers/ptp/ptp_sysfs.c
51999@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
52000 goto no_pin_attr;
52001
52002 for (i = 0; i < n_pins; i++) {
52003- struct device_attribute *da = &ptp->pin_dev_attr[i];
52004+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
52005 sysfs_attr_init(&da->attr);
52006 da->attr.name = info->pin_config[i].name;
52007 da->attr.mode = 0644;
52008diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
52009index 8a28116..05b0ad5 100644
52010--- a/drivers/regulator/core.c
52011+++ b/drivers/regulator/core.c
52012@@ -3603,7 +3603,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
52013 const struct regulation_constraints *constraints = NULL;
52014 const struct regulator_init_data *init_data;
52015 struct regulator_config *config = NULL;
52016- static atomic_t regulator_no = ATOMIC_INIT(-1);
52017+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
52018 struct regulator_dev *rdev;
52019 struct device *dev;
52020 int ret, i;
52021@@ -3686,7 +3686,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
52022 rdev->dev.class = &regulator_class;
52023 rdev->dev.parent = dev;
52024 dev_set_name(&rdev->dev, "regulator.%lu",
52025- (unsigned long) atomic_inc_return(&regulator_no));
52026+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
52027 ret = device_register(&rdev->dev);
52028 if (ret != 0) {
52029 put_device(&rdev->dev);
52030diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
52031index 4071d74..260b15a 100644
52032--- a/drivers/regulator/max8660.c
52033+++ b/drivers/regulator/max8660.c
52034@@ -423,8 +423,10 @@ static int max8660_probe(struct i2c_client *client,
52035 max8660->shadow_regs[MAX8660_OVER1] = 5;
52036 } else {
52037 /* Otherwise devices can be toggled via software */
52038- max8660_dcdc_ops.enable = max8660_dcdc_enable;
52039- max8660_dcdc_ops.disable = max8660_dcdc_disable;
52040+ pax_open_kernel();
52041+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
52042+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
52043+ pax_close_kernel();
52044 }
52045
52046 /*
52047diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
52048index c3d55c2..0dddfe6 100644
52049--- a/drivers/regulator/max8973-regulator.c
52050+++ b/drivers/regulator/max8973-regulator.c
52051@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
52052 if (!pdata || !pdata->enable_ext_control) {
52053 max->desc.enable_reg = MAX8973_VOUT;
52054 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
52055- max->ops.enable = regulator_enable_regmap;
52056- max->ops.disable = regulator_disable_regmap;
52057- max->ops.is_enabled = regulator_is_enabled_regmap;
52058+ pax_open_kernel();
52059+ *(void **)&max->ops.enable = regulator_enable_regmap;
52060+ *(void **)&max->ops.disable = regulator_disable_regmap;
52061+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
52062+ pax_close_kernel();
52063 }
52064
52065 if (pdata) {
52066diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
52067index 0d17c92..a29f627 100644
52068--- a/drivers/regulator/mc13892-regulator.c
52069+++ b/drivers/regulator/mc13892-regulator.c
52070@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
52071 mc13xxx_unlock(mc13892);
52072
52073 /* update mc13892_vcam ops */
52074- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
52075+ pax_open_kernel();
52076+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
52077 sizeof(struct regulator_ops));
52078- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
52079- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
52080+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
52081+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
52082+ pax_close_kernel();
52083 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
52084
52085 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
52086diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
52087index a82556a0..e842923 100644
52088--- a/drivers/rtc/rtc-cmos.c
52089+++ b/drivers/rtc/rtc-cmos.c
52090@@ -793,7 +793,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
52091 hpet_rtc_timer_init();
52092
52093 /* export at least the first block of NVRAM */
52094- nvram.size = address_space - NVRAM_OFFSET;
52095+ pax_open_kernel();
52096+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
52097+ pax_close_kernel();
52098 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
52099 if (retval < 0) {
52100 dev_dbg(dev, "can't create nvram file? %d\n", retval);
52101diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
52102index 799c34b..8e9786a 100644
52103--- a/drivers/rtc/rtc-dev.c
52104+++ b/drivers/rtc/rtc-dev.c
52105@@ -16,6 +16,7 @@
52106 #include <linux/module.h>
52107 #include <linux/rtc.h>
52108 #include <linux/sched.h>
52109+#include <linux/grsecurity.h>
52110 #include "rtc-core.h"
52111
52112 static dev_t rtc_devt;
52113@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
52114 if (copy_from_user(&tm, uarg, sizeof(tm)))
52115 return -EFAULT;
52116
52117+ gr_log_timechange();
52118+
52119 return rtc_set_time(rtc, &tm);
52120
52121 case RTC_PIE_ON:
52122diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
52123index 4ffabb3..1f87fca 100644
52124--- a/drivers/rtc/rtc-ds1307.c
52125+++ b/drivers/rtc/rtc-ds1307.c
52126@@ -107,7 +107,7 @@ struct ds1307 {
52127 u8 offset; /* register's offset */
52128 u8 regs[11];
52129 u16 nvram_offset;
52130- struct bin_attribute *nvram;
52131+ bin_attribute_no_const *nvram;
52132 enum ds_type type;
52133 unsigned long flags;
52134 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
52135diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
52136index 90abb5b..e0bf6dd 100644
52137--- a/drivers/rtc/rtc-m48t59.c
52138+++ b/drivers/rtc/rtc-m48t59.c
52139@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
52140 if (IS_ERR(m48t59->rtc))
52141 return PTR_ERR(m48t59->rtc);
52142
52143- m48t59_nvram_attr.size = pdata->offset;
52144+ pax_open_kernel();
52145+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
52146+ pax_close_kernel();
52147
52148 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
52149 if (ret)
52150diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
52151index 3a2da4c..e88493c 100644
52152--- a/drivers/rtc/rtc-test.c
52153+++ b/drivers/rtc/rtc-test.c
52154@@ -112,8 +112,10 @@ static int test_probe(struct platform_device *plat_dev)
52155 struct rtc_device *rtc;
52156
52157 if (test_mmss64) {
52158- test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
52159- test_rtc_ops.set_mmss = NULL;
52160+ pax_open_kernel();
52161+ *(void **)&test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
52162+ *(void **)&test_rtc_ops.set_mmss = NULL;
52163+ pax_close_kernel();
52164 }
52165
52166 rtc = devm_rtc_device_register(&plat_dev->dev, "test",
52167diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
52168index 1f74760..8e00a89 100644
52169--- a/drivers/scsi/be2iscsi/be_main.c
52170+++ b/drivers/scsi/be2iscsi/be_main.c
52171@@ -3165,7 +3165,7 @@ be_sgl_create_contiguous(void *virtual_address,
52172 {
52173 WARN_ON(!virtual_address);
52174 WARN_ON(!physical_address);
52175- WARN_ON(!length > 0);
52176+ WARN_ON(!length);
52177 WARN_ON(!sgl);
52178
52179 sgl->va = virtual_address;
52180diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
52181index e693af6..2e525b6 100644
52182--- a/drivers/scsi/bfa/bfa_fcpim.h
52183+++ b/drivers/scsi/bfa/bfa_fcpim.h
52184@@ -36,7 +36,7 @@ struct bfa_iotag_s {
52185
52186 struct bfa_itn_s {
52187 bfa_isr_func_t isr;
52188-};
52189+} __no_const;
52190
52191 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
52192 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
52193diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
52194index 0f19455..ef7adb5 100644
52195--- a/drivers/scsi/bfa/bfa_fcs.c
52196+++ b/drivers/scsi/bfa/bfa_fcs.c
52197@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
52198 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
52199
52200 static struct bfa_fcs_mod_s fcs_modules[] = {
52201- { bfa_fcs_port_attach, NULL, NULL },
52202- { bfa_fcs_uf_attach, NULL, NULL },
52203- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
52204- bfa_fcs_fabric_modexit },
52205+ {
52206+ .attach = bfa_fcs_port_attach,
52207+ .modinit = NULL,
52208+ .modexit = NULL
52209+ },
52210+ {
52211+ .attach = bfa_fcs_uf_attach,
52212+ .modinit = NULL,
52213+ .modexit = NULL
52214+ },
52215+ {
52216+ .attach = bfa_fcs_fabric_attach,
52217+ .modinit = bfa_fcs_fabric_modinit,
52218+ .modexit = bfa_fcs_fabric_modexit
52219+ },
52220 };
52221
52222 /*
52223diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52224index ff75ef8..2dfe00a 100644
52225--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52226+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52227@@ -89,15 +89,26 @@ static struct {
52228 void (*offline) (struct bfa_fcs_lport_s *port);
52229 } __port_action[] = {
52230 {
52231- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52232- bfa_fcs_lport_unknown_offline}, {
52233- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52234- bfa_fcs_lport_fab_offline}, {
52235- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52236- bfa_fcs_lport_n2n_offline}, {
52237- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52238- bfa_fcs_lport_loop_offline},
52239- };
52240+ .init = bfa_fcs_lport_unknown_init,
52241+ .online = bfa_fcs_lport_unknown_online,
52242+ .offline = bfa_fcs_lport_unknown_offline
52243+ },
52244+ {
52245+ .init = bfa_fcs_lport_fab_init,
52246+ .online = bfa_fcs_lport_fab_online,
52247+ .offline = bfa_fcs_lport_fab_offline
52248+ },
52249+ {
52250+ .init = bfa_fcs_lport_n2n_init,
52251+ .online = bfa_fcs_lport_n2n_online,
52252+ .offline = bfa_fcs_lport_n2n_offline
52253+ },
52254+ {
52255+ .init = bfa_fcs_lport_loop_init,
52256+ .online = bfa_fcs_lport_loop_online,
52257+ .offline = bfa_fcs_lport_loop_offline
52258+ },
52259+};
52260
52261 /*
52262 * fcs_port_sm FCS logical port state machine
52263diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52264index a38aafa0..fe8f03b 100644
52265--- a/drivers/scsi/bfa/bfa_ioc.h
52266+++ b/drivers/scsi/bfa/bfa_ioc.h
52267@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52268 bfa_ioc_disable_cbfn_t disable_cbfn;
52269 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52270 bfa_ioc_reset_cbfn_t reset_cbfn;
52271-};
52272+} __no_const;
52273
52274 /*
52275 * IOC event notification mechanism.
52276@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52277 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52278 enum bfi_ioc_state fwstate);
52279 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52280-};
52281+} __no_const;
52282
52283 /*
52284 * Queue element to wait for room in request queue. FIFO order is
52285diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52286index a14c784..6de6790 100644
52287--- a/drivers/scsi/bfa/bfa_modules.h
52288+++ b/drivers/scsi/bfa/bfa_modules.h
52289@@ -78,12 +78,12 @@ enum {
52290 \
52291 extern struct bfa_module_s hal_mod_ ## __mod; \
52292 struct bfa_module_s hal_mod_ ## __mod = { \
52293- bfa_ ## __mod ## _meminfo, \
52294- bfa_ ## __mod ## _attach, \
52295- bfa_ ## __mod ## _detach, \
52296- bfa_ ## __mod ## _start, \
52297- bfa_ ## __mod ## _stop, \
52298- bfa_ ## __mod ## _iocdisable, \
52299+ .meminfo = bfa_ ## __mod ## _meminfo, \
52300+ .attach = bfa_ ## __mod ## _attach, \
52301+ .detach = bfa_ ## __mod ## _detach, \
52302+ .start = bfa_ ## __mod ## _start, \
52303+ .stop = bfa_ ## __mod ## _stop, \
52304+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52305 }
52306
52307 #define BFA_CACHELINE_SZ (256)
52308diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52309index 045c4e1..13de803 100644
52310--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52311+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52312@@ -33,8 +33,8 @@
52313 */
52314 #include "libfcoe.h"
52315
52316-static atomic_t ctlr_num;
52317-static atomic_t fcf_num;
52318+static atomic_unchecked_t ctlr_num;
52319+static atomic_unchecked_t fcf_num;
52320
52321 /*
52322 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52323@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52324 if (!ctlr)
52325 goto out;
52326
52327- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52328+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52329 ctlr->f = f;
52330 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52331 INIT_LIST_HEAD(&ctlr->fcfs);
52332@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52333 fcf->dev.parent = &ctlr->dev;
52334 fcf->dev.bus = &fcoe_bus_type;
52335 fcf->dev.type = &fcoe_fcf_device_type;
52336- fcf->id = atomic_inc_return(&fcf_num) - 1;
52337+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52338 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52339
52340 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52341@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52342 {
52343 int error;
52344
52345- atomic_set(&ctlr_num, 0);
52346- atomic_set(&fcf_num, 0);
52347+ atomic_set_unchecked(&ctlr_num, 0);
52348+ atomic_set_unchecked(&fcf_num, 0);
52349
52350 error = bus_register(&fcoe_bus_type);
52351 if (error)
52352diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52353index 8bb173e..20236b4 100644
52354--- a/drivers/scsi/hosts.c
52355+++ b/drivers/scsi/hosts.c
52356@@ -42,7 +42,7 @@
52357 #include "scsi_logging.h"
52358
52359
52360-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52361+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52362
52363
52364 static void scsi_host_cls_release(struct device *dev)
52365@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52366 * subtract one because we increment first then return, but we need to
52367 * know what the next host number was before increment
52368 */
52369- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52370+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52371 shost->dma_channel = 0xff;
52372
52373 /* These three are default values which can be overridden */
52374diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52375index 8eab107..599cd79 100644
52376--- a/drivers/scsi/hpsa.c
52377+++ b/drivers/scsi/hpsa.c
52378@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52379 struct reply_queue_buffer *rq = &h->reply_queue[q];
52380
52381 if (h->transMethod & CFGTBL_Trans_io_accel1)
52382- return h->access.command_completed(h, q);
52383+ return h->access->command_completed(h, q);
52384
52385 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52386- return h->access.command_completed(h, q);
52387+ return h->access->command_completed(h, q);
52388
52389 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52390 a = rq->head[rq->current_entry];
52391@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52392 break;
52393 default:
52394 set_performant_mode(h, c);
52395- h->access.submit_command(h, c);
52396+ h->access->submit_command(h, c);
52397 }
52398 }
52399
52400@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52401
52402 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52403 {
52404- return h->access.command_completed(h, q);
52405+ return h->access->command_completed(h, q);
52406 }
52407
52408 static inline bool interrupt_pending(struct ctlr_info *h)
52409 {
52410- return h->access.intr_pending(h);
52411+ return h->access->intr_pending(h);
52412 }
52413
52414 static inline long interrupt_not_for_us(struct ctlr_info *h)
52415 {
52416- return (h->access.intr_pending(h) == 0) ||
52417+ return (h->access->intr_pending(h) == 0) ||
52418 (h->interrupts_enabled == 0);
52419 }
52420
52421@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52422 if (prod_index < 0)
52423 return prod_index;
52424 h->product_name = products[prod_index].product_name;
52425- h->access = *(products[prod_index].access);
52426+ h->access = products[prod_index].access;
52427
52428 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52429 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52430@@ -6647,7 +6647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52431 unsigned long flags;
52432 u32 lockup_detected;
52433
52434- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52435+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52436 spin_lock_irqsave(&h->lock, flags);
52437 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52438 if (!lockup_detected) {
52439@@ -6922,7 +6922,7 @@ reinit_after_soft_reset:
52440 }
52441
52442 /* make sure the board interrupts are off */
52443- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52444+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52445
52446 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52447 goto clean2;
52448@@ -6958,7 +6958,7 @@ reinit_after_soft_reset:
52449 * fake ones to scoop up any residual completions.
52450 */
52451 spin_lock_irqsave(&h->lock, flags);
52452- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52453+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52454 spin_unlock_irqrestore(&h->lock, flags);
52455 hpsa_free_irqs(h);
52456 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52457@@ -6977,9 +6977,9 @@ reinit_after_soft_reset:
52458 dev_info(&h->pdev->dev, "Board READY.\n");
52459 dev_info(&h->pdev->dev,
52460 "Waiting for stale completions to drain.\n");
52461- h->access.set_intr_mask(h, HPSA_INTR_ON);
52462+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52463 msleep(10000);
52464- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52465+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52466
52467 rc = controller_reset_failed(h->cfgtable);
52468 if (rc)
52469@@ -7004,7 +7004,7 @@ reinit_after_soft_reset:
52470
52471
52472 /* Turn the interrupts on so we can service requests */
52473- h->access.set_intr_mask(h, HPSA_INTR_ON);
52474+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52475
52476 hpsa_hba_inquiry(h);
52477 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52478@@ -7077,7 +7077,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52479 * To write all data in the battery backed cache to disks
52480 */
52481 hpsa_flush_cache(h);
52482- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52483+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52484 hpsa_free_irqs_and_disable_msix(h);
52485 }
52486
52487@@ -7198,7 +7198,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52488 CFGTBL_Trans_enable_directed_msix |
52489 (trans_support & (CFGTBL_Trans_io_accel1 |
52490 CFGTBL_Trans_io_accel2));
52491- struct access_method access = SA5_performant_access;
52492+ struct access_method *access = &SA5_performant_access;
52493
52494 /* This is a bit complicated. There are 8 registers on
52495 * the controller which we write to to tell it 8 different
52496@@ -7240,7 +7240,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52497 * perform the superfluous readl() after each command submission.
52498 */
52499 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52500- access = SA5_performant_access_no_read;
52501+ access = &SA5_performant_access_no_read;
52502
52503 /* Controller spec: zero out this buffer. */
52504 for (i = 0; i < h->nreply_queues; i++)
52505@@ -7270,12 +7270,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52506 * enable outbound interrupt coalescing in accelerator mode;
52507 */
52508 if (trans_support & CFGTBL_Trans_io_accel1) {
52509- access = SA5_ioaccel_mode1_access;
52510+ access = &SA5_ioaccel_mode1_access;
52511 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52512 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52513 } else {
52514 if (trans_support & CFGTBL_Trans_io_accel2) {
52515- access = SA5_ioaccel_mode2_access;
52516+ access = &SA5_ioaccel_mode2_access;
52517 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52518 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52519 }
52520diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52521index 6577130..955f9a4 100644
52522--- a/drivers/scsi/hpsa.h
52523+++ b/drivers/scsi/hpsa.h
52524@@ -143,7 +143,7 @@ struct ctlr_info {
52525 unsigned int msix_vector;
52526 unsigned int msi_vector;
52527 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52528- struct access_method access;
52529+ struct access_method *access;
52530 char hba_mode_enabled;
52531
52532 /* queue and queue Info */
52533@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52534 }
52535
52536 static struct access_method SA5_access = {
52537- SA5_submit_command,
52538- SA5_intr_mask,
52539- SA5_intr_pending,
52540- SA5_completed,
52541+ .submit_command = SA5_submit_command,
52542+ .set_intr_mask = SA5_intr_mask,
52543+ .intr_pending = SA5_intr_pending,
52544+ .command_completed = SA5_completed,
52545 };
52546
52547 static struct access_method SA5_ioaccel_mode1_access = {
52548- SA5_submit_command,
52549- SA5_performant_intr_mask,
52550- SA5_ioaccel_mode1_intr_pending,
52551- SA5_ioaccel_mode1_completed,
52552+ .submit_command = SA5_submit_command,
52553+ .set_intr_mask = SA5_performant_intr_mask,
52554+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52555+ .command_completed = SA5_ioaccel_mode1_completed,
52556 };
52557
52558 static struct access_method SA5_ioaccel_mode2_access = {
52559- SA5_submit_command_ioaccel2,
52560- SA5_performant_intr_mask,
52561- SA5_performant_intr_pending,
52562- SA5_performant_completed,
52563+ .submit_command = SA5_submit_command_ioaccel2,
52564+ .set_intr_mask = SA5_performant_intr_mask,
52565+ .intr_pending = SA5_performant_intr_pending,
52566+ .command_completed = SA5_performant_completed,
52567 };
52568
52569 static struct access_method SA5_performant_access = {
52570- SA5_submit_command,
52571- SA5_performant_intr_mask,
52572- SA5_performant_intr_pending,
52573- SA5_performant_completed,
52574+ .submit_command = SA5_submit_command,
52575+ .set_intr_mask = SA5_performant_intr_mask,
52576+ .intr_pending = SA5_performant_intr_pending,
52577+ .command_completed = SA5_performant_completed,
52578 };
52579
52580 static struct access_method SA5_performant_access_no_read = {
52581- SA5_submit_command_no_read,
52582- SA5_performant_intr_mask,
52583- SA5_performant_intr_pending,
52584- SA5_performant_completed,
52585+ .submit_command = SA5_submit_command_no_read,
52586+ .set_intr_mask = SA5_performant_intr_mask,
52587+ .intr_pending = SA5_performant_intr_pending,
52588+ .command_completed = SA5_performant_completed,
52589 };
52590
52591 struct board_type {
52592diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52593index 1b3a094..068e683 100644
52594--- a/drivers/scsi/libfc/fc_exch.c
52595+++ b/drivers/scsi/libfc/fc_exch.c
52596@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52597 u16 pool_max_index;
52598
52599 struct {
52600- atomic_t no_free_exch;
52601- atomic_t no_free_exch_xid;
52602- atomic_t xid_not_found;
52603- atomic_t xid_busy;
52604- atomic_t seq_not_found;
52605- atomic_t non_bls_resp;
52606+ atomic_unchecked_t no_free_exch;
52607+ atomic_unchecked_t no_free_exch_xid;
52608+ atomic_unchecked_t xid_not_found;
52609+ atomic_unchecked_t xid_busy;
52610+ atomic_unchecked_t seq_not_found;
52611+ atomic_unchecked_t non_bls_resp;
52612 } stats;
52613 };
52614
52615@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52616 /* allocate memory for exchange */
52617 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52618 if (!ep) {
52619- atomic_inc(&mp->stats.no_free_exch);
52620+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52621 goto out;
52622 }
52623 memset(ep, 0, sizeof(*ep));
52624@@ -874,7 +874,7 @@ out:
52625 return ep;
52626 err:
52627 spin_unlock_bh(&pool->lock);
52628- atomic_inc(&mp->stats.no_free_exch_xid);
52629+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52630 mempool_free(ep, mp->ep_pool);
52631 return NULL;
52632 }
52633@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52634 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52635 ep = fc_exch_find(mp, xid);
52636 if (!ep) {
52637- atomic_inc(&mp->stats.xid_not_found);
52638+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52639 reject = FC_RJT_OX_ID;
52640 goto out;
52641 }
52642@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52643 ep = fc_exch_find(mp, xid);
52644 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52645 if (ep) {
52646- atomic_inc(&mp->stats.xid_busy);
52647+ atomic_inc_unchecked(&mp->stats.xid_busy);
52648 reject = FC_RJT_RX_ID;
52649 goto rel;
52650 }
52651@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52652 }
52653 xid = ep->xid; /* get our XID */
52654 } else if (!ep) {
52655- atomic_inc(&mp->stats.xid_not_found);
52656+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52657 reject = FC_RJT_RX_ID; /* XID not found */
52658 goto out;
52659 }
52660@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52661 } else {
52662 sp = &ep->seq;
52663 if (sp->id != fh->fh_seq_id) {
52664- atomic_inc(&mp->stats.seq_not_found);
52665+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52666 if (f_ctl & FC_FC_END_SEQ) {
52667 /*
52668 * Update sequence_id based on incoming last
52669@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52670
52671 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52672 if (!ep) {
52673- atomic_inc(&mp->stats.xid_not_found);
52674+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52675 goto out;
52676 }
52677 if (ep->esb_stat & ESB_ST_COMPLETE) {
52678- atomic_inc(&mp->stats.xid_not_found);
52679+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52680 goto rel;
52681 }
52682 if (ep->rxid == FC_XID_UNKNOWN)
52683 ep->rxid = ntohs(fh->fh_rx_id);
52684 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52685- atomic_inc(&mp->stats.xid_not_found);
52686+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52687 goto rel;
52688 }
52689 if (ep->did != ntoh24(fh->fh_s_id) &&
52690 ep->did != FC_FID_FLOGI) {
52691- atomic_inc(&mp->stats.xid_not_found);
52692+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52693 goto rel;
52694 }
52695 sof = fr_sof(fp);
52696@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52697 sp->ssb_stat |= SSB_ST_RESP;
52698 sp->id = fh->fh_seq_id;
52699 } else if (sp->id != fh->fh_seq_id) {
52700- atomic_inc(&mp->stats.seq_not_found);
52701+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52702 goto rel;
52703 }
52704
52705@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52706 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52707
52708 if (!sp)
52709- atomic_inc(&mp->stats.xid_not_found);
52710+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52711 else
52712- atomic_inc(&mp->stats.non_bls_resp);
52713+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52714
52715 fc_frame_free(fp);
52716 }
52717@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52718
52719 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52720 mp = ema->mp;
52721- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52722+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52723 st->fc_no_free_exch_xid +=
52724- atomic_read(&mp->stats.no_free_exch_xid);
52725- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52726- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52727- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52728- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52729+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52730+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52731+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52732+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52733+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52734 }
52735 }
52736 EXPORT_SYMBOL(fc_exch_update_stats);
52737diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52738index 9c706d8..d3e3ed2 100644
52739--- a/drivers/scsi/libsas/sas_ata.c
52740+++ b/drivers/scsi/libsas/sas_ata.c
52741@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52742 .postreset = ata_std_postreset,
52743 .error_handler = ata_std_error_handler,
52744 .post_internal_cmd = sas_ata_post_internal,
52745- .qc_defer = ata_std_qc_defer,
52746+ .qc_defer = ata_std_qc_defer,
52747 .qc_prep = ata_noop_qc_prep,
52748 .qc_issue = sas_ata_qc_issue,
52749 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52750diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52751index 9b81a34..a9b7b8c 100644
52752--- a/drivers/scsi/lpfc/lpfc.h
52753+++ b/drivers/scsi/lpfc/lpfc.h
52754@@ -433,7 +433,7 @@ struct lpfc_vport {
52755 struct dentry *debug_nodelist;
52756 struct dentry *vport_debugfs_root;
52757 struct lpfc_debugfs_trc *disc_trc;
52758- atomic_t disc_trc_cnt;
52759+ atomic_unchecked_t disc_trc_cnt;
52760 #endif
52761 uint8_t stat_data_enabled;
52762 uint8_t stat_data_blocked;
52763@@ -883,8 +883,8 @@ struct lpfc_hba {
52764 struct timer_list fabric_block_timer;
52765 unsigned long bit_flags;
52766 #define FABRIC_COMANDS_BLOCKED 0
52767- atomic_t num_rsrc_err;
52768- atomic_t num_cmd_success;
52769+ atomic_unchecked_t num_rsrc_err;
52770+ atomic_unchecked_t num_cmd_success;
52771 unsigned long last_rsrc_error_time;
52772 unsigned long last_ramp_down_time;
52773 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52774@@ -919,7 +919,7 @@ struct lpfc_hba {
52775
52776 struct dentry *debug_slow_ring_trc;
52777 struct lpfc_debugfs_trc *slow_ring_trc;
52778- atomic_t slow_ring_trc_cnt;
52779+ atomic_unchecked_t slow_ring_trc_cnt;
52780 /* iDiag debugfs sub-directory */
52781 struct dentry *idiag_root;
52782 struct dentry *idiag_pci_cfg;
52783diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52784index 513edcb..805c6a8 100644
52785--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52786+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52787@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52788
52789 #include <linux/debugfs.h>
52790
52791-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52792+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52793 static unsigned long lpfc_debugfs_start_time = 0L;
52794
52795 /* iDiag */
52796@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52797 lpfc_debugfs_enable = 0;
52798
52799 len = 0;
52800- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52801+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52802 (lpfc_debugfs_max_disc_trc - 1);
52803 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52804 dtp = vport->disc_trc + i;
52805@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52806 lpfc_debugfs_enable = 0;
52807
52808 len = 0;
52809- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52810+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52811 (lpfc_debugfs_max_slow_ring_trc - 1);
52812 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52813 dtp = phba->slow_ring_trc + i;
52814@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52815 !vport || !vport->disc_trc)
52816 return;
52817
52818- index = atomic_inc_return(&vport->disc_trc_cnt) &
52819+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52820 (lpfc_debugfs_max_disc_trc - 1);
52821 dtp = vport->disc_trc + index;
52822 dtp->fmt = fmt;
52823 dtp->data1 = data1;
52824 dtp->data2 = data2;
52825 dtp->data3 = data3;
52826- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52827+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52828 dtp->jif = jiffies;
52829 #endif
52830 return;
52831@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52832 !phba || !phba->slow_ring_trc)
52833 return;
52834
52835- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52836+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52837 (lpfc_debugfs_max_slow_ring_trc - 1);
52838 dtp = phba->slow_ring_trc + index;
52839 dtp->fmt = fmt;
52840 dtp->data1 = data1;
52841 dtp->data2 = data2;
52842 dtp->data3 = data3;
52843- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52844+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52845 dtp->jif = jiffies;
52846 #endif
52847 return;
52848@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52849 "slow_ring buffer\n");
52850 goto debug_failed;
52851 }
52852- atomic_set(&phba->slow_ring_trc_cnt, 0);
52853+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52854 memset(phba->slow_ring_trc, 0,
52855 (sizeof(struct lpfc_debugfs_trc) *
52856 lpfc_debugfs_max_slow_ring_trc));
52857@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52858 "buffer\n");
52859 goto debug_failed;
52860 }
52861- atomic_set(&vport->disc_trc_cnt, 0);
52862+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52863
52864 snprintf(name, sizeof(name), "discovery_trace");
52865 vport->debug_disc_trc =
52866diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52867index e8c8c1e..5f2e11c 100644
52868--- a/drivers/scsi/lpfc/lpfc_init.c
52869+++ b/drivers/scsi/lpfc/lpfc_init.c
52870@@ -11406,8 +11406,10 @@ lpfc_init(void)
52871 "misc_register returned with status %d", error);
52872
52873 if (lpfc_enable_npiv) {
52874- lpfc_transport_functions.vport_create = lpfc_vport_create;
52875- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52876+ pax_open_kernel();
52877+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52878+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52879+ pax_close_kernel();
52880 }
52881 lpfc_transport_template =
52882 fc_attach_transport(&lpfc_transport_functions);
52883diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52884index c140f99..11b2505 100644
52885--- a/drivers/scsi/lpfc/lpfc_scsi.c
52886+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52887@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52888 unsigned long expires;
52889
52890 spin_lock_irqsave(&phba->hbalock, flags);
52891- atomic_inc(&phba->num_rsrc_err);
52892+ atomic_inc_unchecked(&phba->num_rsrc_err);
52893 phba->last_rsrc_error_time = jiffies;
52894
52895 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52896@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52897 unsigned long num_rsrc_err, num_cmd_success;
52898 int i;
52899
52900- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52901- num_cmd_success = atomic_read(&phba->num_cmd_success);
52902+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52903+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52904
52905 /*
52906 * The error and success command counters are global per
52907@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52908 }
52909 }
52910 lpfc_destroy_vport_work_array(phba, vports);
52911- atomic_set(&phba->num_rsrc_err, 0);
52912- atomic_set(&phba->num_cmd_success, 0);
52913+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52914+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52915 }
52916
52917 /**
52918diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52919index 3f26147..ee8efd1 100644
52920--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52921+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52922@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52923 {
52924 struct scsi_device *sdev = to_scsi_device(dev);
52925 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52926- static struct _raid_device *raid_device;
52927+ struct _raid_device *raid_device;
52928 unsigned long flags;
52929 Mpi2RaidVolPage0_t vol_pg0;
52930 Mpi2ConfigReply_t mpi_reply;
52931@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52932 {
52933 struct scsi_device *sdev = to_scsi_device(dev);
52934 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52935- static struct _raid_device *raid_device;
52936+ struct _raid_device *raid_device;
52937 unsigned long flags;
52938 Mpi2RaidVolPage0_t vol_pg0;
52939 Mpi2ConfigReply_t mpi_reply;
52940@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52941 Mpi2EventDataIrOperationStatus_t *event_data =
52942 (Mpi2EventDataIrOperationStatus_t *)
52943 fw_event->event_data;
52944- static struct _raid_device *raid_device;
52945+ struct _raid_device *raid_device;
52946 unsigned long flags;
52947 u16 handle;
52948
52949@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52950 u64 sas_address;
52951 struct _sas_device *sas_device;
52952 struct _sas_node *expander_device;
52953- static struct _raid_device *raid_device;
52954+ struct _raid_device *raid_device;
52955 u8 retry_count;
52956 unsigned long flags;
52957
52958diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52959index ed31d8c..ab856b3 100644
52960--- a/drivers/scsi/pmcraid.c
52961+++ b/drivers/scsi/pmcraid.c
52962@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52963 res->scsi_dev = scsi_dev;
52964 scsi_dev->hostdata = res;
52965 res->change_detected = 0;
52966- atomic_set(&res->read_failures, 0);
52967- atomic_set(&res->write_failures, 0);
52968+ atomic_set_unchecked(&res->read_failures, 0);
52969+ atomic_set_unchecked(&res->write_failures, 0);
52970 rc = 0;
52971 }
52972 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52973@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52974
52975 /* If this was a SCSI read/write command keep count of errors */
52976 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52977- atomic_inc(&res->read_failures);
52978+ atomic_inc_unchecked(&res->read_failures);
52979 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52980- atomic_inc(&res->write_failures);
52981+ atomic_inc_unchecked(&res->write_failures);
52982
52983 if (!RES_IS_GSCSI(res->cfg_entry) &&
52984 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52985@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52986 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52987 * hrrq_id assigned here in queuecommand
52988 */
52989- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52990+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52991 pinstance->num_hrrq;
52992 cmd->cmd_done = pmcraid_io_done;
52993
52994@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52995 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52996 * hrrq_id assigned here in queuecommand
52997 */
52998- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52999+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
53000 pinstance->num_hrrq;
53001
53002 if (request_size) {
53003@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
53004
53005 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
53006 /* add resources only after host is added into system */
53007- if (!atomic_read(&pinstance->expose_resources))
53008+ if (!atomic_read_unchecked(&pinstance->expose_resources))
53009 return;
53010
53011 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
53012@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
53013 init_waitqueue_head(&pinstance->reset_wait_q);
53014
53015 atomic_set(&pinstance->outstanding_cmds, 0);
53016- atomic_set(&pinstance->last_message_id, 0);
53017- atomic_set(&pinstance->expose_resources, 0);
53018+ atomic_set_unchecked(&pinstance->last_message_id, 0);
53019+ atomic_set_unchecked(&pinstance->expose_resources, 0);
53020
53021 INIT_LIST_HEAD(&pinstance->free_res_q);
53022 INIT_LIST_HEAD(&pinstance->used_res_q);
53023@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
53024 /* Schedule worker thread to handle CCN and take care of adding and
53025 * removing devices to OS
53026 */
53027- atomic_set(&pinstance->expose_resources, 1);
53028+ atomic_set_unchecked(&pinstance->expose_resources, 1);
53029 schedule_work(&pinstance->worker_q);
53030 return rc;
53031
53032diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
53033index e1d150f..6c6df44 100644
53034--- a/drivers/scsi/pmcraid.h
53035+++ b/drivers/scsi/pmcraid.h
53036@@ -748,7 +748,7 @@ struct pmcraid_instance {
53037 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
53038
53039 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
53040- atomic_t last_message_id;
53041+ atomic_unchecked_t last_message_id;
53042
53043 /* configuration table */
53044 struct pmcraid_config_table *cfg_table;
53045@@ -777,7 +777,7 @@ struct pmcraid_instance {
53046 atomic_t outstanding_cmds;
53047
53048 /* should add/delete resources to mid-layer now ?*/
53049- atomic_t expose_resources;
53050+ atomic_unchecked_t expose_resources;
53051
53052
53053
53054@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
53055 struct pmcraid_config_table_entry_ext cfg_entry_ext;
53056 };
53057 struct scsi_device *scsi_dev; /* Link scsi_device structure */
53058- atomic_t read_failures; /* count of failed READ commands */
53059- atomic_t write_failures; /* count of failed WRITE commands */
53060+ atomic_unchecked_t read_failures; /* count of failed READ commands */
53061+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
53062
53063 /* To indicate add/delete/modify during CCN */
53064 u8 change_detected;
53065diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
53066index 82b92c4..3178171 100644
53067--- a/drivers/scsi/qla2xxx/qla_attr.c
53068+++ b/drivers/scsi/qla2xxx/qla_attr.c
53069@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
53070 return 0;
53071 }
53072
53073-struct fc_function_template qla2xxx_transport_functions = {
53074+fc_function_template_no_const qla2xxx_transport_functions = {
53075
53076 .show_host_node_name = 1,
53077 .show_host_port_name = 1,
53078@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
53079 .bsg_timeout = qla24xx_bsg_timeout,
53080 };
53081
53082-struct fc_function_template qla2xxx_transport_vport_functions = {
53083+fc_function_template_no_const qla2xxx_transport_vport_functions = {
53084
53085 .show_host_node_name = 1,
53086 .show_host_port_name = 1,
53087diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
53088index 7686bfe..4710893 100644
53089--- a/drivers/scsi/qla2xxx/qla_gbl.h
53090+++ b/drivers/scsi/qla2xxx/qla_gbl.h
53091@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
53092 struct device_attribute;
53093 extern struct device_attribute *qla2x00_host_attrs[];
53094 struct fc_function_template;
53095-extern struct fc_function_template qla2xxx_transport_functions;
53096-extern struct fc_function_template qla2xxx_transport_vport_functions;
53097+extern fc_function_template_no_const qla2xxx_transport_functions;
53098+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
53099 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
53100 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
53101 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
53102diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
53103index 7462dd7..5b64c24 100644
53104--- a/drivers/scsi/qla2xxx/qla_os.c
53105+++ b/drivers/scsi/qla2xxx/qla_os.c
53106@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
53107 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
53108 /* Ok, a 64bit DMA mask is applicable. */
53109 ha->flags.enable_64bit_addressing = 1;
53110- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
53111- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
53112+ pax_open_kernel();
53113+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
53114+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
53115+ pax_close_kernel();
53116 return;
53117 }
53118 }
53119diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
53120index 8f6d0fb..1b21097 100644
53121--- a/drivers/scsi/qla4xxx/ql4_def.h
53122+++ b/drivers/scsi/qla4xxx/ql4_def.h
53123@@ -305,7 +305,7 @@ struct ddb_entry {
53124 * (4000 only) */
53125 atomic_t relogin_timer; /* Max Time to wait for
53126 * relogin to complete */
53127- atomic_t relogin_retry_count; /* Num of times relogin has been
53128+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
53129 * retried */
53130 uint32_t default_time2wait; /* Default Min time between
53131 * relogins (+aens) */
53132diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
53133index 6d25879..3031a9f 100644
53134--- a/drivers/scsi/qla4xxx/ql4_os.c
53135+++ b/drivers/scsi/qla4xxx/ql4_os.c
53136@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
53137 */
53138 if (!iscsi_is_session_online(cls_sess)) {
53139 /* Reset retry relogin timer */
53140- atomic_inc(&ddb_entry->relogin_retry_count);
53141+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
53142 DEBUG2(ql4_printk(KERN_INFO, ha,
53143 "%s: index[%d] relogin timed out-retrying"
53144 " relogin (%d), retry (%d)\n", __func__,
53145 ddb_entry->fw_ddb_index,
53146- atomic_read(&ddb_entry->relogin_retry_count),
53147+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
53148 ddb_entry->default_time2wait + 4));
53149 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
53150 atomic_set(&ddb_entry->retry_relogin_timer,
53151@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
53152
53153 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
53154 atomic_set(&ddb_entry->relogin_timer, 0);
53155- atomic_set(&ddb_entry->relogin_retry_count, 0);
53156+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
53157 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
53158 ddb_entry->default_relogin_timeout =
53159 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
53160diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
53161index 3833bf5..95feaf1 100644
53162--- a/drivers/scsi/scsi.c
53163+++ b/drivers/scsi/scsi.c
53164@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
53165
53166 good_bytes = scsi_bufflen(cmd);
53167 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
53168- int old_good_bytes = good_bytes;
53169+ unsigned int old_good_bytes = good_bytes;
53170 drv = scsi_cmd_to_driver(cmd);
53171 if (drv->done)
53172 good_bytes = drv->done(cmd);
53173diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
53174index b1a2631..5bcd9c8 100644
53175--- a/drivers/scsi/scsi_lib.c
53176+++ b/drivers/scsi/scsi_lib.c
53177@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
53178 shost = sdev->host;
53179 scsi_init_cmd_errh(cmd);
53180 cmd->result = DID_NO_CONNECT << 16;
53181- atomic_inc(&cmd->device->iorequest_cnt);
53182+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53183
53184 /*
53185 * SCSI request completion path will do scsi_device_unbusy(),
53186@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
53187
53188 INIT_LIST_HEAD(&cmd->eh_entry);
53189
53190- atomic_inc(&cmd->device->iodone_cnt);
53191+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
53192 if (cmd->result)
53193- atomic_inc(&cmd->device->ioerr_cnt);
53194+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
53195
53196 disposition = scsi_decide_disposition(cmd);
53197 if (disposition != SUCCESS &&
53198@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
53199 struct Scsi_Host *host = cmd->device->host;
53200 int rtn = 0;
53201
53202- atomic_inc(&cmd->device->iorequest_cnt);
53203+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53204
53205 /* check if the device is still usable */
53206 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
53207diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
53208index 1ac38e7..6acc656 100644
53209--- a/drivers/scsi/scsi_sysfs.c
53210+++ b/drivers/scsi/scsi_sysfs.c
53211@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
53212 char *buf) \
53213 { \
53214 struct scsi_device *sdev = to_scsi_device(dev); \
53215- unsigned long long count = atomic_read(&sdev->field); \
53216+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
53217 return snprintf(buf, 20, "0x%llx\n", count); \
53218 } \
53219 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53220diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53221index 24eaaf6..de30ec9 100644
53222--- a/drivers/scsi/scsi_transport_fc.c
53223+++ b/drivers/scsi/scsi_transport_fc.c
53224@@ -502,7 +502,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53225 * Netlink Infrastructure
53226 */
53227
53228-static atomic_t fc_event_seq;
53229+static atomic_unchecked_t fc_event_seq;
53230
53231 /**
53232 * fc_get_event_number - Obtain the next sequential FC event number
53233@@ -515,7 +515,7 @@ static atomic_t fc_event_seq;
53234 u32
53235 fc_get_event_number(void)
53236 {
53237- return atomic_add_return(1, &fc_event_seq);
53238+ return atomic_add_return_unchecked(1, &fc_event_seq);
53239 }
53240 EXPORT_SYMBOL(fc_get_event_number);
53241
53242@@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
53243 {
53244 int error;
53245
53246- atomic_set(&fc_event_seq, 0);
53247+ atomic_set_unchecked(&fc_event_seq, 0);
53248
53249 error = transport_class_register(&fc_host_class);
53250 if (error)
53251@@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53252 char *cp;
53253
53254 *val = simple_strtoul(buf, &cp, 0);
53255- if ((*cp && (*cp != '\n')) || (*val < 0))
53256+ if (*cp && (*cp != '\n'))
53257 return -EINVAL;
53258 /*
53259 * Check for overflow; dev_loss_tmo is u32
53260diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53261index 67d43e3..8cee73c 100644
53262--- a/drivers/scsi/scsi_transport_iscsi.c
53263+++ b/drivers/scsi/scsi_transport_iscsi.c
53264@@ -79,7 +79,7 @@ struct iscsi_internal {
53265 struct transport_container session_cont;
53266 };
53267
53268-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53269+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53270 static struct workqueue_struct *iscsi_eh_timer_workq;
53271
53272 static DEFINE_IDA(iscsi_sess_ida);
53273@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53274 int err;
53275
53276 ihost = shost->shost_data;
53277- session->sid = atomic_add_return(1, &iscsi_session_nr);
53278+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53279
53280 if (target_id == ISCSI_MAX_TARGET) {
53281 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53282@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53283 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53284 ISCSI_TRANSPORT_VERSION);
53285
53286- atomic_set(&iscsi_session_nr, 0);
53287+ atomic_set_unchecked(&iscsi_session_nr, 0);
53288
53289 err = class_register(&iscsi_transport_class);
53290 if (err)
53291diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53292index f115f67..b80b2c1 100644
53293--- a/drivers/scsi/scsi_transport_srp.c
53294+++ b/drivers/scsi/scsi_transport_srp.c
53295@@ -35,7 +35,7 @@
53296 #include "scsi_priv.h"
53297
53298 struct srp_host_attrs {
53299- atomic_t next_port_id;
53300+ atomic_unchecked_t next_port_id;
53301 };
53302 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53303
53304@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53305 struct Scsi_Host *shost = dev_to_shost(dev);
53306 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53307
53308- atomic_set(&srp_host->next_port_id, 0);
53309+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53310 return 0;
53311 }
53312
53313@@ -744,7 +744,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53314 rport_fast_io_fail_timedout);
53315 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53316
53317- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53318+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53319 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53320
53321 transport_setup_device(&rport->dev);
53322diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53323index 7f9d65f..e856438 100644
53324--- a/drivers/scsi/sd.c
53325+++ b/drivers/scsi/sd.c
53326@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53327 static void sd_rescan(struct device *);
53328 static int sd_init_command(struct scsi_cmnd *SCpnt);
53329 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53330-static int sd_done(struct scsi_cmnd *);
53331+static unsigned int sd_done(struct scsi_cmnd *);
53332 static int sd_eh_action(struct scsi_cmnd *, int);
53333 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53334 static void scsi_disk_release(struct device *cdev);
53335@@ -1646,7 +1646,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53336 *
53337 * Note: potentially run from within an ISR. Must not block.
53338 **/
53339-static int sd_done(struct scsi_cmnd *SCpnt)
53340+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53341 {
53342 int result = SCpnt->result;
53343 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53344@@ -2973,7 +2973,7 @@ static int sd_probe(struct device *dev)
53345 sdkp->disk = gd;
53346 sdkp->index = index;
53347 atomic_set(&sdkp->openers, 0);
53348- atomic_set(&sdkp->device->ioerr_cnt, 0);
53349+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53350
53351 if (!sdp->request_queue->rq_timeout) {
53352 if (sdp->type != TYPE_MOD)
53353diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53354index 9d7b7db..33ecc51 100644
53355--- a/drivers/scsi/sg.c
53356+++ b/drivers/scsi/sg.c
53357@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53358 sdp->disk->disk_name,
53359 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53360 NULL,
53361- (char *)arg);
53362+ (char __user *)arg);
53363 case BLKTRACESTART:
53364 return blk_trace_startstop(sdp->device->request_queue, 1);
53365 case BLKTRACESTOP:
53366diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53367index 8bd54a6..dd037a5 100644
53368--- a/drivers/scsi/sr.c
53369+++ b/drivers/scsi/sr.c
53370@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53371 static int sr_probe(struct device *);
53372 static int sr_remove(struct device *);
53373 static int sr_init_command(struct scsi_cmnd *SCpnt);
53374-static int sr_done(struct scsi_cmnd *);
53375+static unsigned int sr_done(struct scsi_cmnd *);
53376 static int sr_runtime_suspend(struct device *dev);
53377
53378 static struct dev_pm_ops sr_pm_ops = {
53379@@ -312,11 +312,11 @@ do_tur:
53380 * It will be notified on the end of a SCSI read / write, and will take one
53381 * of several actions based on success or failure.
53382 */
53383-static int sr_done(struct scsi_cmnd *SCpnt)
53384+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53385 {
53386 int result = SCpnt->result;
53387- int this_count = scsi_bufflen(SCpnt);
53388- int good_bytes = (result == 0 ? this_count : 0);
53389+ unsigned int this_count = scsi_bufflen(SCpnt);
53390+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53391 int block_sectors = 0;
53392 long error_sector;
53393 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53394diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
53395index 9a1c342..525ab4c 100644
53396--- a/drivers/scsi/st.c
53397+++ b/drivers/scsi/st.c
53398@@ -1274,9 +1274,9 @@ static int st_open(struct inode *inode, struct file *filp)
53399 spin_lock(&st_use_lock);
53400 STp->in_use = 0;
53401 spin_unlock(&st_use_lock);
53402- scsi_tape_put(STp);
53403 if (resumed)
53404 scsi_autopm_put_device(STp->device);
53405+ scsi_tape_put(STp);
53406 return retval;
53407
53408 }
53409diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53410index c0d660f..24a5854 100644
53411--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53412+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53413@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53414 return i;
53415 }
53416
53417-static struct bin_attribute fuse_bin_attr = {
53418+static bin_attribute_no_const fuse_bin_attr = {
53419 .attr = { .name = "fuse", .mode = S_IRUGO, },
53420 .read = fuse_read,
53421 };
53422diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53423index d35c1a1..eda08dc 100644
53424--- a/drivers/spi/spi.c
53425+++ b/drivers/spi/spi.c
53426@@ -2206,7 +2206,7 @@ int spi_bus_unlock(struct spi_master *master)
53427 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53428
53429 /* portable code must never pass more than 32 bytes */
53430-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53431+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53432
53433 static u8 *buf;
53434
53435diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53436index b41429f..2de5373 100644
53437--- a/drivers/staging/android/timed_output.c
53438+++ b/drivers/staging/android/timed_output.c
53439@@ -25,7 +25,7 @@
53440 #include "timed_output.h"
53441
53442 static struct class *timed_output_class;
53443-static atomic_t device_count;
53444+static atomic_unchecked_t device_count;
53445
53446 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53447 char *buf)
53448@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53449 timed_output_class = class_create(THIS_MODULE, "timed_output");
53450 if (IS_ERR(timed_output_class))
53451 return PTR_ERR(timed_output_class);
53452- atomic_set(&device_count, 0);
53453+ atomic_set_unchecked(&device_count, 0);
53454 timed_output_class->dev_groups = timed_output_groups;
53455 }
53456
53457@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53458 if (ret < 0)
53459 return ret;
53460
53461- tdev->index = atomic_inc_return(&device_count);
53462+ tdev->index = atomic_inc_return_unchecked(&device_count);
53463 tdev->dev = device_create(timed_output_class, NULL,
53464 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53465 if (IS_ERR(tdev->dev))
53466diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53467index e78ddbe..ac437c0 100644
53468--- a/drivers/staging/comedi/comedi_fops.c
53469+++ b/drivers/staging/comedi/comedi_fops.c
53470@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53471 }
53472 cfp->last_attached = dev->attached;
53473 cfp->last_detach_count = dev->detach_count;
53474- ACCESS_ONCE(cfp->read_subdev) = read_s;
53475- ACCESS_ONCE(cfp->write_subdev) = write_s;
53476+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53477+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53478 }
53479
53480 static void comedi_file_check(struct file *file)
53481@@ -1951,7 +1951,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53482 !(s_old->async->cmd.flags & CMDF_WRITE))
53483 return -EBUSY;
53484
53485- ACCESS_ONCE(cfp->read_subdev) = s_new;
53486+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53487 return 0;
53488 }
53489
53490@@ -1993,7 +1993,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53491 (s_old->async->cmd.flags & CMDF_WRITE))
53492 return -EBUSY;
53493
53494- ACCESS_ONCE(cfp->write_subdev) = s_new;
53495+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53496 return 0;
53497 }
53498
53499diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53500index 53b748b..a5ae0b3 100644
53501--- a/drivers/staging/fbtft/fbtft-core.c
53502+++ b/drivers/staging/fbtft/fbtft-core.c
53503@@ -680,7 +680,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53504 {
53505 struct fb_info *info;
53506 struct fbtft_par *par;
53507- struct fb_ops *fbops = NULL;
53508+ fb_ops_no_const *fbops = NULL;
53509 struct fb_deferred_io *fbdefio = NULL;
53510 struct fbtft_platform_data *pdata = dev->platform_data;
53511 u8 *vmem = NULL;
53512diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53513index 9fd98cb..a9cf912 100644
53514--- a/drivers/staging/fbtft/fbtft.h
53515+++ b/drivers/staging/fbtft/fbtft.h
53516@@ -106,7 +106,7 @@ struct fbtft_ops {
53517
53518 int (*set_var)(struct fbtft_par *par);
53519 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53520-};
53521+} __no_const;
53522
53523 /**
53524 * struct fbtft_display - Describes the display properties
53525diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53526index 001348c..cfaac8a 100644
53527--- a/drivers/staging/gdm724x/gdm_tty.c
53528+++ b/drivers/staging/gdm724x/gdm_tty.c
53529@@ -44,7 +44,7 @@
53530 #define gdm_tty_send_control(n, r, v, d, l) (\
53531 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53532
53533-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53534+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53535
53536 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53537 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53538diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53539index d23c3c2..eb63c81 100644
53540--- a/drivers/staging/i2o/i2o.h
53541+++ b/drivers/staging/i2o/i2o.h
53542@@ -565,7 +565,7 @@ struct i2o_controller {
53543 struct i2o_device *exec; /* Executive */
53544 #if BITS_PER_LONG == 64
53545 spinlock_t context_list_lock; /* lock for context_list */
53546- atomic_t context_list_counter; /* needed for unique contexts */
53547+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53548 struct list_head context_list; /* list of context id's
53549 and pointers */
53550 #endif
53551diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53552index 780fee3..ca9dcae 100644
53553--- a/drivers/staging/i2o/i2o_proc.c
53554+++ b/drivers/staging/i2o/i2o_proc.c
53555@@ -253,12 +253,6 @@ static char *scsi_devices[] = {
53556 "Array Controller Device"
53557 };
53558
53559-static char *chtostr(char *tmp, u8 *chars, int n)
53560-{
53561- tmp[0] = 0;
53562- return strncat(tmp, (char *)chars, n);
53563-}
53564-
53565 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53566 char *group)
53567 {
53568@@ -711,9 +705,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53569 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53570 {
53571 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53572- static u32 work32[5];
53573- static u8 *work8 = (u8 *) work32;
53574- static u16 *work16 = (u16 *) work32;
53575+ u32 work32[5];
53576+ u8 *work8 = (u8 *) work32;
53577+ u16 *work16 = (u16 *) work32;
53578 int token;
53579 u32 hwcap;
53580
53581@@ -794,7 +788,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53582 } *result;
53583
53584 i2o_exec_execute_ddm_table ddm_table;
53585- char tmp[28 + 1];
53586
53587 result = kmalloc(sizeof(*result), GFP_KERNEL);
53588 if (!result)
53589@@ -829,8 +822,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53590
53591 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53592 seq_printf(seq, "%-#8x", ddm_table.module_id);
53593- seq_printf(seq, "%-29s",
53594- chtostr(tmp, ddm_table.module_name_version, 28));
53595+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53596 seq_printf(seq, "%9d ", ddm_table.data_size);
53597 seq_printf(seq, "%8d", ddm_table.code_size);
53598
53599@@ -897,7 +889,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53600
53601 i2o_driver_result_table *result;
53602 i2o_driver_store_table *dst;
53603- char tmp[28 + 1];
53604
53605 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53606 if (result == NULL)
53607@@ -932,9 +923,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53608
53609 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53610 seq_printf(seq, "%-#8x", dst->module_id);
53611- seq_printf(seq, "%-29s",
53612- chtostr(tmp, dst->module_name_version, 28));
53613- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53614+ seq_printf(seq, "%-.28s", dst->module_name_version);
53615+ seq_printf(seq, "%-.8s", dst->date);
53616 seq_printf(seq, "%8d ", dst->module_size);
53617 seq_printf(seq, "%8d ", dst->mpb_size);
53618 seq_printf(seq, "0x%04x", dst->module_flags);
53619@@ -1250,11 +1240,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53620 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53621 {
53622 struct i2o_device *d = (struct i2o_device *)seq->private;
53623- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53624+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53625 // == (allow) 512d bytes (max)
53626- static u16 *work16 = (u16 *) work32;
53627+ u16 *work16 = (u16 *) work32;
53628 int token;
53629- char tmp[16 + 1];
53630
53631 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53632
53633@@ -1266,14 +1255,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53634 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53635 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53636 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53637- seq_printf(seq, "Vendor info : %s\n",
53638- chtostr(tmp, (u8 *) (work32 + 2), 16));
53639- seq_printf(seq, "Product info : %s\n",
53640- chtostr(tmp, (u8 *) (work32 + 6), 16));
53641- seq_printf(seq, "Description : %s\n",
53642- chtostr(tmp, (u8 *) (work32 + 10), 16));
53643- seq_printf(seq, "Product rev. : %s\n",
53644- chtostr(tmp, (u8 *) (work32 + 14), 8));
53645+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53646+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53647+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53648+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53649
53650 seq_printf(seq, "Serial number : ");
53651 print_serial_number(seq, (u8 *) (work32 + 16),
53652@@ -1310,8 +1295,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53653 u8 pad[256]; // allow up to 256 byte (max) serial number
53654 } result;
53655
53656- char tmp[24 + 1];
53657-
53658 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53659
53660 if (token < 0) {
53661@@ -1320,10 +1303,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53662 }
53663
53664 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53665- seq_printf(seq, "Module name : %s\n",
53666- chtostr(tmp, result.module_name, 24));
53667- seq_printf(seq, "Module revision : %s\n",
53668- chtostr(tmp, result.module_rev, 8));
53669+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53670+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53671
53672 seq_printf(seq, "Serial number : ");
53673 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53674@@ -1347,8 +1328,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53675 u8 instance_number[4];
53676 } result;
53677
53678- char tmp[64 + 1];
53679-
53680 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53681
53682 if (token < 0) {
53683@@ -1356,14 +1335,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53684 return 0;
53685 }
53686
53687- seq_printf(seq, "Device name : %s\n",
53688- chtostr(tmp, result.device_name, 64));
53689- seq_printf(seq, "Service name : %s\n",
53690- chtostr(tmp, result.service_name, 64));
53691- seq_printf(seq, "Physical name : %s\n",
53692- chtostr(tmp, result.physical_location, 64));
53693- seq_printf(seq, "Instance number : %s\n",
53694- chtostr(tmp, result.instance_number, 4));
53695+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53696+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53697+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53698+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53699
53700 return 0;
53701 }
53702@@ -1372,9 +1347,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53703 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53704 {
53705 struct i2o_device *d = (struct i2o_device *)seq->private;
53706- static u32 work32[12];
53707- static u16 *work16 = (u16 *) work32;
53708- static u8 *work8 = (u8 *) work32;
53709+ u32 work32[12];
53710+ u16 *work16 = (u16 *) work32;
53711+ u8 *work8 = (u8 *) work32;
53712 int token;
53713
53714 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53715diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53716index 23bdbe4..4e1f340 100644
53717--- a/drivers/staging/i2o/iop.c
53718+++ b/drivers/staging/i2o/iop.c
53719@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53720
53721 spin_lock_irqsave(&c->context_list_lock, flags);
53722
53723- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53724- atomic_inc(&c->context_list_counter);
53725+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53726+ atomic_inc_unchecked(&c->context_list_counter);
53727
53728- entry->context = atomic_read(&c->context_list_counter);
53729+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53730
53731 list_add(&entry->list, &c->context_list);
53732
53733@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53734
53735 #if BITS_PER_LONG == 64
53736 spin_lock_init(&c->context_list_lock);
53737- atomic_set(&c->context_list_counter, 0);
53738+ atomic_set_unchecked(&c->context_list_counter, 0);
53739 INIT_LIST_HEAD(&c->context_list);
53740 #endif
53741
53742diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
53743index b892f2c..9b4898a 100644
53744--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
53745+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
53746@@ -118,7 +118,7 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
53747 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
53748 indio_dev->masklength);
53749
53750- rx_array = kcalloc(4, scan_count, GFP_KERNEL);
53751+ rx_array = kcalloc(scan_count, 4, GFP_KERNEL);
53752 if (!rx_array)
53753 return -ENOMEM;
53754 ret = lis3l02dq_read_all(indio_dev, rx_array);
53755diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
53756index d98e229..9c59bc2 100644
53757--- a/drivers/staging/iio/adc/ad7280a.c
53758+++ b/drivers/staging/iio/adc/ad7280a.c
53759@@ -547,8 +547,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
53760 {
53761 int dev, ch, cnt;
53762
53763- st->iio_attr = kcalloc(2, sizeof(*st->iio_attr) *
53764- (st->slave_num + 1) * AD7280A_CELLS_PER_DEV,
53765+ st->iio_attr = kcalloc(sizeof(*st->iio_attr) *
53766+ (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, 2,
53767 GFP_KERNEL);
53768 if (st->iio_attr == NULL)
53769 return -ENOMEM;
53770diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53771index 658f458..0564216 100644
53772--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53773+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53774@@ -487,13 +487,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53775 return 0;
53776 }
53777
53778-sfw_test_client_ops_t brw_test_client;
53779-void brw_init_test_client(void)
53780-{
53781- brw_test_client.tso_init = brw_client_init;
53782- brw_test_client.tso_fini = brw_client_fini;
53783- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53784- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53785+sfw_test_client_ops_t brw_test_client = {
53786+ .tso_init = brw_client_init,
53787+ .tso_fini = brw_client_fini,
53788+ .tso_prep_rpc = brw_client_prep_rpc,
53789+ .tso_done_rpc = brw_client_done_rpc,
53790 };
53791
53792 srpc_service_t brw_test_service;
53793diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53794index a93a90d..c51dde6 100644
53795--- a/drivers/staging/lustre/lnet/selftest/framework.c
53796+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53797@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53798
53799 extern sfw_test_client_ops_t ping_test_client;
53800 extern srpc_service_t ping_test_service;
53801-extern void ping_init_test_client(void);
53802 extern void ping_init_test_service(void);
53803
53804 extern sfw_test_client_ops_t brw_test_client;
53805 extern srpc_service_t brw_test_service;
53806-extern void brw_init_test_client(void);
53807 extern void brw_init_test_service(void);
53808
53809
53810@@ -1675,12 +1673,10 @@ sfw_startup(void)
53811 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53812 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53813
53814- brw_init_test_client();
53815 brw_init_test_service();
53816 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53817 LASSERT(rc == 0);
53818
53819- ping_init_test_client();
53820 ping_init_test_service();
53821 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53822 LASSERT(rc == 0);
53823diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53824index 644069a..83cbd26 100644
53825--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53826+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53827@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53828 return 0;
53829 }
53830
53831-sfw_test_client_ops_t ping_test_client;
53832-void ping_init_test_client(void)
53833-{
53834- ping_test_client.tso_init = ping_client_init;
53835- ping_test_client.tso_fini = ping_client_fini;
53836- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53837- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53838-}
53839+sfw_test_client_ops_t ping_test_client = {
53840+ .tso_init = ping_client_init,
53841+ .tso_fini = ping_client_fini,
53842+ .tso_prep_rpc = ping_client_prep_rpc,
53843+ .tso_done_rpc = ping_client_done_rpc,
53844+};
53845
53846 srpc_service_t ping_test_service;
53847 void ping_init_test_service(void)
53848diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53849index bac9902..0225fe1 100644
53850--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53851+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53852@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53853 ldlm_completion_callback lcs_completion;
53854 ldlm_blocking_callback lcs_blocking;
53855 ldlm_glimpse_callback lcs_glimpse;
53856-};
53857+} __no_const;
53858
53859 /* ldlm_lockd.c */
53860 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53861diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53862index 2a88b80..62e7e5f 100644
53863--- a/drivers/staging/lustre/lustre/include/obd.h
53864+++ b/drivers/staging/lustre/lustre/include/obd.h
53865@@ -1362,7 +1362,7 @@ struct md_ops {
53866 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53867 * wrapper function in include/linux/obd_class.h.
53868 */
53869-};
53870+} __no_const;
53871
53872 struct lsm_operations {
53873 void (*lsm_free)(struct lov_stripe_md *);
53874diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53875index a4c252f..b21acac 100644
53876--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53877+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53878@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53879 int added = (mode == LCK_NL);
53880 int overlaps = 0;
53881 int splitted = 0;
53882- const struct ldlm_callback_suite null_cbs = { NULL };
53883+ const struct ldlm_callback_suite null_cbs = { };
53884
53885 CDEBUG(D_DLMTRACE,
53886 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53887diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53888index f0ee76a..1d01af9 100644
53889--- a/drivers/staging/lustre/lustre/libcfs/module.c
53890+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53891@@ -380,11 +380,11 @@ out:
53892
53893
53894 struct cfs_psdev_ops libcfs_psdev_ops = {
53895- libcfs_psdev_open,
53896- libcfs_psdev_release,
53897- NULL,
53898- NULL,
53899- libcfs_ioctl
53900+ .p_open = libcfs_psdev_open,
53901+ .p_close = libcfs_psdev_release,
53902+ .p_read = NULL,
53903+ .p_write = NULL,
53904+ .p_ioctl = libcfs_ioctl
53905 };
53906
53907 static int init_libcfs_module(void)
53908@@ -631,7 +631,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53909 loff_t *ppos)
53910 {
53911 int rc, max_delay_cs;
53912- struct ctl_table dummy = *table;
53913+ ctl_table_no_const dummy = *table;
53914 long d;
53915
53916 dummy.data = &max_delay_cs;
53917@@ -664,7 +664,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53918 loff_t *ppos)
53919 {
53920 int rc, min_delay_cs;
53921- struct ctl_table dummy = *table;
53922+ ctl_table_no_const dummy = *table;
53923 long d;
53924
53925 dummy.data = &min_delay_cs;
53926@@ -696,7 +696,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53927 void __user *buffer, size_t *lenp, loff_t *ppos)
53928 {
53929 int rc, backoff;
53930- struct ctl_table dummy = *table;
53931+ ctl_table_no_const dummy = *table;
53932
53933 dummy.data = &backoff;
53934 dummy.proc_handler = &proc_dointvec;
53935diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53936index 22667db..8b703b6 100644
53937--- a/drivers/staging/octeon/ethernet-rx.c
53938+++ b/drivers/staging/octeon/ethernet-rx.c
53939@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53940 /* Increment RX stats for virtual ports */
53941 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53942 #ifdef CONFIG_64BIT
53943- atomic64_add(1,
53944+ atomic64_add_unchecked(1,
53945 (atomic64_t *)&priv->stats.rx_packets);
53946- atomic64_add(skb->len,
53947+ atomic64_add_unchecked(skb->len,
53948 (atomic64_t *)&priv->stats.rx_bytes);
53949 #else
53950- atomic_add(1,
53951+ atomic_add_unchecked(1,
53952 (atomic_t *)&priv->stats.rx_packets);
53953- atomic_add(skb->len,
53954+ atomic_add_unchecked(skb->len,
53955 (atomic_t *)&priv->stats.rx_bytes);
53956 #endif
53957 }
53958@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53959 dev->name);
53960 */
53961 #ifdef CONFIG_64BIT
53962- atomic64_add(1,
53963+ atomic64_add_unchecked(1,
53964 (atomic64_t *)&priv->stats.rx_dropped);
53965 #else
53966- atomic_add(1,
53967+ atomic_add_unchecked(1,
53968 (atomic_t *)&priv->stats.rx_dropped);
53969 #endif
53970 dev_kfree_skb_irq(skb);
53971diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53972index fbbe866..2943243 100644
53973--- a/drivers/staging/octeon/ethernet.c
53974+++ b/drivers/staging/octeon/ethernet.c
53975@@ -251,11 +251,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53976 * since the RX tasklet also increments it.
53977 */
53978 #ifdef CONFIG_64BIT
53979- atomic64_add(rx_status.dropped_packets,
53980- (atomic64_t *)&priv->stats.rx_dropped);
53981+ atomic64_add_unchecked(rx_status.dropped_packets,
53982+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53983 #else
53984- atomic_add(rx_status.dropped_packets,
53985- (atomic_t *)&priv->stats.rx_dropped);
53986+ atomic_add_unchecked(rx_status.dropped_packets,
53987+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53988 #endif
53989 }
53990
53991diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53992index 3b476d8..f522d68 100644
53993--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53994+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53995@@ -225,7 +225,7 @@ struct hal_ops {
53996
53997 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53998 void (*hal_reset_security_engine)(struct adapter *adapter);
53999-};
54000+} __no_const;
54001
54002 enum rt_eeprom_type {
54003 EEPROM_93C46,
54004diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
54005index 070cc03..6806e37 100644
54006--- a/drivers/staging/rtl8712/rtl871x_io.h
54007+++ b/drivers/staging/rtl8712/rtl871x_io.h
54008@@ -108,7 +108,7 @@ struct _io_ops {
54009 u8 *pmem);
54010 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
54011 u8 *pmem);
54012-};
54013+} __no_const;
54014
54015 struct io_req {
54016 struct list_head list;
54017diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
54018index dbbb2f8..5232114 100644
54019--- a/drivers/staging/sm750fb/sm750.c
54020+++ b/drivers/staging/sm750fb/sm750.c
54021@@ -780,6 +780,7 @@ static struct fb_ops lynxfb_ops = {
54022 .fb_set_par = lynxfb_ops_set_par,
54023 .fb_setcolreg = lynxfb_ops_setcolreg,
54024 .fb_blank = lynxfb_ops_blank,
54025+ .fb_pan_display = lynxfb_ops_pan_display,
54026 .fb_fillrect = cfb_fillrect,
54027 .fb_imageblit = cfb_imageblit,
54028 .fb_copyarea = cfb_copyarea,
54029@@ -827,8 +828,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
54030 par->index = index;
54031 output->channel = &crtc->channel;
54032 sm750fb_set_drv(par);
54033- lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
54034
54035+ pax_open_kernel();
54036+ *(void **)&lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
54037+ pax_close_kernel();
54038
54039 /* set current cursor variable and proc pointer,
54040 * must be set after crtc member initialized */
54041@@ -850,7 +853,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
54042 crtc->cursor.share = share;
54043 memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
54044 if (!g_hwcursor) {
54045- lynxfb_ops.fb_cursor = NULL;
54046+ pax_open_kernel();
54047+ *(void **)&lynxfb_ops.fb_cursor = NULL;
54048+ pax_close_kernel();
54049 crtc->cursor.disable(&crtc->cursor);
54050 }
54051
54052@@ -858,9 +863,11 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
54053 /* set info->fbops, must be set before fb_find_mode */
54054 if (!share->accel_off) {
54055 /* use 2d acceleration */
54056- lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
54057- lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
54058- lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
54059+ pax_open_kernel();
54060+ *(void **)&lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
54061+ *(void **)&lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
54062+ *(void **)&lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
54063+ pax_close_kernel();
54064 }
54065 info->fbops = &lynxfb_ops;
54066
54067diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
54068index bd46df9..a0a5274 100644
54069--- a/drivers/staging/unisys/visorchipset/visorchipset.h
54070+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
54071@@ -170,7 +170,7 @@ struct visorchipset_busdev_notifiers {
54072 void (*device_resume)(ulong bus_no, ulong dev_no);
54073 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
54074 ulong *max_size);
54075-};
54076+} __no_const;
54077
54078 /* These functions live inside visorchipset, and will be called to indicate
54079 * responses to specific events (by code outside of visorchipset).
54080@@ -185,7 +185,7 @@ struct visorchipset_busdev_responders {
54081 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
54082 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
54083 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
54084-};
54085+} __no_const;
54086
54087 /** Register functions (in the bus driver) to get called by visorchipset
54088 * whenever a bus or device appears for which this service partition is
54089diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
54090index 18b0f97..9c7716e 100644
54091--- a/drivers/target/sbp/sbp_target.c
54092+++ b/drivers/target/sbp/sbp_target.c
54093@@ -61,7 +61,7 @@ static const u32 sbp_unit_directory_template[] = {
54094
54095 #define SESSION_MAINTENANCE_INTERVAL HZ
54096
54097-static atomic_t login_id = ATOMIC_INIT(0);
54098+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
54099
54100 static void session_maintenance_work(struct work_struct *);
54101 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
54102@@ -443,7 +443,7 @@ static void sbp_management_request_login(
54103 login->lun = se_lun;
54104 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
54105 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
54106- login->login_id = atomic_inc_return(&login_id);
54107+ login->login_id = atomic_inc_return_unchecked(&login_id);
54108
54109 login->tgt_agt = sbp_target_agent_register(login);
54110 if (IS_ERR(login->tgt_agt)) {
54111diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
54112index ce5f768..a4f884a 100644
54113--- a/drivers/target/target_core_device.c
54114+++ b/drivers/target/target_core_device.c
54115@@ -1496,7 +1496,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
54116 spin_lock_init(&dev->se_tmr_lock);
54117 spin_lock_init(&dev->qf_cmd_lock);
54118 sema_init(&dev->caw_sem, 1);
54119- atomic_set(&dev->dev_ordered_id, 0);
54120+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
54121 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
54122 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
54123 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
54124diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
54125index 675f2d9..1389429 100644
54126--- a/drivers/target/target_core_transport.c
54127+++ b/drivers/target/target_core_transport.c
54128@@ -1208,7 +1208,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
54129 * Used to determine when ORDERED commands should go from
54130 * Dormant to Active status.
54131 */
54132- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
54133+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
54134 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
54135 cmd->se_ordered_id, cmd->sam_task_attr,
54136 dev->transport->name);
54137diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
54138index 031018e..90981a1 100644
54139--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
54140+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
54141@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
54142 platform_set_drvdata(pdev, priv);
54143
54144 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
54145- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
54146- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
54147+ pax_open_kernel();
54148+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
54149+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
54150+ pax_close_kernel();
54151 }
54152 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
54153 priv, &int3400_thermal_ops,
54154diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
54155index 668fb1b..2737bbe 100644
54156--- a/drivers/thermal/of-thermal.c
54157+++ b/drivers/thermal/of-thermal.c
54158@@ -31,6 +31,7 @@
54159 #include <linux/export.h>
54160 #include <linux/string.h>
54161 #include <linux/thermal.h>
54162+#include <linux/mm.h>
54163
54164 #include "thermal_core.h"
54165
54166@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
54167 tz->ops = ops;
54168 tz->sensor_data = data;
54169
54170- tzd->ops->get_temp = of_thermal_get_temp;
54171- tzd->ops->get_trend = of_thermal_get_trend;
54172- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
54173+ pax_open_kernel();
54174+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
54175+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
54176+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
54177+ pax_close_kernel();
54178 mutex_unlock(&tzd->lock);
54179
54180 return tzd;
54181@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
54182 return;
54183
54184 mutex_lock(&tzd->lock);
54185- tzd->ops->get_temp = NULL;
54186- tzd->ops->get_trend = NULL;
54187- tzd->ops->set_emul_temp = NULL;
54188+ pax_open_kernel();
54189+ *(void **)&tzd->ops->get_temp = NULL;
54190+ *(void **)&tzd->ops->get_trend = NULL;
54191+ *(void **)&tzd->ops->set_emul_temp = NULL;
54192+ pax_close_kernel();
54193
54194 tz->ops = NULL;
54195 tz->sensor_data = NULL;
54196diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
54197index 9ea3d9d..53e8792 100644
54198--- a/drivers/thermal/x86_pkg_temp_thermal.c
54199+++ b/drivers/thermal/x86_pkg_temp_thermal.c
54200@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
54201 return NOTIFY_OK;
54202 }
54203
54204-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
54205+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
54206 .notifier_call = pkg_temp_thermal_cpu_callback,
54207 };
54208
54209diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
54210index fd66f57..48e6376 100644
54211--- a/drivers/tty/cyclades.c
54212+++ b/drivers/tty/cyclades.c
54213@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
54214 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
54215 info->port.count);
54216 #endif
54217- info->port.count++;
54218+ atomic_inc(&info->port.count);
54219 #ifdef CY_DEBUG_COUNT
54220 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
54221- current->pid, info->port.count);
54222+ current->pid, atomic_read(&info->port.count));
54223 #endif
54224
54225 /*
54226@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
54227 for (j = 0; j < cy_card[i].nports; j++) {
54228 info = &cy_card[i].ports[j];
54229
54230- if (info->port.count) {
54231+ if (atomic_read(&info->port.count)) {
54232 /* XXX is the ldisc num worth this? */
54233 struct tty_struct *tty;
54234 struct tty_ldisc *ld;
54235diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
54236index 4fcec1d..5a036f7 100644
54237--- a/drivers/tty/hvc/hvc_console.c
54238+++ b/drivers/tty/hvc/hvc_console.c
54239@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
54240
54241 spin_lock_irqsave(&hp->port.lock, flags);
54242 /* Check and then increment for fast path open. */
54243- if (hp->port.count++ > 0) {
54244+ if (atomic_inc_return(&hp->port.count) > 1) {
54245 spin_unlock_irqrestore(&hp->port.lock, flags);
54246 hvc_kick();
54247 return 0;
54248@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54249
54250 spin_lock_irqsave(&hp->port.lock, flags);
54251
54252- if (--hp->port.count == 0) {
54253+ if (atomic_dec_return(&hp->port.count) == 0) {
54254 spin_unlock_irqrestore(&hp->port.lock, flags);
54255 /* We are done with the tty pointer now. */
54256 tty_port_tty_set(&hp->port, NULL);
54257@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54258 */
54259 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
54260 } else {
54261- if (hp->port.count < 0)
54262+ if (atomic_read(&hp->port.count) < 0)
54263 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
54264- hp->vtermno, hp->port.count);
54265+ hp->vtermno, atomic_read(&hp->port.count));
54266 spin_unlock_irqrestore(&hp->port.lock, flags);
54267 }
54268 }
54269@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
54270 * open->hangup case this can be called after the final close so prevent
54271 * that from happening for now.
54272 */
54273- if (hp->port.count <= 0) {
54274+ if (atomic_read(&hp->port.count) <= 0) {
54275 spin_unlock_irqrestore(&hp->port.lock, flags);
54276 return;
54277 }
54278
54279- hp->port.count = 0;
54280+ atomic_set(&hp->port.count, 0);
54281 spin_unlock_irqrestore(&hp->port.lock, flags);
54282 tty_port_tty_set(&hp->port, NULL);
54283
54284@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
54285 return -EPIPE;
54286
54287 /* FIXME what's this (unprotected) check for? */
54288- if (hp->port.count <= 0)
54289+ if (atomic_read(&hp->port.count) <= 0)
54290 return -EIO;
54291
54292 spin_lock_irqsave(&hp->lock, flags);
54293diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54294index 81ff7e1..dfb7b71 100644
54295--- a/drivers/tty/hvc/hvcs.c
54296+++ b/drivers/tty/hvc/hvcs.c
54297@@ -83,6 +83,7 @@
54298 #include <asm/hvcserver.h>
54299 #include <asm/uaccess.h>
54300 #include <asm/vio.h>
54301+#include <asm/local.h>
54302
54303 /*
54304 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54305@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54306
54307 spin_lock_irqsave(&hvcsd->lock, flags);
54308
54309- if (hvcsd->port.count > 0) {
54310+ if (atomic_read(&hvcsd->port.count) > 0) {
54311 spin_unlock_irqrestore(&hvcsd->lock, flags);
54312 printk(KERN_INFO "HVCS: vterm state unchanged. "
54313 "The hvcs device node is still in use.\n");
54314@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54315 }
54316 }
54317
54318- hvcsd->port.count = 0;
54319+ atomic_set(&hvcsd->port.count, 0);
54320 hvcsd->port.tty = tty;
54321 tty->driver_data = hvcsd;
54322
54323@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54324 unsigned long flags;
54325
54326 spin_lock_irqsave(&hvcsd->lock, flags);
54327- hvcsd->port.count++;
54328+ atomic_inc(&hvcsd->port.count);
54329 hvcsd->todo_mask |= HVCS_SCHED_READ;
54330 spin_unlock_irqrestore(&hvcsd->lock, flags);
54331
54332@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54333 hvcsd = tty->driver_data;
54334
54335 spin_lock_irqsave(&hvcsd->lock, flags);
54336- if (--hvcsd->port.count == 0) {
54337+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54338
54339 vio_disable_interrupts(hvcsd->vdev);
54340
54341@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54342
54343 free_irq(irq, hvcsd);
54344 return;
54345- } else if (hvcsd->port.count < 0) {
54346+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54347 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54348 " is missmanaged.\n",
54349- hvcsd->vdev->unit_address, hvcsd->port.count);
54350+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54351 }
54352
54353 spin_unlock_irqrestore(&hvcsd->lock, flags);
54354@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54355
54356 spin_lock_irqsave(&hvcsd->lock, flags);
54357 /* Preserve this so that we know how many kref refs to put */
54358- temp_open_count = hvcsd->port.count;
54359+ temp_open_count = atomic_read(&hvcsd->port.count);
54360
54361 /*
54362 * Don't kref put inside the spinlock because the destruction
54363@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54364 tty->driver_data = NULL;
54365 hvcsd->port.tty = NULL;
54366
54367- hvcsd->port.count = 0;
54368+ atomic_set(&hvcsd->port.count, 0);
54369
54370 /* This will drop any buffered data on the floor which is OK in a hangup
54371 * scenario. */
54372@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54373 * the middle of a write operation? This is a crummy place to do this
54374 * but we want to keep it all in the spinlock.
54375 */
54376- if (hvcsd->port.count <= 0) {
54377+ if (atomic_read(&hvcsd->port.count) <= 0) {
54378 spin_unlock_irqrestore(&hvcsd->lock, flags);
54379 return -ENODEV;
54380 }
54381@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54382 {
54383 struct hvcs_struct *hvcsd = tty->driver_data;
54384
54385- if (!hvcsd || hvcsd->port.count <= 0)
54386+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54387 return 0;
54388
54389 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54390diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54391index 4190199..06d5bfa 100644
54392--- a/drivers/tty/hvc/hvsi.c
54393+++ b/drivers/tty/hvc/hvsi.c
54394@@ -85,7 +85,7 @@ struct hvsi_struct {
54395 int n_outbuf;
54396 uint32_t vtermno;
54397 uint32_t virq;
54398- atomic_t seqno; /* HVSI packet sequence number */
54399+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54400 uint16_t mctrl;
54401 uint8_t state; /* HVSI protocol state */
54402 uint8_t flags;
54403@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54404
54405 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54406 packet.hdr.len = sizeof(struct hvsi_query_response);
54407- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54408+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54409 packet.verb = VSV_SEND_VERSION_NUMBER;
54410 packet.u.version = HVSI_VERSION;
54411 packet.query_seqno = query_seqno+1;
54412@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54413
54414 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54415 packet.hdr.len = sizeof(struct hvsi_query);
54416- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54417+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54418 packet.verb = verb;
54419
54420 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54421@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54422 int wrote;
54423
54424 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54425- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54426+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54427 packet.hdr.len = sizeof(struct hvsi_control);
54428 packet.verb = VSV_SET_MODEM_CTL;
54429 packet.mask = HVSI_TSDTR;
54430@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54431 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54432
54433 packet.hdr.type = VS_DATA_PACKET_HEADER;
54434- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54435+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54436 packet.hdr.len = count + sizeof(struct hvsi_header);
54437 memcpy(&packet.data, buf, count);
54438
54439@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54440 struct hvsi_control packet __ALIGNED__;
54441
54442 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54443- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54444+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54445 packet.hdr.len = 6;
54446 packet.verb = VSV_CLOSE_PROTOCOL;
54447
54448@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54449
54450 tty_port_tty_set(&hp->port, tty);
54451 spin_lock_irqsave(&hp->lock, flags);
54452- hp->port.count++;
54453+ atomic_inc(&hp->port.count);
54454 atomic_set(&hp->seqno, 0);
54455 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54456 spin_unlock_irqrestore(&hp->lock, flags);
54457@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54458
54459 spin_lock_irqsave(&hp->lock, flags);
54460
54461- if (--hp->port.count == 0) {
54462+ if (atomic_dec_return(&hp->port.count) == 0) {
54463 tty_port_tty_set(&hp->port, NULL);
54464 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54465
54466@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54467
54468 spin_lock_irqsave(&hp->lock, flags);
54469 }
54470- } else if (hp->port.count < 0)
54471+ } else if (atomic_read(&hp->port.count) < 0)
54472 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54473- hp - hvsi_ports, hp->port.count);
54474+ hp - hvsi_ports, atomic_read(&hp->port.count));
54475
54476 spin_unlock_irqrestore(&hp->lock, flags);
54477 }
54478@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54479 tty_port_tty_set(&hp->port, NULL);
54480
54481 spin_lock_irqsave(&hp->lock, flags);
54482- hp->port.count = 0;
54483+ atomic_set(&hp->port.count, 0);
54484 hp->n_outbuf = 0;
54485 spin_unlock_irqrestore(&hp->lock, flags);
54486 }
54487diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54488index a270f04..7c77b5d 100644
54489--- a/drivers/tty/hvc/hvsi_lib.c
54490+++ b/drivers/tty/hvc/hvsi_lib.c
54491@@ -8,7 +8,7 @@
54492
54493 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54494 {
54495- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54496+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54497
54498 /* Assumes that always succeeds, works in practice */
54499 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54500@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54501
54502 /* Reset state */
54503 pv->established = 0;
54504- atomic_set(&pv->seqno, 0);
54505+ atomic_set_unchecked(&pv->seqno, 0);
54506
54507 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54508
54509diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54510index 345cebb..d5a1e9e 100644
54511--- a/drivers/tty/ipwireless/tty.c
54512+++ b/drivers/tty/ipwireless/tty.c
54513@@ -28,6 +28,7 @@
54514 #include <linux/tty_driver.h>
54515 #include <linux/tty_flip.h>
54516 #include <linux/uaccess.h>
54517+#include <asm/local.h>
54518
54519 #include "tty.h"
54520 #include "network.h"
54521@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54522 return -ENODEV;
54523
54524 mutex_lock(&tty->ipw_tty_mutex);
54525- if (tty->port.count == 0)
54526+ if (atomic_read(&tty->port.count) == 0)
54527 tty->tx_bytes_queued = 0;
54528
54529- tty->port.count++;
54530+ atomic_inc(&tty->port.count);
54531
54532 tty->port.tty = linux_tty;
54533 linux_tty->driver_data = tty;
54534@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54535
54536 static void do_ipw_close(struct ipw_tty *tty)
54537 {
54538- tty->port.count--;
54539-
54540- if (tty->port.count == 0) {
54541+ if (atomic_dec_return(&tty->port.count) == 0) {
54542 struct tty_struct *linux_tty = tty->port.tty;
54543
54544 if (linux_tty != NULL) {
54545@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54546 return;
54547
54548 mutex_lock(&tty->ipw_tty_mutex);
54549- if (tty->port.count == 0) {
54550+ if (atomic_read(&tty->port.count) == 0) {
54551 mutex_unlock(&tty->ipw_tty_mutex);
54552 return;
54553 }
54554@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54555
54556 mutex_lock(&tty->ipw_tty_mutex);
54557
54558- if (!tty->port.count) {
54559+ if (!atomic_read(&tty->port.count)) {
54560 mutex_unlock(&tty->ipw_tty_mutex);
54561 return;
54562 }
54563@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54564 return -ENODEV;
54565
54566 mutex_lock(&tty->ipw_tty_mutex);
54567- if (!tty->port.count) {
54568+ if (!atomic_read(&tty->port.count)) {
54569 mutex_unlock(&tty->ipw_tty_mutex);
54570 return -EINVAL;
54571 }
54572@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54573 if (!tty)
54574 return -ENODEV;
54575
54576- if (!tty->port.count)
54577+ if (!atomic_read(&tty->port.count))
54578 return -EINVAL;
54579
54580 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54581@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54582 if (!tty)
54583 return 0;
54584
54585- if (!tty->port.count)
54586+ if (!atomic_read(&tty->port.count))
54587 return 0;
54588
54589 return tty->tx_bytes_queued;
54590@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54591 if (!tty)
54592 return -ENODEV;
54593
54594- if (!tty->port.count)
54595+ if (!atomic_read(&tty->port.count))
54596 return -EINVAL;
54597
54598 return get_control_lines(tty);
54599@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54600 if (!tty)
54601 return -ENODEV;
54602
54603- if (!tty->port.count)
54604+ if (!atomic_read(&tty->port.count))
54605 return -EINVAL;
54606
54607 return set_control_lines(tty, set, clear);
54608@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54609 if (!tty)
54610 return -ENODEV;
54611
54612- if (!tty->port.count)
54613+ if (!atomic_read(&tty->port.count))
54614 return -EINVAL;
54615
54616 /* FIXME: Exactly how is the tty object locked here .. */
54617@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54618 * are gone */
54619 mutex_lock(&ttyj->ipw_tty_mutex);
54620 }
54621- while (ttyj->port.count)
54622+ while (atomic_read(&ttyj->port.count))
54623 do_ipw_close(ttyj);
54624 ipwireless_disassociate_network_ttys(network,
54625 ttyj->channel_idx);
54626diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54627index 14c54e0..1efd4f2 100644
54628--- a/drivers/tty/moxa.c
54629+++ b/drivers/tty/moxa.c
54630@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54631 }
54632
54633 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54634- ch->port.count++;
54635+ atomic_inc(&ch->port.count);
54636 tty->driver_data = ch;
54637 tty_port_tty_set(&ch->port, tty);
54638 mutex_lock(&ch->port.mutex);
54639diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54640index 2c34c32..81d10e1 100644
54641--- a/drivers/tty/n_gsm.c
54642+++ b/drivers/tty/n_gsm.c
54643@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54644 spin_lock_init(&dlci->lock);
54645 mutex_init(&dlci->mutex);
54646 dlci->fifo = &dlci->_fifo;
54647- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54648+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54649 kfree(dlci);
54650 return NULL;
54651 }
54652@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54653 struct gsm_dlci *dlci = tty->driver_data;
54654 struct tty_port *port = &dlci->port;
54655
54656- port->count++;
54657+ atomic_inc(&port->count);
54658 tty_port_tty_set(port, tty);
54659
54660 dlci->modem_rx = 0;
54661diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54662index 396344c..875c1d6 100644
54663--- a/drivers/tty/n_tty.c
54664+++ b/drivers/tty/n_tty.c
54665@@ -116,7 +116,7 @@ struct n_tty_data {
54666 int minimum_to_wake;
54667
54668 /* consumer-published */
54669- size_t read_tail;
54670+ size_t read_tail __intentional_overflow(-1);
54671 size_t line_start;
54672
54673 /* protected by output lock */
54674@@ -2572,6 +2572,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54675 {
54676 *ops = tty_ldisc_N_TTY;
54677 ops->owner = NULL;
54678- ops->refcount = ops->flags = 0;
54679+ atomic_set(&ops->refcount, 0);
54680+ ops->flags = 0;
54681 }
54682 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54683diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54684index 4d5e840..a2340a6 100644
54685--- a/drivers/tty/pty.c
54686+++ b/drivers/tty/pty.c
54687@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54688 panic("Couldn't register Unix98 pts driver");
54689
54690 /* Now create the /dev/ptmx special device */
54691+ pax_open_kernel();
54692 tty_default_fops(&ptmx_fops);
54693- ptmx_fops.open = ptmx_open;
54694+ *(void **)&ptmx_fops.open = ptmx_open;
54695+ pax_close_kernel();
54696
54697 cdev_init(&ptmx_cdev, &ptmx_fops);
54698 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54699diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54700index c8dd8dc..dca6cfd 100644
54701--- a/drivers/tty/rocket.c
54702+++ b/drivers/tty/rocket.c
54703@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54704 tty->driver_data = info;
54705 tty_port_tty_set(port, tty);
54706
54707- if (port->count++ == 0) {
54708+ if (atomic_inc_return(&port->count) == 1) {
54709 atomic_inc(&rp_num_ports_open);
54710
54711 #ifdef ROCKET_DEBUG_OPEN
54712@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54713 #endif
54714 }
54715 #ifdef ROCKET_DEBUG_OPEN
54716- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54717+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54718 #endif
54719
54720 /*
54721@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54722 spin_unlock_irqrestore(&info->port.lock, flags);
54723 return;
54724 }
54725- if (info->port.count)
54726+ if (atomic_read(&info->port.count))
54727 atomic_dec(&rp_num_ports_open);
54728 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54729 spin_unlock_irqrestore(&info->port.lock, flags);
54730diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
54731index 4506e40..ac0b470 100644
54732--- a/drivers/tty/serial/8250/8250_core.c
54733+++ b/drivers/tty/serial/8250/8250_core.c
54734@@ -3241,9 +3241,9 @@ static void univ8250_release_port(struct uart_port *port)
54735
54736 static void univ8250_rsa_support(struct uart_ops *ops)
54737 {
54738- ops->config_port = univ8250_config_port;
54739- ops->request_port = univ8250_request_port;
54740- ops->release_port = univ8250_release_port;
54741+ *(void **)&ops->config_port = univ8250_config_port;
54742+ *(void **)&ops->request_port = univ8250_request_port;
54743+ *(void **)&ops->release_port = univ8250_release_port;
54744 }
54745
54746 #else
54747@@ -3286,8 +3286,10 @@ static void __init serial8250_isa_init_ports(void)
54748 }
54749
54750 /* chain base port ops to support Remote Supervisor Adapter */
54751- univ8250_port_ops = *base_ops;
54752+ pax_open_kernel();
54753+ memcpy((void *)&univ8250_port_ops, base_ops, sizeof univ8250_port_ops);
54754 univ8250_rsa_support(&univ8250_port_ops);
54755+ pax_close_kernel();
54756
54757 if (share_irqs)
54758 irqflag = IRQF_SHARED;
54759diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54760index aa28209..e08fb85 100644
54761--- a/drivers/tty/serial/ioc4_serial.c
54762+++ b/drivers/tty/serial/ioc4_serial.c
54763@@ -437,7 +437,7 @@ struct ioc4_soft {
54764 } is_intr_info[MAX_IOC4_INTR_ENTS];
54765
54766 /* Number of entries active in the above array */
54767- atomic_t is_num_intrs;
54768+ atomic_unchecked_t is_num_intrs;
54769 } is_intr_type[IOC4_NUM_INTR_TYPES];
54770
54771 /* is_ir_lock must be held while
54772@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54773 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54774 || (type == IOC4_OTHER_INTR_TYPE)));
54775
54776- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54777+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54778 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54779
54780 /* Save off the lower level interrupt handler */
54781@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54782
54783 soft = arg;
54784 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54785- num_intrs = (int)atomic_read(
54786+ num_intrs = (int)atomic_read_unchecked(
54787 &soft->is_intr_type[intr_type].is_num_intrs);
54788
54789 this_mir = this_ir = pending_intrs(soft, intr_type);
54790diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54791index 129dc5b..1da5bb8 100644
54792--- a/drivers/tty/serial/kgdb_nmi.c
54793+++ b/drivers/tty/serial/kgdb_nmi.c
54794@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54795 * I/O utilities that messages sent to the console will automatically
54796 * be displayed on the dbg_io.
54797 */
54798- dbg_io_ops->is_console = true;
54799+ pax_open_kernel();
54800+ *(int *)&dbg_io_ops->is_console = true;
54801+ pax_close_kernel();
54802
54803 return 0;
54804 }
54805diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54806index a260cde..6b2b5ce 100644
54807--- a/drivers/tty/serial/kgdboc.c
54808+++ b/drivers/tty/serial/kgdboc.c
54809@@ -24,8 +24,9 @@
54810 #define MAX_CONFIG_LEN 40
54811
54812 static struct kgdb_io kgdboc_io_ops;
54813+static struct kgdb_io kgdboc_io_ops_console;
54814
54815-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54816+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54817 static int configured = -1;
54818
54819 static char config[MAX_CONFIG_LEN];
54820@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54821 kgdboc_unregister_kbd();
54822 if (configured == 1)
54823 kgdb_unregister_io_module(&kgdboc_io_ops);
54824+ else if (configured == 2)
54825+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54826 }
54827
54828 static int configure_kgdboc(void)
54829@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54830 int err;
54831 char *cptr = config;
54832 struct console *cons;
54833+ int is_console = 0;
54834
54835 err = kgdboc_option_setup(config);
54836 if (err || !strlen(config) || isspace(config[0]))
54837 goto noconfig;
54838
54839 err = -ENODEV;
54840- kgdboc_io_ops.is_console = 0;
54841 kgdb_tty_driver = NULL;
54842
54843 kgdboc_use_kms = 0;
54844@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54845 int idx;
54846 if (cons->device && cons->device(cons, &idx) == p &&
54847 idx == tty_line) {
54848- kgdboc_io_ops.is_console = 1;
54849+ is_console = 1;
54850 break;
54851 }
54852 cons = cons->next;
54853@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54854 kgdb_tty_line = tty_line;
54855
54856 do_register:
54857- err = kgdb_register_io_module(&kgdboc_io_ops);
54858+ if (is_console) {
54859+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54860+ configured = 2;
54861+ } else {
54862+ err = kgdb_register_io_module(&kgdboc_io_ops);
54863+ configured = 1;
54864+ }
54865 if (err)
54866 goto noconfig;
54867
54868@@ -205,8 +214,6 @@ do_register:
54869 if (err)
54870 goto nmi_con_failed;
54871
54872- configured = 1;
54873-
54874 return 0;
54875
54876 nmi_con_failed:
54877@@ -223,7 +230,7 @@ noconfig:
54878 static int __init init_kgdboc(void)
54879 {
54880 /* Already configured? */
54881- if (configured == 1)
54882+ if (configured >= 1)
54883 return 0;
54884
54885 return configure_kgdboc();
54886@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54887 if (config[len - 1] == '\n')
54888 config[len - 1] = '\0';
54889
54890- if (configured == 1)
54891+ if (configured >= 1)
54892 cleanup_kgdboc();
54893
54894 /* Go and configure with the new params. */
54895@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54896 .post_exception = kgdboc_post_exp_handler,
54897 };
54898
54899+static struct kgdb_io kgdboc_io_ops_console = {
54900+ .name = "kgdboc",
54901+ .read_char = kgdboc_get_char,
54902+ .write_char = kgdboc_put_char,
54903+ .pre_exception = kgdboc_pre_exp_handler,
54904+ .post_exception = kgdboc_post_exp_handler,
54905+ .is_console = 1
54906+};
54907+
54908 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54909 /* This is only available if kgdboc is a built in for early debugging */
54910 static int __init kgdboc_early_init(char *opt)
54911diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54912index b73889c..9f74f0a 100644
54913--- a/drivers/tty/serial/msm_serial.c
54914+++ b/drivers/tty/serial/msm_serial.c
54915@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54916 .cons = MSM_CONSOLE,
54917 };
54918
54919-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54920+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54921
54922 static const struct of_device_id msm_uartdm_table[] = {
54923 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54924@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54925 line = pdev->id;
54926
54927 if (line < 0)
54928- line = atomic_inc_return(&msm_uart_next_id) - 1;
54929+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54930
54931 if (unlikely(line < 0 || line >= UART_NR))
54932 return -ENXIO;
54933diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54934index a0ae942..befa48d 100644
54935--- a/drivers/tty/serial/samsung.c
54936+++ b/drivers/tty/serial/samsung.c
54937@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54938 ourport->tx_in_progress = 0;
54939 }
54940
54941+static int s3c64xx_serial_startup(struct uart_port *port);
54942 static int s3c24xx_serial_startup(struct uart_port *port)
54943 {
54944 struct s3c24xx_uart_port *ourport = to_ourport(port);
54945 int ret;
54946
54947+ /* Startup sequence is different for s3c64xx and higher SoC's */
54948+ if (s3c24xx_serial_has_interrupt_mask(port))
54949+ return s3c64xx_serial_startup(port);
54950+
54951 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54952 port, (unsigned long long)port->mapbase, port->membase);
54953
54954@@ -1698,10 +1703,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54955 /* setup info for port */
54956 port->dev = &platdev->dev;
54957
54958- /* Startup sequence is different for s3c64xx and higher SoC's */
54959- if (s3c24xx_serial_has_interrupt_mask(port))
54960- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54961-
54962 port->uartclk = 1;
54963
54964 if (cfg->uart_flags & UPF_CONS_FLOW) {
54965diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54966index 0b7bb12..ebe191a 100644
54967--- a/drivers/tty/serial/serial_core.c
54968+++ b/drivers/tty/serial/serial_core.c
54969@@ -1376,7 +1376,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54970 state = drv->state + tty->index;
54971 port = &state->port;
54972 spin_lock_irq(&port->lock);
54973- --port->count;
54974+ atomic_dec(&port->count);
54975 spin_unlock_irq(&port->lock);
54976 return;
54977 }
54978@@ -1386,7 +1386,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54979
54980 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54981
54982- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54983+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54984 return;
54985
54986 /*
54987@@ -1510,7 +1510,7 @@ static void uart_hangup(struct tty_struct *tty)
54988 uart_flush_buffer(tty);
54989 uart_shutdown(tty, state);
54990 spin_lock_irqsave(&port->lock, flags);
54991- port->count = 0;
54992+ atomic_set(&port->count, 0);
54993 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54994 spin_unlock_irqrestore(&port->lock, flags);
54995 tty_port_tty_set(port, NULL);
54996@@ -1597,7 +1597,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54997 pr_debug("uart_open(%d) called\n", line);
54998
54999 spin_lock_irq(&port->lock);
55000- ++port->count;
55001+ atomic_inc(&port->count);
55002 spin_unlock_irq(&port->lock);
55003
55004 /*
55005diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
55006index b1c6bd3..5f038e2 100644
55007--- a/drivers/tty/serial/uartlite.c
55008+++ b/drivers/tty/serial/uartlite.c
55009@@ -341,13 +341,13 @@ static int ulite_request_port(struct uart_port *port)
55010 return -EBUSY;
55011 }
55012
55013- port->private_data = &uartlite_be;
55014+ port->private_data = (void *)&uartlite_be;
55015 ret = uart_in32(ULITE_CONTROL, port);
55016 uart_out32(ULITE_CONTROL_RST_TX, ULITE_CONTROL, port);
55017 ret = uart_in32(ULITE_STATUS, port);
55018 /* Endianess detection */
55019 if ((ret & ULITE_STATUS_TXEMPTY) != ULITE_STATUS_TXEMPTY)
55020- port->private_data = &uartlite_le;
55021+ port->private_data = (void *)&uartlite_le;
55022
55023 return 0;
55024 }
55025diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
55026index b799170..87dafd5 100644
55027--- a/drivers/tty/synclink.c
55028+++ b/drivers/tty/synclink.c
55029@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
55030
55031 if (debug_level >= DEBUG_LEVEL_INFO)
55032 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
55033- __FILE__,__LINE__, info->device_name, info->port.count);
55034+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55035
55036 if (tty_port_close_start(&info->port, tty, filp) == 0)
55037 goto cleanup;
55038@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
55039 cleanup:
55040 if (debug_level >= DEBUG_LEVEL_INFO)
55041 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
55042- tty->driver->name, info->port.count);
55043+ tty->driver->name, atomic_read(&info->port.count));
55044
55045 } /* end of mgsl_close() */
55046
55047@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
55048
55049 mgsl_flush_buffer(tty);
55050 shutdown(info);
55051-
55052- info->port.count = 0;
55053+
55054+ atomic_set(&info->port.count, 0);
55055 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55056 info->port.tty = NULL;
55057
55058@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
55059
55060 if (debug_level >= DEBUG_LEVEL_INFO)
55061 printk("%s(%d):block_til_ready before block on %s count=%d\n",
55062- __FILE__,__LINE__, tty->driver->name, port->count );
55063+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55064
55065 spin_lock_irqsave(&info->irq_spinlock, flags);
55066- port->count--;
55067+ atomic_dec(&port->count);
55068 spin_unlock_irqrestore(&info->irq_spinlock, flags);
55069 port->blocked_open++;
55070
55071@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
55072
55073 if (debug_level >= DEBUG_LEVEL_INFO)
55074 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
55075- __FILE__,__LINE__, tty->driver->name, port->count );
55076+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55077
55078 tty_unlock(tty);
55079 schedule();
55080@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
55081
55082 /* FIXME: Racy on hangup during close wait */
55083 if (!tty_hung_up_p(filp))
55084- port->count++;
55085+ atomic_inc(&port->count);
55086 port->blocked_open--;
55087
55088 if (debug_level >= DEBUG_LEVEL_INFO)
55089 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
55090- __FILE__,__LINE__, tty->driver->name, port->count );
55091+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55092
55093 if (!retval)
55094 port->flags |= ASYNC_NORMAL_ACTIVE;
55095@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
55096
55097 if (debug_level >= DEBUG_LEVEL_INFO)
55098 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
55099- __FILE__,__LINE__,tty->driver->name, info->port.count);
55100+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
55101
55102 /* If port is closing, signal caller to try again */
55103 if (info->port.flags & ASYNC_CLOSING){
55104@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
55105 spin_unlock_irqrestore(&info->netlock, flags);
55106 goto cleanup;
55107 }
55108- info->port.count++;
55109+ atomic_inc(&info->port.count);
55110 spin_unlock_irqrestore(&info->netlock, flags);
55111
55112- if (info->port.count == 1) {
55113+ if (atomic_read(&info->port.count) == 1) {
55114 /* 1st open on this device, init hardware */
55115 retval = startup(info);
55116 if (retval < 0)
55117@@ -3442,8 +3442,8 @@ cleanup:
55118 if (retval) {
55119 if (tty->count == 1)
55120 info->port.tty = NULL; /* tty layer will release tty struct */
55121- if(info->port.count)
55122- info->port.count--;
55123+ if (atomic_read(&info->port.count))
55124+ atomic_dec(&info->port.count);
55125 }
55126
55127 return retval;
55128@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55129 unsigned short new_crctype;
55130
55131 /* return error if TTY interface open */
55132- if (info->port.count)
55133+ if (atomic_read(&info->port.count))
55134 return -EBUSY;
55135
55136 switch (encoding)
55137@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
55138
55139 /* arbitrate between network and tty opens */
55140 spin_lock_irqsave(&info->netlock, flags);
55141- if (info->port.count != 0 || info->netcount != 0) {
55142+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55143 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55144 spin_unlock_irqrestore(&info->netlock, flags);
55145 return -EBUSY;
55146@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55147 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55148
55149 /* return error if TTY interface open */
55150- if (info->port.count)
55151+ if (atomic_read(&info->port.count))
55152 return -EBUSY;
55153
55154 if (cmd != SIOCWANDEV)
55155diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
55156index 0e8c39b..e0cb171 100644
55157--- a/drivers/tty/synclink_gt.c
55158+++ b/drivers/tty/synclink_gt.c
55159@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55160 tty->driver_data = info;
55161 info->port.tty = tty;
55162
55163- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
55164+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
55165
55166 /* If port is closing, signal caller to try again */
55167 if (info->port.flags & ASYNC_CLOSING){
55168@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55169 mutex_unlock(&info->port.mutex);
55170 goto cleanup;
55171 }
55172- info->port.count++;
55173+ atomic_inc(&info->port.count);
55174 spin_unlock_irqrestore(&info->netlock, flags);
55175
55176- if (info->port.count == 1) {
55177+ if (atomic_read(&info->port.count) == 1) {
55178 /* 1st open on this device, init hardware */
55179 retval = startup(info);
55180 if (retval < 0) {
55181@@ -715,8 +715,8 @@ cleanup:
55182 if (retval) {
55183 if (tty->count == 1)
55184 info->port.tty = NULL; /* tty layer will release tty struct */
55185- if(info->port.count)
55186- info->port.count--;
55187+ if(atomic_read(&info->port.count))
55188+ atomic_dec(&info->port.count);
55189 }
55190
55191 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
55192@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55193
55194 if (sanity_check(info, tty->name, "close"))
55195 return;
55196- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
55197+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
55198
55199 if (tty_port_close_start(&info->port, tty, filp) == 0)
55200 goto cleanup;
55201@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55202 tty_port_close_end(&info->port, tty);
55203 info->port.tty = NULL;
55204 cleanup:
55205- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
55206+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
55207 }
55208
55209 static void hangup(struct tty_struct *tty)
55210@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
55211 shutdown(info);
55212
55213 spin_lock_irqsave(&info->port.lock, flags);
55214- info->port.count = 0;
55215+ atomic_set(&info->port.count, 0);
55216 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55217 info->port.tty = NULL;
55218 spin_unlock_irqrestore(&info->port.lock, flags);
55219@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55220 unsigned short new_crctype;
55221
55222 /* return error if TTY interface open */
55223- if (info->port.count)
55224+ if (atomic_read(&info->port.count))
55225 return -EBUSY;
55226
55227 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
55228@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
55229
55230 /* arbitrate between network and tty opens */
55231 spin_lock_irqsave(&info->netlock, flags);
55232- if (info->port.count != 0 || info->netcount != 0) {
55233+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55234 DBGINFO(("%s hdlc_open busy\n", dev->name));
55235 spin_unlock_irqrestore(&info->netlock, flags);
55236 return -EBUSY;
55237@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55238 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
55239
55240 /* return error if TTY interface open */
55241- if (info->port.count)
55242+ if (atomic_read(&info->port.count))
55243 return -EBUSY;
55244
55245 if (cmd != SIOCWANDEV)
55246@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
55247 if (port == NULL)
55248 continue;
55249 spin_lock(&port->lock);
55250- if ((port->port.count || port->netcount) &&
55251+ if ((atomic_read(&port->port.count) || port->netcount) &&
55252 port->pending_bh && !port->bh_running &&
55253 !port->bh_requested) {
55254 DBGISR(("%s bh queued\n", port->device_name));
55255@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55256 add_wait_queue(&port->open_wait, &wait);
55257
55258 spin_lock_irqsave(&info->lock, flags);
55259- port->count--;
55260+ atomic_dec(&port->count);
55261 spin_unlock_irqrestore(&info->lock, flags);
55262 port->blocked_open++;
55263
55264@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55265 remove_wait_queue(&port->open_wait, &wait);
55266
55267 if (!tty_hung_up_p(filp))
55268- port->count++;
55269+ atomic_inc(&port->count);
55270 port->blocked_open--;
55271
55272 if (!retval)
55273diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
55274index c3f9091..abe4601 100644
55275--- a/drivers/tty/synclinkmp.c
55276+++ b/drivers/tty/synclinkmp.c
55277@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55278
55279 if (debug_level >= DEBUG_LEVEL_INFO)
55280 printk("%s(%d):%s open(), old ref count = %d\n",
55281- __FILE__,__LINE__,tty->driver->name, info->port.count);
55282+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
55283
55284 /* If port is closing, signal caller to try again */
55285 if (info->port.flags & ASYNC_CLOSING){
55286@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55287 spin_unlock_irqrestore(&info->netlock, flags);
55288 goto cleanup;
55289 }
55290- info->port.count++;
55291+ atomic_inc(&info->port.count);
55292 spin_unlock_irqrestore(&info->netlock, flags);
55293
55294- if (info->port.count == 1) {
55295+ if (atomic_read(&info->port.count) == 1) {
55296 /* 1st open on this device, init hardware */
55297 retval = startup(info);
55298 if (retval < 0)
55299@@ -796,8 +796,8 @@ cleanup:
55300 if (retval) {
55301 if (tty->count == 1)
55302 info->port.tty = NULL; /* tty layer will release tty struct */
55303- if(info->port.count)
55304- info->port.count--;
55305+ if(atomic_read(&info->port.count))
55306+ atomic_dec(&info->port.count);
55307 }
55308
55309 return retval;
55310@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55311
55312 if (debug_level >= DEBUG_LEVEL_INFO)
55313 printk("%s(%d):%s close() entry, count=%d\n",
55314- __FILE__,__LINE__, info->device_name, info->port.count);
55315+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55316
55317 if (tty_port_close_start(&info->port, tty, filp) == 0)
55318 goto cleanup;
55319@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55320 cleanup:
55321 if (debug_level >= DEBUG_LEVEL_INFO)
55322 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55323- tty->driver->name, info->port.count);
55324+ tty->driver->name, atomic_read(&info->port.count));
55325 }
55326
55327 /* Called by tty_hangup() when a hangup is signaled.
55328@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55329 shutdown(info);
55330
55331 spin_lock_irqsave(&info->port.lock, flags);
55332- info->port.count = 0;
55333+ atomic_set(&info->port.count, 0);
55334 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55335 info->port.tty = NULL;
55336 spin_unlock_irqrestore(&info->port.lock, flags);
55337@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55338 unsigned short new_crctype;
55339
55340 /* return error if TTY interface open */
55341- if (info->port.count)
55342+ if (atomic_read(&info->port.count))
55343 return -EBUSY;
55344
55345 switch (encoding)
55346@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55347
55348 /* arbitrate between network and tty opens */
55349 spin_lock_irqsave(&info->netlock, flags);
55350- if (info->port.count != 0 || info->netcount != 0) {
55351+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55352 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55353 spin_unlock_irqrestore(&info->netlock, flags);
55354 return -EBUSY;
55355@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55356 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55357
55358 /* return error if TTY interface open */
55359- if (info->port.count)
55360+ if (atomic_read(&info->port.count))
55361 return -EBUSY;
55362
55363 if (cmd != SIOCWANDEV)
55364@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55365 * do not request bottom half processing if the
55366 * device is not open in a normal mode.
55367 */
55368- if ( port && (port->port.count || port->netcount) &&
55369+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55370 port->pending_bh && !port->bh_running &&
55371 !port->bh_requested ) {
55372 if ( debug_level >= DEBUG_LEVEL_ISR )
55373@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55374
55375 if (debug_level >= DEBUG_LEVEL_INFO)
55376 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55377- __FILE__,__LINE__, tty->driver->name, port->count );
55378+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55379
55380 spin_lock_irqsave(&info->lock, flags);
55381- port->count--;
55382+ atomic_dec(&port->count);
55383 spin_unlock_irqrestore(&info->lock, flags);
55384 port->blocked_open++;
55385
55386@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55387
55388 if (debug_level >= DEBUG_LEVEL_INFO)
55389 printk("%s(%d):%s block_til_ready() count=%d\n",
55390- __FILE__,__LINE__, tty->driver->name, port->count );
55391+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55392
55393 tty_unlock(tty);
55394 schedule();
55395@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55396 set_current_state(TASK_RUNNING);
55397 remove_wait_queue(&port->open_wait, &wait);
55398 if (!tty_hung_up_p(filp))
55399- port->count++;
55400+ atomic_inc(&port->count);
55401 port->blocked_open--;
55402
55403 if (debug_level >= DEBUG_LEVEL_INFO)
55404 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55405- __FILE__,__LINE__, tty->driver->name, port->count );
55406+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55407
55408 if (!retval)
55409 port->flags |= ASYNC_NORMAL_ACTIVE;
55410diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55411index 843f2cd..7d530a6 100644
55412--- a/drivers/tty/sysrq.c
55413+++ b/drivers/tty/sysrq.c
55414@@ -1086,7 +1086,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55415 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55416 size_t count, loff_t *ppos)
55417 {
55418- if (count) {
55419+ if (count && capable(CAP_SYS_ADMIN)) {
55420 char c;
55421
55422 if (get_user(c, buf))
55423diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55424index e569546..fbce20c 100644
55425--- a/drivers/tty/tty_io.c
55426+++ b/drivers/tty/tty_io.c
55427@@ -3509,7 +3509,7 @@ EXPORT_SYMBOL(tty_devnum);
55428
55429 void tty_default_fops(struct file_operations *fops)
55430 {
55431- *fops = tty_fops;
55432+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55433 }
55434
55435 /*
55436diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55437index 3737f55..7cef448 100644
55438--- a/drivers/tty/tty_ldisc.c
55439+++ b/drivers/tty/tty_ldisc.c
55440@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55441 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55442 tty_ldiscs[disc] = new_ldisc;
55443 new_ldisc->num = disc;
55444- new_ldisc->refcount = 0;
55445+ atomic_set(&new_ldisc->refcount, 0);
55446 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55447
55448 return ret;
55449@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55450 return -EINVAL;
55451
55452 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55453- if (tty_ldiscs[disc]->refcount)
55454+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55455 ret = -EBUSY;
55456 else
55457 tty_ldiscs[disc] = NULL;
55458@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55459 if (ldops) {
55460 ret = ERR_PTR(-EAGAIN);
55461 if (try_module_get(ldops->owner)) {
55462- ldops->refcount++;
55463+ atomic_inc(&ldops->refcount);
55464 ret = ldops;
55465 }
55466 }
55467@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55468 unsigned long flags;
55469
55470 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55471- ldops->refcount--;
55472+ atomic_dec(&ldops->refcount);
55473 module_put(ldops->owner);
55474 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55475 }
55476diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55477index 40b31835..94d92ae 100644
55478--- a/drivers/tty/tty_port.c
55479+++ b/drivers/tty/tty_port.c
55480@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55481 unsigned long flags;
55482
55483 spin_lock_irqsave(&port->lock, flags);
55484- port->count = 0;
55485+ atomic_set(&port->count, 0);
55486 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55487 tty = port->tty;
55488 if (tty)
55489@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55490
55491 /* The port lock protects the port counts */
55492 spin_lock_irqsave(&port->lock, flags);
55493- port->count--;
55494+ atomic_dec(&port->count);
55495 port->blocked_open++;
55496 spin_unlock_irqrestore(&port->lock, flags);
55497
55498@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55499 we must not mess that up further */
55500 spin_lock_irqsave(&port->lock, flags);
55501 if (!tty_hung_up_p(filp))
55502- port->count++;
55503+ atomic_inc(&port->count);
55504 port->blocked_open--;
55505 if (retval == 0)
55506 port->flags |= ASYNC_NORMAL_ACTIVE;
55507@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55508 return 0;
55509
55510 spin_lock_irqsave(&port->lock, flags);
55511- if (tty->count == 1 && port->count != 1) {
55512+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55513 printk(KERN_WARNING
55514 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55515- port->count);
55516- port->count = 1;
55517+ atomic_read(&port->count));
55518+ atomic_set(&port->count, 1);
55519 }
55520- if (--port->count < 0) {
55521+ if (atomic_dec_return(&port->count) < 0) {
55522 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55523- port->count);
55524- port->count = 0;
55525+ atomic_read(&port->count));
55526+ atomic_set(&port->count, 0);
55527 }
55528
55529- if (port->count) {
55530+ if (atomic_read(&port->count)) {
55531 spin_unlock_irqrestore(&port->lock, flags);
55532 return 0;
55533 }
55534@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55535 struct file *filp)
55536 {
55537 spin_lock_irq(&port->lock);
55538- ++port->count;
55539+ atomic_inc(&port->count);
55540 spin_unlock_irq(&port->lock);
55541 tty_port_tty_set(port, tty);
55542
55543diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55544index 8a89f6e..50b32af 100644
55545--- a/drivers/tty/vt/keyboard.c
55546+++ b/drivers/tty/vt/keyboard.c
55547@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55548 kbd->kbdmode == VC_OFF) &&
55549 value != KVAL(K_SAK))
55550 return; /* SAK is allowed even in raw mode */
55551+
55552+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55553+ {
55554+ void *func = fn_handler[value];
55555+ if (func == fn_show_state || func == fn_show_ptregs ||
55556+ func == fn_show_mem)
55557+ return;
55558+ }
55559+#endif
55560+
55561 fn_handler[value](vc);
55562 }
55563
55564@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55565 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55566 return -EFAULT;
55567
55568- if (!capable(CAP_SYS_TTY_CONFIG))
55569- perm = 0;
55570-
55571 switch (cmd) {
55572 case KDGKBENT:
55573 /* Ensure another thread doesn't free it under us */
55574@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55575 spin_unlock_irqrestore(&kbd_event_lock, flags);
55576 return put_user(val, &user_kbe->kb_value);
55577 case KDSKBENT:
55578+ if (!capable(CAP_SYS_TTY_CONFIG))
55579+ perm = 0;
55580+
55581 if (!perm)
55582 return -EPERM;
55583 if (!i && v == K_NOSUCHMAP) {
55584@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55585 int i, j, k;
55586 int ret;
55587
55588- if (!capable(CAP_SYS_TTY_CONFIG))
55589- perm = 0;
55590-
55591 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55592 if (!kbs) {
55593 ret = -ENOMEM;
55594@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55595 kfree(kbs);
55596 return ((p && *p) ? -EOVERFLOW : 0);
55597 case KDSKBSENT:
55598+ if (!capable(CAP_SYS_TTY_CONFIG))
55599+ perm = 0;
55600+
55601 if (!perm) {
55602 ret = -EPERM;
55603 goto reterr;
55604diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55605index 65bf067..b3b2e13 100644
55606--- a/drivers/uio/uio.c
55607+++ b/drivers/uio/uio.c
55608@@ -25,6 +25,7 @@
55609 #include <linux/kobject.h>
55610 #include <linux/cdev.h>
55611 #include <linux/uio_driver.h>
55612+#include <asm/local.h>
55613
55614 #define UIO_MAX_DEVICES (1U << MINORBITS)
55615
55616@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55617 struct device_attribute *attr, char *buf)
55618 {
55619 struct uio_device *idev = dev_get_drvdata(dev);
55620- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55621+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55622 }
55623 static DEVICE_ATTR_RO(event);
55624
55625@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55626 {
55627 struct uio_device *idev = info->uio_dev;
55628
55629- atomic_inc(&idev->event);
55630+ atomic_inc_unchecked(&idev->event);
55631 wake_up_interruptible(&idev->wait);
55632 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55633 }
55634@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55635 }
55636
55637 listener->dev = idev;
55638- listener->event_count = atomic_read(&idev->event);
55639+ listener->event_count = atomic_read_unchecked(&idev->event);
55640 filep->private_data = listener;
55641
55642 if (idev->info->open) {
55643@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55644 return -EIO;
55645
55646 poll_wait(filep, &idev->wait, wait);
55647- if (listener->event_count != atomic_read(&idev->event))
55648+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55649 return POLLIN | POLLRDNORM;
55650 return 0;
55651 }
55652@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55653 do {
55654 set_current_state(TASK_INTERRUPTIBLE);
55655
55656- event_count = atomic_read(&idev->event);
55657+ event_count = atomic_read_unchecked(&idev->event);
55658 if (event_count != listener->event_count) {
55659 if (copy_to_user(buf, &event_count, count))
55660 retval = -EFAULT;
55661@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55662 static int uio_find_mem_index(struct vm_area_struct *vma)
55663 {
55664 struct uio_device *idev = vma->vm_private_data;
55665+ unsigned long size;
55666
55667 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55668- if (idev->info->mem[vma->vm_pgoff].size == 0)
55669+ size = idev->info->mem[vma->vm_pgoff].size;
55670+ if (size == 0)
55671+ return -1;
55672+ if (vma->vm_end - vma->vm_start > size)
55673 return -1;
55674 return (int)vma->vm_pgoff;
55675 }
55676@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55677 idev->owner = owner;
55678 idev->info = info;
55679 init_waitqueue_head(&idev->wait);
55680- atomic_set(&idev->event, 0);
55681+ atomic_set_unchecked(&idev->event, 0);
55682
55683 ret = uio_get_minor(idev);
55684 if (ret)
55685diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55686index 813d4d3..a71934f 100644
55687--- a/drivers/usb/atm/cxacru.c
55688+++ b/drivers/usb/atm/cxacru.c
55689@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55690 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55691 if (ret < 2)
55692 return -EINVAL;
55693- if (index < 0 || index > 0x7f)
55694+ if (index > 0x7f)
55695 return -EINVAL;
55696 pos += tmp;
55697
55698diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55699index dada014..1d0d517 100644
55700--- a/drivers/usb/atm/usbatm.c
55701+++ b/drivers/usb/atm/usbatm.c
55702@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55703 if (printk_ratelimit())
55704 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55705 __func__, vpi, vci);
55706- atomic_inc(&vcc->stats->rx_err);
55707+ atomic_inc_unchecked(&vcc->stats->rx_err);
55708 return;
55709 }
55710
55711@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55712 if (length > ATM_MAX_AAL5_PDU) {
55713 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55714 __func__, length, vcc);
55715- atomic_inc(&vcc->stats->rx_err);
55716+ atomic_inc_unchecked(&vcc->stats->rx_err);
55717 goto out;
55718 }
55719
55720@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55721 if (sarb->len < pdu_length) {
55722 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55723 __func__, pdu_length, sarb->len, vcc);
55724- atomic_inc(&vcc->stats->rx_err);
55725+ atomic_inc_unchecked(&vcc->stats->rx_err);
55726 goto out;
55727 }
55728
55729 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55730 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55731 __func__, vcc);
55732- atomic_inc(&vcc->stats->rx_err);
55733+ atomic_inc_unchecked(&vcc->stats->rx_err);
55734 goto out;
55735 }
55736
55737@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55738 if (printk_ratelimit())
55739 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55740 __func__, length);
55741- atomic_inc(&vcc->stats->rx_drop);
55742+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55743 goto out;
55744 }
55745
55746@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55747
55748 vcc->push(vcc, skb);
55749
55750- atomic_inc(&vcc->stats->rx);
55751+ atomic_inc_unchecked(&vcc->stats->rx);
55752 out:
55753 skb_trim(sarb, 0);
55754 }
55755@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55756 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55757
55758 usbatm_pop(vcc, skb);
55759- atomic_inc(&vcc->stats->tx);
55760+ atomic_inc_unchecked(&vcc->stats->tx);
55761
55762 skb = skb_dequeue(&instance->sndqueue);
55763 }
55764@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55765 if (!left--)
55766 return sprintf(page,
55767 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55768- atomic_read(&atm_dev->stats.aal5.tx),
55769- atomic_read(&atm_dev->stats.aal5.tx_err),
55770- atomic_read(&atm_dev->stats.aal5.rx),
55771- atomic_read(&atm_dev->stats.aal5.rx_err),
55772- atomic_read(&atm_dev->stats.aal5.rx_drop));
55773+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55774+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55775+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55776+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55777+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55778
55779 if (!left--) {
55780 if (instance->disconnected)
55781diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55782index 2a3bbdf..91d72cf 100644
55783--- a/drivers/usb/core/devices.c
55784+++ b/drivers/usb/core/devices.c
55785@@ -126,7 +126,7 @@ static const char format_endpt[] =
55786 * time it gets called.
55787 */
55788 static struct device_connect_event {
55789- atomic_t count;
55790+ atomic_unchecked_t count;
55791 wait_queue_head_t wait;
55792 } device_event = {
55793 .count = ATOMIC_INIT(1),
55794@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55795
55796 void usbfs_conn_disc_event(void)
55797 {
55798- atomic_add(2, &device_event.count);
55799+ atomic_add_unchecked(2, &device_event.count);
55800 wake_up(&device_event.wait);
55801 }
55802
55803@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55804
55805 poll_wait(file, &device_event.wait, wait);
55806
55807- event_count = atomic_read(&device_event.count);
55808+ event_count = atomic_read_unchecked(&device_event.count);
55809 if (file->f_version != event_count) {
55810 file->f_version = event_count;
55811 return POLLIN | POLLRDNORM;
55812diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55813index 4b0448c..fc84bec 100644
55814--- a/drivers/usb/core/devio.c
55815+++ b/drivers/usb/core/devio.c
55816@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55817 struct usb_dev_state *ps = file->private_data;
55818 struct usb_device *dev = ps->dev;
55819 ssize_t ret = 0;
55820- unsigned len;
55821+ size_t len;
55822 loff_t pos;
55823 int i;
55824
55825@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55826 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55827 struct usb_config_descriptor *config =
55828 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55829- unsigned int length = le16_to_cpu(config->wTotalLength);
55830+ size_t length = le16_to_cpu(config->wTotalLength);
55831
55832 if (*ppos < pos + length) {
55833
55834 /* The descriptor may claim to be longer than it
55835 * really is. Here is the actual allocated length. */
55836- unsigned alloclen =
55837+ size_t alloclen =
55838 le16_to_cpu(dev->config[i].desc.wTotalLength);
55839
55840- len = length - (*ppos - pos);
55841+ len = length + pos - *ppos;
55842 if (len > nbytes)
55843 len = nbytes;
55844
55845 /* Simply don't write (skip over) unallocated parts */
55846 if (alloclen > (*ppos - pos)) {
55847- alloclen -= (*ppos - pos);
55848+ alloclen = alloclen + pos - *ppos;
55849 if (copy_to_user(buf,
55850 dev->rawdescriptors[i] + (*ppos - pos),
55851 min(len, alloclen))) {
55852diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55853index 45a915c..09f9735 100644
55854--- a/drivers/usb/core/hcd.c
55855+++ b/drivers/usb/core/hcd.c
55856@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55857 */
55858 usb_get_urb(urb);
55859 atomic_inc(&urb->use_count);
55860- atomic_inc(&urb->dev->urbnum);
55861+ atomic_inc_unchecked(&urb->dev->urbnum);
55862 usbmon_urb_submit(&hcd->self, urb);
55863
55864 /* NOTE requirements on root-hub callers (usbfs and the hub
55865@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55866 urb->hcpriv = NULL;
55867 INIT_LIST_HEAD(&urb->urb_list);
55868 atomic_dec(&urb->use_count);
55869- atomic_dec(&urb->dev->urbnum);
55870+ atomic_dec_unchecked(&urb->dev->urbnum);
55871 if (atomic_read(&urb->reject))
55872 wake_up(&usb_kill_urb_queue);
55873 usb_put_urb(urb);
55874diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55875index 3b71516..1f26579 100644
55876--- a/drivers/usb/core/hub.c
55877+++ b/drivers/usb/core/hub.c
55878@@ -26,6 +26,7 @@
55879 #include <linux/mutex.h>
55880 #include <linux/random.h>
55881 #include <linux/pm_qos.h>
55882+#include <linux/grsecurity.h>
55883
55884 #include <asm/uaccess.h>
55885 #include <asm/byteorder.h>
55886@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55887 goto done;
55888 return;
55889 }
55890+
55891+ if (gr_handle_new_usb())
55892+ goto done;
55893+
55894 if (hub_is_superspeed(hub->hdev))
55895 unit_load = 150;
55896 else
55897diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55898index f368d20..0c30ac5 100644
55899--- a/drivers/usb/core/message.c
55900+++ b/drivers/usb/core/message.c
55901@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55902 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55903 * error number.
55904 */
55905-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55906+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55907 __u8 requesttype, __u16 value, __u16 index, void *data,
55908 __u16 size, int timeout)
55909 {
55910@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55911 * If successful, 0. Otherwise a negative error number. The number of actual
55912 * bytes transferred will be stored in the @actual_length parameter.
55913 */
55914-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55915+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55916 void *data, int len, int *actual_length, int timeout)
55917 {
55918 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55919@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55920 * bytes transferred will be stored in the @actual_length parameter.
55921 *
55922 */
55923-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55924+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55925 void *data, int len, int *actual_length, int timeout)
55926 {
55927 struct urb *urb;
55928diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55929index d269738..7340cd7 100644
55930--- a/drivers/usb/core/sysfs.c
55931+++ b/drivers/usb/core/sysfs.c
55932@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55933 struct usb_device *udev;
55934
55935 udev = to_usb_device(dev);
55936- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55937+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55938 }
55939 static DEVICE_ATTR_RO(urbnum);
55940
55941diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55942index 8d5b2f4..3896940 100644
55943--- a/drivers/usb/core/usb.c
55944+++ b/drivers/usb/core/usb.c
55945@@ -447,7 +447,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55946 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55947 dev->state = USB_STATE_ATTACHED;
55948 dev->lpm_disable_count = 1;
55949- atomic_set(&dev->urbnum, 0);
55950+ atomic_set_unchecked(&dev->urbnum, 0);
55951
55952 INIT_LIST_HEAD(&dev->ep0.urb_list);
55953 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55954diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55955index 8cfc319..4868255 100644
55956--- a/drivers/usb/early/ehci-dbgp.c
55957+++ b/drivers/usb/early/ehci-dbgp.c
55958@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55959
55960 #ifdef CONFIG_KGDB
55961 static struct kgdb_io kgdbdbgp_io_ops;
55962-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55963+static struct kgdb_io kgdbdbgp_io_ops_console;
55964+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55965 #else
55966 #define dbgp_kgdb_mode (0)
55967 #endif
55968@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55969 .write_char = kgdbdbgp_write_char,
55970 };
55971
55972+static struct kgdb_io kgdbdbgp_io_ops_console = {
55973+ .name = "kgdbdbgp",
55974+ .read_char = kgdbdbgp_read_char,
55975+ .write_char = kgdbdbgp_write_char,
55976+ .is_console = 1
55977+};
55978+
55979 static int kgdbdbgp_wait_time;
55980
55981 static int __init kgdbdbgp_parse_config(char *str)
55982@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55983 ptr++;
55984 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55985 }
55986- kgdb_register_io_module(&kgdbdbgp_io_ops);
55987- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55988+ if (early_dbgp_console.index != -1)
55989+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55990+ else
55991+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55992
55993 return 0;
55994 }
55995diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55996index 0495c94..289e201 100644
55997--- a/drivers/usb/gadget/configfs.c
55998+++ b/drivers/usb/gadget/configfs.c
55999@@ -571,7 +571,7 @@ static struct config_group *function_make(
56000 if (IS_ERR(fi))
56001 return ERR_CAST(fi);
56002
56003- ret = config_item_set_name(&fi->group.cg_item, name);
56004+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
56005 if (ret) {
56006 usb_put_function_instance(fi);
56007 return ERR_PTR(ret);
56008diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
56009index 7856b33..8b7fe09 100644
56010--- a/drivers/usb/gadget/function/f_uac1.c
56011+++ b/drivers/usb/gadget/function/f_uac1.c
56012@@ -14,6 +14,7 @@
56013 #include <linux/module.h>
56014 #include <linux/device.h>
56015 #include <linux/atomic.h>
56016+#include <linux/module.h>
56017
56018 #include "u_uac1.h"
56019
56020diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
56021index 7ee05793..2e31e99 100644
56022--- a/drivers/usb/gadget/function/u_serial.c
56023+++ b/drivers/usb/gadget/function/u_serial.c
56024@@ -732,9 +732,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
56025 spin_lock_irq(&port->port_lock);
56026
56027 /* already open? Great. */
56028- if (port->port.count) {
56029+ if (atomic_read(&port->port.count)) {
56030 status = 0;
56031- port->port.count++;
56032+ atomic_inc(&port->port.count);
56033
56034 /* currently opening/closing? wait ... */
56035 } else if (port->openclose) {
56036@@ -793,7 +793,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
56037 tty->driver_data = port;
56038 port->port.tty = tty;
56039
56040- port->port.count = 1;
56041+ atomic_set(&port->port.count, 1);
56042 port->openclose = false;
56043
56044 /* if connected, start the I/O stream */
56045@@ -835,11 +835,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
56046
56047 spin_lock_irq(&port->port_lock);
56048
56049- if (port->port.count != 1) {
56050- if (port->port.count == 0)
56051+ if (atomic_read(&port->port.count) != 1) {
56052+ if (atomic_read(&port->port.count) == 0)
56053 WARN_ON(1);
56054 else
56055- --port->port.count;
56056+ atomic_dec(&port->port.count);
56057 goto exit;
56058 }
56059
56060@@ -849,7 +849,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
56061 * and sleep if necessary
56062 */
56063 port->openclose = true;
56064- port->port.count = 0;
56065+ atomic_set(&port->port.count, 0);
56066
56067 gser = port->port_usb;
56068 if (gser && gser->disconnect)
56069@@ -1065,7 +1065,7 @@ static int gs_closed(struct gs_port *port)
56070 int cond;
56071
56072 spin_lock_irq(&port->port_lock);
56073- cond = (port->port.count == 0) && !port->openclose;
56074+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
56075 spin_unlock_irq(&port->port_lock);
56076 return cond;
56077 }
56078@@ -1208,7 +1208,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
56079 /* if it's already open, start I/O ... and notify the serial
56080 * protocol about open/close status (connect/disconnect).
56081 */
56082- if (port->port.count) {
56083+ if (atomic_read(&port->port.count)) {
56084 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
56085 gs_start_io(port);
56086 if (gser->connect)
56087@@ -1255,7 +1255,7 @@ void gserial_disconnect(struct gserial *gser)
56088
56089 port->port_usb = NULL;
56090 gser->ioport = NULL;
56091- if (port->port.count > 0 || port->openclose) {
56092+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
56093 wake_up_interruptible(&port->drain_wait);
56094 if (port->port.tty)
56095 tty_hangup(port->port.tty);
56096@@ -1271,7 +1271,7 @@ void gserial_disconnect(struct gserial *gser)
56097
56098 /* finally, free any unused/unusable I/O buffers */
56099 spin_lock_irqsave(&port->port_lock, flags);
56100- if (port->port.count == 0 && !port->openclose)
56101+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
56102 gs_buf_free(&port->port_write_buf);
56103 gs_free_requests(gser->out, &port->read_pool, NULL);
56104 gs_free_requests(gser->out, &port->read_queue, NULL);
56105diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
56106index c78c841..48fd281 100644
56107--- a/drivers/usb/gadget/function/u_uac1.c
56108+++ b/drivers/usb/gadget/function/u_uac1.c
56109@@ -17,6 +17,7 @@
56110 #include <linux/ctype.h>
56111 #include <linux/random.h>
56112 #include <linux/syscalls.h>
56113+#include <linux/module.h>
56114
56115 #include "u_uac1.h"
56116
56117diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
56118index 6920844..480bb7e 100644
56119--- a/drivers/usb/host/ehci-hub.c
56120+++ b/drivers/usb/host/ehci-hub.c
56121@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
56122 urb->transfer_flags = URB_DIR_IN;
56123 usb_get_urb(urb);
56124 atomic_inc(&urb->use_count);
56125- atomic_inc(&urb->dev->urbnum);
56126+ atomic_inc_unchecked(&urb->dev->urbnum);
56127 urb->setup_dma = dma_map_single(
56128 hcd->self.controller,
56129 urb->setup_packet,
56130@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
56131 urb->status = -EINPROGRESS;
56132 usb_get_urb(urb);
56133 atomic_inc(&urb->use_count);
56134- atomic_inc(&urb->dev->urbnum);
56135+ atomic_inc_unchecked(&urb->dev->urbnum);
56136 retval = submit_single_step_set_feature(hcd, urb, 0);
56137 if (!retval && !wait_for_completion_timeout(&done,
56138 msecs_to_jiffies(2000))) {
56139diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
56140index 1db0626..4948782 100644
56141--- a/drivers/usb/host/hwa-hc.c
56142+++ b/drivers/usb/host/hwa-hc.c
56143@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
56144 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
56145 struct wahc *wa = &hwahc->wa;
56146 struct device *dev = &wa->usb_iface->dev;
56147- u8 mas_le[UWB_NUM_MAS/8];
56148+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
56149+
56150+ if (mas_le == NULL)
56151+ return -ENOMEM;
56152
56153 /* Set the stream index */
56154 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
56155@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
56156 WUSB_REQ_SET_WUSB_MAS,
56157 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
56158 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
56159- mas_le, 32, USB_CTRL_SET_TIMEOUT);
56160+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
56161 if (result < 0)
56162 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
56163 out:
56164+ kfree(mas_le);
56165+
56166 return result;
56167 }
56168
56169diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
56170index a0a3827..d7ec10b 100644
56171--- a/drivers/usb/misc/appledisplay.c
56172+++ b/drivers/usb/misc/appledisplay.c
56173@@ -84,7 +84,7 @@ struct appledisplay {
56174 struct mutex sysfslock; /* concurrent read and write */
56175 };
56176
56177-static atomic_t count_displays = ATOMIC_INIT(0);
56178+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
56179 static struct workqueue_struct *wq;
56180
56181 static void appledisplay_complete(struct urb *urb)
56182@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
56183
56184 /* Register backlight device */
56185 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
56186- atomic_inc_return(&count_displays) - 1);
56187+ atomic_inc_return_unchecked(&count_displays) - 1);
56188 memset(&props, 0, sizeof(struct backlight_properties));
56189 props.type = BACKLIGHT_RAW;
56190 props.max_brightness = 0xff;
56191diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
56192index 3806e70..55c508b 100644
56193--- a/drivers/usb/serial/console.c
56194+++ b/drivers/usb/serial/console.c
56195@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
56196
56197 info->port = port;
56198
56199- ++port->port.count;
56200+ atomic_inc(&port->port.count);
56201 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
56202 if (serial->type->set_termios) {
56203 /*
56204@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
56205 }
56206 /* Now that any required fake tty operations are completed restore
56207 * the tty port count */
56208- --port->port.count;
56209+ atomic_dec(&port->port.count);
56210 /* The console is special in terms of closing the device so
56211 * indicate this port is now acting as a system console. */
56212 port->port.console = 1;
56213@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
56214 put_tty:
56215 tty_kref_put(tty);
56216 reset_open_count:
56217- port->port.count = 0;
56218+ atomic_set(&port->port.count, 0);
56219 usb_autopm_put_interface(serial->interface);
56220 error_get_interface:
56221 usb_serial_put(serial);
56222@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
56223 static void usb_console_write(struct console *co,
56224 const char *buf, unsigned count)
56225 {
56226- static struct usbcons_info *info = &usbcons_info;
56227+ struct usbcons_info *info = &usbcons_info;
56228 struct usb_serial_port *port = info->port;
56229 struct usb_serial *serial;
56230 int retval = -ENODEV;
56231diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
56232index 307e339..6aa97cb 100644
56233--- a/drivers/usb/storage/usb.h
56234+++ b/drivers/usb/storage/usb.h
56235@@ -63,7 +63,7 @@ struct us_unusual_dev {
56236 __u8 useProtocol;
56237 __u8 useTransport;
56238 int (*initFunction)(struct us_data *);
56239-};
56240+} __do_const;
56241
56242
56243 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
56244diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
56245index a863a98..d272795 100644
56246--- a/drivers/usb/usbip/vhci.h
56247+++ b/drivers/usb/usbip/vhci.h
56248@@ -83,7 +83,7 @@ struct vhci_hcd {
56249 unsigned resuming:1;
56250 unsigned long re_timeout;
56251
56252- atomic_t seqnum;
56253+ atomic_unchecked_t seqnum;
56254
56255 /*
56256 * NOTE:
56257diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
56258index e9ef1ec..c3a0b04 100644
56259--- a/drivers/usb/usbip/vhci_hcd.c
56260+++ b/drivers/usb/usbip/vhci_hcd.c
56261@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
56262
56263 spin_lock(&vdev->priv_lock);
56264
56265- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
56266+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56267 if (priv->seqnum == 0xffff)
56268 dev_info(&urb->dev->dev, "seqnum max\n");
56269
56270@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
56271 return -ENOMEM;
56272 }
56273
56274- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
56275+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56276 if (unlink->seqnum == 0xffff)
56277 pr_info("seqnum max\n");
56278
56279@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
56280 vdev->rhport = rhport;
56281 }
56282
56283- atomic_set(&vhci->seqnum, 0);
56284+ atomic_set_unchecked(&vhci->seqnum, 0);
56285 spin_lock_init(&vhci->lock);
56286
56287 hcd->power_budget = 0; /* no limit */
56288diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
56289index 00e4a54..d676f85 100644
56290--- a/drivers/usb/usbip/vhci_rx.c
56291+++ b/drivers/usb/usbip/vhci_rx.c
56292@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
56293 if (!urb) {
56294 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
56295 pr_info("max seqnum %d\n",
56296- atomic_read(&the_controller->seqnum));
56297+ atomic_read_unchecked(&the_controller->seqnum));
56298 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
56299 return;
56300 }
56301diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
56302index edc7267..9f65ce2 100644
56303--- a/drivers/usb/wusbcore/wa-hc.h
56304+++ b/drivers/usb/wusbcore/wa-hc.h
56305@@ -240,7 +240,7 @@ struct wahc {
56306 spinlock_t xfer_list_lock;
56307 struct work_struct xfer_enqueue_work;
56308 struct work_struct xfer_error_work;
56309- atomic_t xfer_id_count;
56310+ atomic_unchecked_t xfer_id_count;
56311
56312 kernel_ulong_t quirks;
56313 };
56314@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56315 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56316 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56317 wa->dto_in_use = 0;
56318- atomic_set(&wa->xfer_id_count, 1);
56319+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56320 /* init the buf in URBs */
56321 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56322 usb_init_urb(&(wa->buf_in_urbs[index]));
56323diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56324index 69af4fd..da390d7 100644
56325--- a/drivers/usb/wusbcore/wa-xfer.c
56326+++ b/drivers/usb/wusbcore/wa-xfer.c
56327@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56328 */
56329 static void wa_xfer_id_init(struct wa_xfer *xfer)
56330 {
56331- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56332+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56333 }
56334
56335 /* Return the xfer's ID. */
56336diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56337index e1278fe..7fdeac4 100644
56338--- a/drivers/vfio/vfio.c
56339+++ b/drivers/vfio/vfio.c
56340@@ -517,7 +517,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56341 return 0;
56342
56343 /* TODO Prevent device auto probing */
56344- WARN("Device %s added to live group %d!\n", dev_name(dev),
56345+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56346 iommu_group_id(group->iommu_group));
56347
56348 return 0;
56349diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56350index 3bb02c6..a01ff38 100644
56351--- a/drivers/vhost/vringh.c
56352+++ b/drivers/vhost/vringh.c
56353@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56354 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56355 {
56356 __virtio16 v = 0;
56357- int rc = get_user(v, (__force __virtio16 __user *)p);
56358+ int rc = get_user(v, (__force_user __virtio16 *)p);
56359 *val = vringh16_to_cpu(vrh, v);
56360 return rc;
56361 }
56362@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56363 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56364 {
56365 __virtio16 v = cpu_to_vringh16(vrh, val);
56366- return put_user(v, (__force __virtio16 __user *)p);
56367+ return put_user(v, (__force_user __virtio16 *)p);
56368 }
56369
56370 static inline int copydesc_user(void *dst, const void *src, size_t len)
56371 {
56372- return copy_from_user(dst, (__force void __user *)src, len) ?
56373+ return copy_from_user(dst, (void __force_user *)src, len) ?
56374 -EFAULT : 0;
56375 }
56376
56377@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56378 const struct vring_used_elem *src,
56379 unsigned int num)
56380 {
56381- return copy_to_user((__force void __user *)dst, src,
56382+ return copy_to_user((void __force_user *)dst, src,
56383 sizeof(*dst) * num) ? -EFAULT : 0;
56384 }
56385
56386 static inline int xfer_from_user(void *src, void *dst, size_t len)
56387 {
56388- return copy_from_user(dst, (__force void __user *)src, len) ?
56389+ return copy_from_user(dst, (void __force_user *)src, len) ?
56390 -EFAULT : 0;
56391 }
56392
56393 static inline int xfer_to_user(void *dst, void *src, size_t len)
56394 {
56395- return copy_to_user((__force void __user *)dst, src, len) ?
56396+ return copy_to_user((void __force_user *)dst, src, len) ?
56397 -EFAULT : 0;
56398 }
56399
56400@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56401 vrh->last_used_idx = 0;
56402 vrh->vring.num = num;
56403 /* vring expects kernel addresses, but only used via accessors. */
56404- vrh->vring.desc = (__force struct vring_desc *)desc;
56405- vrh->vring.avail = (__force struct vring_avail *)avail;
56406- vrh->vring.used = (__force struct vring_used *)used;
56407+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56408+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56409+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56410 return 0;
56411 }
56412 EXPORT_SYMBOL(vringh_init_user);
56413@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56414
56415 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56416 {
56417- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56418+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56419 return 0;
56420 }
56421
56422diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56423index 84a110a..96312c3 100644
56424--- a/drivers/video/backlight/kb3886_bl.c
56425+++ b/drivers/video/backlight/kb3886_bl.c
56426@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56427 static unsigned long kb3886bl_flags;
56428 #define KB3886BL_SUSPENDED 0x01
56429
56430-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56431+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56432 {
56433 .ident = "Sahara Touch-iT",
56434 .matches = {
56435diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56436index 1b0b233..6f34c2c 100644
56437--- a/drivers/video/fbdev/arcfb.c
56438+++ b/drivers/video/fbdev/arcfb.c
56439@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56440 return -ENOSPC;
56441
56442 err = 0;
56443- if ((count + p) > fbmemlength) {
56444+ if (count > (fbmemlength - p)) {
56445 count = fbmemlength - p;
56446 err = -ENOSPC;
56447 }
56448diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56449index 0156954..c07d4e0 100644
56450--- a/drivers/video/fbdev/aty/aty128fb.c
56451+++ b/drivers/video/fbdev/aty/aty128fb.c
56452@@ -149,7 +149,7 @@ enum {
56453 };
56454
56455 /* Must match above enum */
56456-static char * const r128_family[] = {
56457+static const char * const r128_family[] = {
56458 "AGP",
56459 "PCI",
56460 "PRO AGP",
56461diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56462index 8789e48..698fe4c 100644
56463--- a/drivers/video/fbdev/aty/atyfb_base.c
56464+++ b/drivers/video/fbdev/aty/atyfb_base.c
56465@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56466 par->accel_flags = var->accel_flags; /* hack */
56467
56468 if (var->accel_flags) {
56469- info->fbops->fb_sync = atyfb_sync;
56470+ pax_open_kernel();
56471+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56472+ pax_close_kernel();
56473 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56474 } else {
56475- info->fbops->fb_sync = NULL;
56476+ pax_open_kernel();
56477+ *(void **)&info->fbops->fb_sync = NULL;
56478+ pax_close_kernel();
56479 info->flags |= FBINFO_HWACCEL_DISABLED;
56480 }
56481
56482diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56483index 2fa0317..4983f2a 100644
56484--- a/drivers/video/fbdev/aty/mach64_cursor.c
56485+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56486@@ -8,6 +8,7 @@
56487 #include "../core/fb_draw.h"
56488
56489 #include <asm/io.h>
56490+#include <asm/pgtable.h>
56491
56492 #ifdef __sparc__
56493 #include <asm/fbio.h>
56494@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56495 info->sprite.buf_align = 16; /* and 64 lines tall. */
56496 info->sprite.flags = FB_PIXMAP_IO;
56497
56498- info->fbops->fb_cursor = atyfb_cursor;
56499+ pax_open_kernel();
56500+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56501+ pax_close_kernel();
56502
56503 return 0;
56504 }
56505diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56506index d6cab1f..112f680 100644
56507--- a/drivers/video/fbdev/core/fb_defio.c
56508+++ b/drivers/video/fbdev/core/fb_defio.c
56509@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56510
56511 BUG_ON(!fbdefio);
56512 mutex_init(&fbdefio->lock);
56513- info->fbops->fb_mmap = fb_deferred_io_mmap;
56514+ pax_open_kernel();
56515+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56516+ pax_close_kernel();
56517 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56518 INIT_LIST_HEAD(&fbdefio->pagelist);
56519 if (fbdefio->delay == 0) /* set a default of 1 s */
56520@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56521 page->mapping = NULL;
56522 }
56523
56524- info->fbops->fb_mmap = NULL;
56525+ *(void **)&info->fbops->fb_mmap = NULL;
56526 mutex_destroy(&fbdefio->lock);
56527 }
56528 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56529diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56530index 0705d88..d9429bf 100644
56531--- a/drivers/video/fbdev/core/fbmem.c
56532+++ b/drivers/video/fbdev/core/fbmem.c
56533@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56534 __u32 data;
56535 int err;
56536
56537- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56538+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56539
56540 data = (__u32) (unsigned long) fix->smem_start;
56541 err |= put_user(data, &fix32->smem_start);
56542diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56543index 807ee22..7814cd6 100644
56544--- a/drivers/video/fbdev/hyperv_fb.c
56545+++ b/drivers/video/fbdev/hyperv_fb.c
56546@@ -240,7 +240,7 @@ static uint screen_fb_size;
56547 static inline int synthvid_send(struct hv_device *hdev,
56548 struct synthvid_msg *msg)
56549 {
56550- static atomic64_t request_id = ATOMIC64_INIT(0);
56551+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56552 int ret;
56553
56554 msg->pipe_hdr.type = PIPE_MSG_DATA;
56555@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56556
56557 ret = vmbus_sendpacket(hdev->channel, msg,
56558 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56559- atomic64_inc_return(&request_id),
56560+ atomic64_inc_return_unchecked(&request_id),
56561 VM_PKT_DATA_INBAND, 0);
56562
56563 if (ret)
56564diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56565index 7672d2e..b56437f 100644
56566--- a/drivers/video/fbdev/i810/i810_accel.c
56567+++ b/drivers/video/fbdev/i810/i810_accel.c
56568@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56569 }
56570 }
56571 printk("ringbuffer lockup!!!\n");
56572+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56573 i810_report_error(mmio);
56574 par->dev_flags |= LOCKUP;
56575 info->pixmap.scan_align = 1;
56576diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56577index a01147f..5d896f8 100644
56578--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56579+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56580@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56581
56582 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56583 struct matrox_switch matrox_mystique = {
56584- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56585+ .preinit = MGA1064_preinit,
56586+ .reset = MGA1064_reset,
56587+ .init = MGA1064_init,
56588+ .restore = MGA1064_restore,
56589 };
56590 EXPORT_SYMBOL(matrox_mystique);
56591 #endif
56592
56593 #ifdef CONFIG_FB_MATROX_G
56594 struct matrox_switch matrox_G100 = {
56595- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56596+ .preinit = MGAG100_preinit,
56597+ .reset = MGAG100_reset,
56598+ .init = MGAG100_init,
56599+ .restore = MGAG100_restore,
56600 };
56601 EXPORT_SYMBOL(matrox_G100);
56602 #endif
56603diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56604index 195ad7c..09743fc 100644
56605--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56606+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56607@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56608 }
56609
56610 struct matrox_switch matrox_millennium = {
56611- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56612+ .preinit = Ti3026_preinit,
56613+ .reset = Ti3026_reset,
56614+ .init = Ti3026_init,
56615+ .restore = Ti3026_restore
56616 };
56617 EXPORT_SYMBOL(matrox_millennium);
56618 #endif
56619diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56620index fe92eed..106e085 100644
56621--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56622+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56623@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56624 struct mb862xxfb_par *par = info->par;
56625
56626 if (info->var.bits_per_pixel == 32) {
56627- info->fbops->fb_fillrect = cfb_fillrect;
56628- info->fbops->fb_copyarea = cfb_copyarea;
56629- info->fbops->fb_imageblit = cfb_imageblit;
56630+ pax_open_kernel();
56631+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56632+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56633+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56634+ pax_close_kernel();
56635 } else {
56636 outreg(disp, GC_L0EM, 3);
56637- info->fbops->fb_fillrect = mb86290fb_fillrect;
56638- info->fbops->fb_copyarea = mb86290fb_copyarea;
56639- info->fbops->fb_imageblit = mb86290fb_imageblit;
56640+ pax_open_kernel();
56641+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56642+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56643+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56644+ pax_close_kernel();
56645 }
56646 outreg(draw, GDC_REG_DRAW_BASE, 0);
56647 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56648diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56649index 4273c6e..b413013 100644
56650--- a/drivers/video/fbdev/nvidia/nvidia.c
56651+++ b/drivers/video/fbdev/nvidia/nvidia.c
56652@@ -665,19 +665,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56653 info->fix.line_length = (info->var.xres_virtual *
56654 info->var.bits_per_pixel) >> 3;
56655 if (info->var.accel_flags) {
56656- info->fbops->fb_imageblit = nvidiafb_imageblit;
56657- info->fbops->fb_fillrect = nvidiafb_fillrect;
56658- info->fbops->fb_copyarea = nvidiafb_copyarea;
56659- info->fbops->fb_sync = nvidiafb_sync;
56660+ pax_open_kernel();
56661+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56662+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56663+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56664+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56665+ pax_close_kernel();
56666 info->pixmap.scan_align = 4;
56667 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56668 info->flags |= FBINFO_READS_FAST;
56669 NVResetGraphics(info);
56670 } else {
56671- info->fbops->fb_imageblit = cfb_imageblit;
56672- info->fbops->fb_fillrect = cfb_fillrect;
56673- info->fbops->fb_copyarea = cfb_copyarea;
56674- info->fbops->fb_sync = NULL;
56675+ pax_open_kernel();
56676+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56677+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56678+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56679+ *(void **)&info->fbops->fb_sync = NULL;
56680+ pax_close_kernel();
56681 info->pixmap.scan_align = 1;
56682 info->flags |= FBINFO_HWACCEL_DISABLED;
56683 info->flags &= ~FBINFO_READS_FAST;
56684@@ -1169,8 +1173,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56685 info->pixmap.size = 8 * 1024;
56686 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56687
56688- if (!hwcur)
56689- info->fbops->fb_cursor = NULL;
56690+ if (!hwcur) {
56691+ pax_open_kernel();
56692+ *(void **)&info->fbops->fb_cursor = NULL;
56693+ pax_close_kernel();
56694+ }
56695
56696 info->var.accel_flags = (!noaccel);
56697
56698diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56699index ef5b902..47cf7f5 100644
56700--- a/drivers/video/fbdev/omap2/dss/display.c
56701+++ b/drivers/video/fbdev/omap2/dss/display.c
56702@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56703 if (dssdev->name == NULL)
56704 dssdev->name = dssdev->alias;
56705
56706+ pax_open_kernel();
56707 if (drv && drv->get_resolution == NULL)
56708- drv->get_resolution = omapdss_default_get_resolution;
56709+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56710 if (drv && drv->get_recommended_bpp == NULL)
56711- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56712+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56713 if (drv && drv->get_timings == NULL)
56714- drv->get_timings = omapdss_default_get_timings;
56715+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56716+ pax_close_kernel();
56717
56718 mutex_lock(&panel_list_mutex);
56719 list_add_tail(&dssdev->panel_list, &panel_list);
56720diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56721index 83433cb..71e9b98 100644
56722--- a/drivers/video/fbdev/s1d13xxxfb.c
56723+++ b/drivers/video/fbdev/s1d13xxxfb.c
56724@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56725
56726 switch(prod_id) {
56727 case S1D13506_PROD_ID: /* activate acceleration */
56728- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56729- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56730+ pax_open_kernel();
56731+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56732+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56733+ pax_close_kernel();
56734 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56735 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56736 break;
56737diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56738index 82c0a8c..42499a1 100644
56739--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56740+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56741@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56742 }
56743
56744 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56745- lcdc_sys_write_index,
56746- lcdc_sys_write_data,
56747- lcdc_sys_read_data,
56748+ .write_index = lcdc_sys_write_index,
56749+ .write_data = lcdc_sys_write_data,
56750+ .read_data = lcdc_sys_read_data,
56751 };
56752
56753 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56754diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56755index 9279e5f..d5f5276 100644
56756--- a/drivers/video/fbdev/smscufx.c
56757+++ b/drivers/video/fbdev/smscufx.c
56758@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56759 fb_deferred_io_cleanup(info);
56760 kfree(info->fbdefio);
56761 info->fbdefio = NULL;
56762- info->fbops->fb_mmap = ufx_ops_mmap;
56763+ pax_open_kernel();
56764+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56765+ pax_close_kernel();
56766 }
56767
56768 pr_debug("released /dev/fb%d user=%d count=%d",
56769diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56770index ff2b873..626a8d5 100644
56771--- a/drivers/video/fbdev/udlfb.c
56772+++ b/drivers/video/fbdev/udlfb.c
56773@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56774 dlfb_urb_completion(urb);
56775
56776 error:
56777- atomic_add(bytes_sent, &dev->bytes_sent);
56778- atomic_add(bytes_identical, &dev->bytes_identical);
56779- atomic_add(width*height*2, &dev->bytes_rendered);
56780+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56781+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56782+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56783 end_cycles = get_cycles();
56784- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56785+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56786 >> 10)), /* Kcycles */
56787 &dev->cpu_kcycles_used);
56788
56789@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56790 dlfb_urb_completion(urb);
56791
56792 error:
56793- atomic_add(bytes_sent, &dev->bytes_sent);
56794- atomic_add(bytes_identical, &dev->bytes_identical);
56795- atomic_add(bytes_rendered, &dev->bytes_rendered);
56796+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56797+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56798+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56799 end_cycles = get_cycles();
56800- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56801+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56802 >> 10)), /* Kcycles */
56803 &dev->cpu_kcycles_used);
56804 }
56805@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56806 fb_deferred_io_cleanup(info);
56807 kfree(info->fbdefio);
56808 info->fbdefio = NULL;
56809- info->fbops->fb_mmap = dlfb_ops_mmap;
56810+ pax_open_kernel();
56811+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56812+ pax_close_kernel();
56813 }
56814
56815 pr_warn("released /dev/fb%d user=%d count=%d\n",
56816@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56817 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56818 struct dlfb_data *dev = fb_info->par;
56819 return snprintf(buf, PAGE_SIZE, "%u\n",
56820- atomic_read(&dev->bytes_rendered));
56821+ atomic_read_unchecked(&dev->bytes_rendered));
56822 }
56823
56824 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56825@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56826 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56827 struct dlfb_data *dev = fb_info->par;
56828 return snprintf(buf, PAGE_SIZE, "%u\n",
56829- atomic_read(&dev->bytes_identical));
56830+ atomic_read_unchecked(&dev->bytes_identical));
56831 }
56832
56833 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56834@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56835 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56836 struct dlfb_data *dev = fb_info->par;
56837 return snprintf(buf, PAGE_SIZE, "%u\n",
56838- atomic_read(&dev->bytes_sent));
56839+ atomic_read_unchecked(&dev->bytes_sent));
56840 }
56841
56842 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56843@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56844 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56845 struct dlfb_data *dev = fb_info->par;
56846 return snprintf(buf, PAGE_SIZE, "%u\n",
56847- atomic_read(&dev->cpu_kcycles_used));
56848+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56849 }
56850
56851 static ssize_t edid_show(
56852@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56853 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56854 struct dlfb_data *dev = fb_info->par;
56855
56856- atomic_set(&dev->bytes_rendered, 0);
56857- atomic_set(&dev->bytes_identical, 0);
56858- atomic_set(&dev->bytes_sent, 0);
56859- atomic_set(&dev->cpu_kcycles_used, 0);
56860+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56861+ atomic_set_unchecked(&dev->bytes_identical, 0);
56862+ atomic_set_unchecked(&dev->bytes_sent, 0);
56863+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56864
56865 return count;
56866 }
56867diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56868index d32d1c4..46722e6 100644
56869--- a/drivers/video/fbdev/uvesafb.c
56870+++ b/drivers/video/fbdev/uvesafb.c
56871@@ -19,6 +19,7 @@
56872 #include <linux/io.h>
56873 #include <linux/mutex.h>
56874 #include <linux/slab.h>
56875+#include <linux/moduleloader.h>
56876 #include <video/edid.h>
56877 #include <video/uvesafb.h>
56878 #ifdef CONFIG_X86
56879@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56880 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56881 par->pmi_setpal = par->ypan = 0;
56882 } else {
56883+
56884+#ifdef CONFIG_PAX_KERNEXEC
56885+#ifdef CONFIG_MODULES
56886+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56887+#endif
56888+ if (!par->pmi_code) {
56889+ par->pmi_setpal = par->ypan = 0;
56890+ return 0;
56891+ }
56892+#endif
56893+
56894 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56895 + task->t.regs.edi);
56896+
56897+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56898+ pax_open_kernel();
56899+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56900+ pax_close_kernel();
56901+
56902+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56903+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56904+#else
56905 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56906 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56907+#endif
56908+
56909 printk(KERN_INFO "uvesafb: protected mode interface info at "
56910 "%04x:%04x\n",
56911 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56912@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56913 par->ypan = ypan;
56914
56915 if (par->pmi_setpal || par->ypan) {
56916+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56917 if (__supported_pte_mask & _PAGE_NX) {
56918 par->pmi_setpal = par->ypan = 0;
56919 printk(KERN_WARNING "uvesafb: NX protection is active, "
56920 "better not use the PMI.\n");
56921- } else {
56922+ } else
56923+#endif
56924 uvesafb_vbe_getpmi(task, par);
56925- }
56926 }
56927 #else
56928 /* The protected mode interface is not available on non-x86. */
56929@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56930 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56931
56932 /* Disable blanking if the user requested so. */
56933- if (!blank)
56934- info->fbops->fb_blank = NULL;
56935+ if (!blank) {
56936+ pax_open_kernel();
56937+ *(void **)&info->fbops->fb_blank = NULL;
56938+ pax_close_kernel();
56939+ }
56940
56941 /*
56942 * Find out how much IO memory is required for the mode with
56943@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56944 info->flags = FBINFO_FLAG_DEFAULT |
56945 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56946
56947- if (!par->ypan)
56948- info->fbops->fb_pan_display = NULL;
56949+ if (!par->ypan) {
56950+ pax_open_kernel();
56951+ *(void **)&info->fbops->fb_pan_display = NULL;
56952+ pax_close_kernel();
56953+ }
56954 }
56955
56956 static void uvesafb_init_mtrr(struct fb_info *info)
56957@@ -1786,6 +1816,11 @@ out_mode:
56958 out:
56959 kfree(par->vbe_modes);
56960
56961+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56962+ if (par->pmi_code)
56963+ module_memfree_exec(par->pmi_code);
56964+#endif
56965+
56966 framebuffer_release(info);
56967 return err;
56968 }
56969@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56970 kfree(par->vbe_state_orig);
56971 kfree(par->vbe_state_saved);
56972
56973+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56974+ if (par->pmi_code)
56975+ module_memfree_exec(par->pmi_code);
56976+#endif
56977+
56978 framebuffer_release(info);
56979 }
56980 return 0;
56981diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56982index d79a0ac..2d0c3d4 100644
56983--- a/drivers/video/fbdev/vesafb.c
56984+++ b/drivers/video/fbdev/vesafb.c
56985@@ -9,6 +9,7 @@
56986 */
56987
56988 #include <linux/module.h>
56989+#include <linux/moduleloader.h>
56990 #include <linux/kernel.h>
56991 #include <linux/errno.h>
56992 #include <linux/string.h>
56993@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56994 static int vram_total; /* Set total amount of memory */
56995 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56996 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56997-static void (*pmi_start)(void) __read_mostly;
56998-static void (*pmi_pal) (void) __read_mostly;
56999+static void (*pmi_start)(void) __read_only;
57000+static void (*pmi_pal) (void) __read_only;
57001 static int depth __read_mostly;
57002 static int vga_compat __read_mostly;
57003 /* --------------------------------------------------------------------- */
57004@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
57005 unsigned int size_remap;
57006 unsigned int size_total;
57007 char *option = NULL;
57008+ void *pmi_code = NULL;
57009
57010 /* ignore error return of fb_get_options */
57011 fb_get_options("vesafb", &option);
57012@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
57013 size_remap = size_total;
57014 vesafb_fix.smem_len = size_remap;
57015
57016-#ifndef __i386__
57017- screen_info.vesapm_seg = 0;
57018-#endif
57019-
57020 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
57021 printk(KERN_WARNING
57022 "vesafb: cannot reserve video memory at 0x%lx\n",
57023@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
57024 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
57025 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
57026
57027+#ifdef __i386__
57028+
57029+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
57030+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
57031+ if (!pmi_code)
57032+#elif !defined(CONFIG_PAX_KERNEXEC)
57033+ if (0)
57034+#endif
57035+
57036+#endif
57037+ screen_info.vesapm_seg = 0;
57038+
57039 if (screen_info.vesapm_seg) {
57040- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
57041- screen_info.vesapm_seg,screen_info.vesapm_off);
57042+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
57043+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
57044 }
57045
57046 if (screen_info.vesapm_seg < 0xc000)
57047@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
57048
57049 if (ypan || pmi_setpal) {
57050 unsigned short *pmi_base;
57051+
57052 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
57053- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
57054- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
57055+
57056+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
57057+ pax_open_kernel();
57058+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
57059+#else
57060+ pmi_code = pmi_base;
57061+#endif
57062+
57063+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
57064+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
57065+
57066+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
57067+ pmi_start = ktva_ktla(pmi_start);
57068+ pmi_pal = ktva_ktla(pmi_pal);
57069+ pax_close_kernel();
57070+#endif
57071+
57072 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
57073 if (pmi_base[3]) {
57074 printk(KERN_INFO "vesafb: pmi: ports = ");
57075@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
57076 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
57077 (ypan ? FBINFO_HWACCEL_YPAN : 0);
57078
57079- if (!ypan)
57080- info->fbops->fb_pan_display = NULL;
57081+ if (!ypan) {
57082+ pax_open_kernel();
57083+ *(void **)&info->fbops->fb_pan_display = NULL;
57084+ pax_close_kernel();
57085+ }
57086
57087 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
57088 err = -ENOMEM;
57089@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
57090 fb_info(info, "%s frame buffer device\n", info->fix.id);
57091 return 0;
57092 err:
57093+
57094+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
57095+ module_memfree_exec(pmi_code);
57096+#endif
57097+
57098 if (info->screen_base)
57099 iounmap(info->screen_base);
57100 framebuffer_release(info);
57101diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
57102index 88714ae..16c2e11 100644
57103--- a/drivers/video/fbdev/via/via_clock.h
57104+++ b/drivers/video/fbdev/via/via_clock.h
57105@@ -56,7 +56,7 @@ struct via_clock {
57106
57107 void (*set_engine_pll_state)(u8 state);
57108 void (*set_engine_pll)(struct via_pll_config config);
57109-};
57110+} __no_const;
57111
57112
57113 static inline u32 get_pll_internal_frequency(u32 ref_freq,
57114diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
57115index 3c14e43..2630570 100644
57116--- a/drivers/video/logo/logo_linux_clut224.ppm
57117+++ b/drivers/video/logo/logo_linux_clut224.ppm
57118@@ -2,1603 +2,1123 @@ P3
57119 # Standard 224-color Linux logo
57120 80 80
57121 255
57122- 0 0 0 0 0 0 0 0 0 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 0 0 0 0 0 0 0 0 0 0 0 0
57125- 0 0 0 0 0 0 0 0 0 0 0 0
57126- 0 0 0 0 0 0 0 0 0 0 0 0
57127- 0 0 0 0 0 0 0 0 0 0 0 0
57128- 0 0 0 0 0 0 0 0 0 0 0 0
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 0 0 0 0 0 0 0 0 0 0
57131- 6 6 6 6 6 6 10 10 10 10 10 10
57132- 10 10 10 6 6 6 6 6 6 6 6 6
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 0 0 0
57142- 0 0 0 0 0 0 0 0 0 0 0 0
57143- 0 0 0 0 0 0 0 0 0 0 0 0
57144- 0 0 0 0 0 0 0 0 0 0 0 0
57145- 0 0 0 0 0 0 0 0 0 0 0 0
57146- 0 0 0 0 0 0 0 0 0 0 0 0
57147- 0 0 0 0 0 0 0 0 0 0 0 0
57148- 0 0 0 0 0 0 0 0 0 0 0 0
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 6 6 6 10 10 10 14 14 14
57151- 22 22 22 26 26 26 30 30 30 34 34 34
57152- 30 30 30 30 30 30 26 26 26 18 18 18
57153- 14 14 14 10 10 10 6 6 6 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 0 0 0
57162- 0 0 0 0 0 0 0 0 0 0 0 0
57163- 0 0 0 0 0 1 0 0 1 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 0 0 0 0 0 0 0 0 0 0 0 0
57168- 0 0 0 0 0 0 0 0 0 0 0 0
57169- 0 0 0 0 0 0 0 0 0 0 0 0
57170- 6 6 6 14 14 14 26 26 26 42 42 42
57171- 54 54 54 66 66 66 78 78 78 78 78 78
57172- 78 78 78 74 74 74 66 66 66 54 54 54
57173- 42 42 42 26 26 26 18 18 18 10 10 10
57174- 6 6 6 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 0 0 0
57182- 0 0 0 0 0 0 0 0 0 0 0 0
57183- 0 0 1 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 0 0 0 0 0 0 0 0 0 0 0 0
57188- 0 0 0 0 0 0 0 0 0 0 0 0
57189- 0 0 0 0 0 0 0 0 0 10 10 10
57190- 22 22 22 42 42 42 66 66 66 86 86 86
57191- 66 66 66 38 38 38 38 38 38 22 22 22
57192- 26 26 26 34 34 34 54 54 54 66 66 66
57193- 86 86 86 70 70 70 46 46 46 26 26 26
57194- 14 14 14 6 6 6 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 0 0 0
57202- 0 0 0 0 0 0 0 0 0 0 0 0
57203- 0 0 1 0 0 1 0 0 1 0 0 0
57204- 0 0 0 0 0 0 0 0 0 0 0 0
57205- 0 0 0 0 0 0 0 0 0 0 0 0
57206- 0 0 0 0 0 0 0 0 0 0 0 0
57207- 0 0 0 0 0 0 0 0 0 0 0 0
57208- 0 0 0 0 0 0 0 0 0 0 0 0
57209- 0 0 0 0 0 0 10 10 10 26 26 26
57210- 50 50 50 82 82 82 58 58 58 6 6 6
57211- 2 2 6 2 2 6 2 2 6 2 2 6
57212- 2 2 6 2 2 6 2 2 6 2 2 6
57213- 6 6 6 54 54 54 86 86 86 66 66 66
57214- 38 38 38 18 18 18 6 6 6 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 0 0 0
57222- 0 0 0 0 0 0 0 0 0 0 0 0
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 0 0 0
57227- 0 0 0 0 0 0 0 0 0 0 0 0
57228- 0 0 0 0 0 0 0 0 0 0 0 0
57229- 0 0 0 6 6 6 22 22 22 50 50 50
57230- 78 78 78 34 34 34 2 2 6 2 2 6
57231- 2 2 6 2 2 6 2 2 6 2 2 6
57232- 2 2 6 2 2 6 2 2 6 2 2 6
57233- 2 2 6 2 2 6 6 6 6 70 70 70
57234- 78 78 78 46 46 46 22 22 22 6 6 6
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 0 0 0
57237- 0 0 0 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 0 0 0 0 0 0 0 0 0 0
57242- 0 0 0 0 0 0 0 0 0 0 0 0
57243- 0 0 1 0 0 1 0 0 1 0 0 0
57244- 0 0 0 0 0 0 0 0 0 0 0 0
57245- 0 0 0 0 0 0 0 0 0 0 0 0
57246- 0 0 0 0 0 0 0 0 0 0 0 0
57247- 0 0 0 0 0 0 0 0 0 0 0 0
57248- 0 0 0 0 0 0 0 0 0 0 0 0
57249- 6 6 6 18 18 18 42 42 42 82 82 82
57250- 26 26 26 2 2 6 2 2 6 2 2 6
57251- 2 2 6 2 2 6 2 2 6 2 2 6
57252- 2 2 6 2 2 6 2 2 6 14 14 14
57253- 46 46 46 34 34 34 6 6 6 2 2 6
57254- 42 42 42 78 78 78 42 42 42 18 18 18
57255- 6 6 6 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 0 0 0
57257- 0 0 0 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 0 0 0 0 0 0 0
57262- 0 0 0 0 0 0 0 0 0 0 0 0
57263- 0 0 1 0 0 0 0 0 1 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 0 0 0
57267- 0 0 0 0 0 0 0 0 0 0 0 0
57268- 0 0 0 0 0 0 0 0 0 0 0 0
57269- 10 10 10 30 30 30 66 66 66 58 58 58
57270- 2 2 6 2 2 6 2 2 6 2 2 6
57271- 2 2 6 2 2 6 2 2 6 2 2 6
57272- 2 2 6 2 2 6 2 2 6 26 26 26
57273- 86 86 86 101 101 101 46 46 46 10 10 10
57274- 2 2 6 58 58 58 70 70 70 34 34 34
57275- 10 10 10 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 0 0 0 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 0 0 0 0 0 0 0 0 0 0
57282- 0 0 0 0 0 0 0 0 0 0 0 0
57283- 0 0 1 0 0 1 0 0 1 0 0 0
57284- 0 0 0 0 0 0 0 0 0 0 0 0
57285- 0 0 0 0 0 0 0 0 0 0 0 0
57286- 0 0 0 0 0 0 0 0 0 0 0 0
57287- 0 0 0 0 0 0 0 0 0 0 0 0
57288- 0 0 0 0 0 0 0 0 0 0 0 0
57289- 14 14 14 42 42 42 86 86 86 10 10 10
57290- 2 2 6 2 2 6 2 2 6 2 2 6
57291- 2 2 6 2 2 6 2 2 6 2 2 6
57292- 2 2 6 2 2 6 2 2 6 30 30 30
57293- 94 94 94 94 94 94 58 58 58 26 26 26
57294- 2 2 6 6 6 6 78 78 78 54 54 54
57295- 22 22 22 6 6 6 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 0 0 0 0 0 0 0 0 0 0 0 0
57302- 0 0 0 0 0 0 0 0 0 0 0 0
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 0 0 0
57307- 0 0 0 0 0 0 0 0 0 0 0 0
57308- 0 0 0 0 0 0 0 0 0 6 6 6
57309- 22 22 22 62 62 62 62 62 62 2 2 6
57310- 2 2 6 2 2 6 2 2 6 2 2 6
57311- 2 2 6 2 2 6 2 2 6 2 2 6
57312- 2 2 6 2 2 6 2 2 6 26 26 26
57313- 54 54 54 38 38 38 18 18 18 10 10 10
57314- 2 2 6 2 2 6 34 34 34 82 82 82
57315- 38 38 38 14 14 14 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 0 0 0
57321- 0 0 0 0 0 0 0 0 0 0 0 0
57322- 0 0 0 0 0 0 0 0 0 0 0 0
57323- 0 0 0 0 0 1 0 0 1 0 0 0
57324- 0 0 0 0 0 0 0 0 0 0 0 0
57325- 0 0 0 0 0 0 0 0 0 0 0 0
57326- 0 0 0 0 0 0 0 0 0 0 0 0
57327- 0 0 0 0 0 0 0 0 0 0 0 0
57328- 0 0 0 0 0 0 0 0 0 6 6 6
57329- 30 30 30 78 78 78 30 30 30 2 2 6
57330- 2 2 6 2 2 6 2 2 6 2 2 6
57331- 2 2 6 2 2 6 2 2 6 2 2 6
57332- 2 2 6 2 2 6 2 2 6 10 10 10
57333- 10 10 10 2 2 6 2 2 6 2 2 6
57334- 2 2 6 2 2 6 2 2 6 78 78 78
57335- 50 50 50 18 18 18 6 6 6 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 0 0 0
57341- 0 0 0 0 0 0 0 0 0 0 0 0
57342- 0 0 0 0 0 0 0 0 0 0 0 0
57343- 0 0 1 0 0 0 0 0 0 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 0 0 0
57347- 0 0 0 0 0 0 0 0 0 0 0 0
57348- 0 0 0 0 0 0 0 0 0 10 10 10
57349- 38 38 38 86 86 86 14 14 14 2 2 6
57350- 2 2 6 2 2 6 2 2 6 2 2 6
57351- 2 2 6 2 2 6 2 2 6 2 2 6
57352- 2 2 6 2 2 6 2 2 6 2 2 6
57353- 2 2 6 2 2 6 2 2 6 2 2 6
57354- 2 2 6 2 2 6 2 2 6 54 54 54
57355- 66 66 66 26 26 26 6 6 6 0 0 0
57356- 0 0 0 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 0 0 0
57361- 0 0 0 0 0 0 0 0 0 0 0 0
57362- 0 0 0 0 0 0 0 0 0 0 0 0
57363- 0 0 0 0 0 1 0 0 1 0 0 0
57364- 0 0 0 0 0 0 0 0 0 0 0 0
57365- 0 0 0 0 0 0 0 0 0 0 0 0
57366- 0 0 0 0 0 0 0 0 0 0 0 0
57367- 0 0 0 0 0 0 0 0 0 0 0 0
57368- 0 0 0 0 0 0 0 0 0 14 14 14
57369- 42 42 42 82 82 82 2 2 6 2 2 6
57370- 2 2 6 6 6 6 10 10 10 2 2 6
57371- 2 2 6 2 2 6 2 2 6 2 2 6
57372- 2 2 6 2 2 6 2 2 6 6 6 6
57373- 14 14 14 10 10 10 2 2 6 2 2 6
57374- 2 2 6 2 2 6 2 2 6 18 18 18
57375- 82 82 82 34 34 34 10 10 10 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 0 0 0 0
57381- 0 0 0 0 0 0 0 0 0 0 0 0
57382- 0 0 0 0 0 0 0 0 0 0 0 0
57383- 0 0 1 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 0 0 0
57387- 0 0 0 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 14 14 14
57389- 46 46 46 86 86 86 2 2 6 2 2 6
57390- 6 6 6 6 6 6 22 22 22 34 34 34
57391- 6 6 6 2 2 6 2 2 6 2 2 6
57392- 2 2 6 2 2 6 18 18 18 34 34 34
57393- 10 10 10 50 50 50 22 22 22 2 2 6
57394- 2 2 6 2 2 6 2 2 6 10 10 10
57395- 86 86 86 42 42 42 14 14 14 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 0 0 0 0 0 0 0 0 0 0 0 0
57401- 0 0 0 0 0 0 0 0 0 0 0 0
57402- 0 0 0 0 0 0 0 0 0 0 0 0
57403- 0 0 1 0 0 1 0 0 1 0 0 0
57404- 0 0 0 0 0 0 0 0 0 0 0 0
57405- 0 0 0 0 0 0 0 0 0 0 0 0
57406- 0 0 0 0 0 0 0 0 0 0 0 0
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 14 14 14
57409- 46 46 46 86 86 86 2 2 6 2 2 6
57410- 38 38 38 116 116 116 94 94 94 22 22 22
57411- 22 22 22 2 2 6 2 2 6 2 2 6
57412- 14 14 14 86 86 86 138 138 138 162 162 162
57413-154 154 154 38 38 38 26 26 26 6 6 6
57414- 2 2 6 2 2 6 2 2 6 2 2 6
57415- 86 86 86 46 46 46 14 14 14 0 0 0
57416- 0 0 0 0 0 0 0 0 0 0 0 0
57417- 0 0 0 0 0 0 0 0 0 0 0 0
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 0 0 0 0 0 0 0 0 0 0 0 0
57421- 0 0 0 0 0 0 0 0 0 0 0 0
57422- 0 0 0 0 0 0 0 0 0 0 0 0
57423- 0 0 0 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 0 0 0
57427- 0 0 0 0 0 0 0 0 0 0 0 0
57428- 0 0 0 0 0 0 0 0 0 14 14 14
57429- 46 46 46 86 86 86 2 2 6 14 14 14
57430-134 134 134 198 198 198 195 195 195 116 116 116
57431- 10 10 10 2 2 6 2 2 6 6 6 6
57432-101 98 89 187 187 187 210 210 210 218 218 218
57433-214 214 214 134 134 134 14 14 14 6 6 6
57434- 2 2 6 2 2 6 2 2 6 2 2 6
57435- 86 86 86 50 50 50 18 18 18 6 6 6
57436- 0 0 0 0 0 0 0 0 0 0 0 0
57437- 0 0 0 0 0 0 0 0 0 0 0 0
57438- 0 0 0 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 0 0 0 0 0 0 0 0 0 0 0 0
57441- 0 0 0 0 0 0 0 0 0 0 0 0
57442- 0 0 0 0 0 0 0 0 1 0 0 0
57443- 0 0 1 0 0 1 0 0 1 0 0 0
57444- 0 0 0 0 0 0 0 0 0 0 0 0
57445- 0 0 0 0 0 0 0 0 0 0 0 0
57446- 0 0 0 0 0 0 0 0 0 0 0 0
57447- 0 0 0 0 0 0 0 0 0 0 0 0
57448- 0 0 0 0 0 0 0 0 0 14 14 14
57449- 46 46 46 86 86 86 2 2 6 54 54 54
57450-218 218 218 195 195 195 226 226 226 246 246 246
57451- 58 58 58 2 2 6 2 2 6 30 30 30
57452-210 210 210 253 253 253 174 174 174 123 123 123
57453-221 221 221 234 234 234 74 74 74 2 2 6
57454- 2 2 6 2 2 6 2 2 6 2 2 6
57455- 70 70 70 58 58 58 22 22 22 6 6 6
57456- 0 0 0 0 0 0 0 0 0 0 0 0
57457- 0 0 0 0 0 0 0 0 0 0 0 0
57458- 0 0 0 0 0 0 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 0 0 0
57460- 0 0 0 0 0 0 0 0 0 0 0 0
57461- 0 0 0 0 0 0 0 0 0 0 0 0
57462- 0 0 0 0 0 0 0 0 0 0 0 0
57463- 0 0 0 0 0 0 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 0 0 0
57467- 0 0 0 0 0 0 0 0 0 0 0 0
57468- 0 0 0 0 0 0 0 0 0 14 14 14
57469- 46 46 46 82 82 82 2 2 6 106 106 106
57470-170 170 170 26 26 26 86 86 86 226 226 226
57471-123 123 123 10 10 10 14 14 14 46 46 46
57472-231 231 231 190 190 190 6 6 6 70 70 70
57473- 90 90 90 238 238 238 158 158 158 2 2 6
57474- 2 2 6 2 2 6 2 2 6 2 2 6
57475- 70 70 70 58 58 58 22 22 22 6 6 6
57476- 0 0 0 0 0 0 0 0 0 0 0 0
57477- 0 0 0 0 0 0 0 0 0 0 0 0
57478- 0 0 0 0 0 0 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 0 0 0
57480- 0 0 0 0 0 0 0 0 0 0 0 0
57481- 0 0 0 0 0 0 0 0 0 0 0 0
57482- 0 0 0 0 0 0 0 0 1 0 0 0
57483- 0 0 1 0 0 1 0 0 1 0 0 0
57484- 0 0 0 0 0 0 0 0 0 0 0 0
57485- 0 0 0 0 0 0 0 0 0 0 0 0
57486- 0 0 0 0 0 0 0 0 0 0 0 0
57487- 0 0 0 0 0 0 0 0 0 0 0 0
57488- 0 0 0 0 0 0 0 0 0 14 14 14
57489- 42 42 42 86 86 86 6 6 6 116 116 116
57490-106 106 106 6 6 6 70 70 70 149 149 149
57491-128 128 128 18 18 18 38 38 38 54 54 54
57492-221 221 221 106 106 106 2 2 6 14 14 14
57493- 46 46 46 190 190 190 198 198 198 2 2 6
57494- 2 2 6 2 2 6 2 2 6 2 2 6
57495- 74 74 74 62 62 62 22 22 22 6 6 6
57496- 0 0 0 0 0 0 0 0 0 0 0 0
57497- 0 0 0 0 0 0 0 0 0 0 0 0
57498- 0 0 0 0 0 0 0 0 0 0 0 0
57499- 0 0 0 0 0 0 0 0 0 0 0 0
57500- 0 0 0 0 0 0 0 0 0 0 0 0
57501- 0 0 0 0 0 0 0 0 0 0 0 0
57502- 0 0 0 0 0 0 0 0 1 0 0 0
57503- 0 0 1 0 0 0 0 0 1 0 0 0
57504- 0 0 0 0 0 0 0 0 0 0 0 0
57505- 0 0 0 0 0 0 0 0 0 0 0 0
57506- 0 0 0 0 0 0 0 0 0 0 0 0
57507- 0 0 0 0 0 0 0 0 0 0 0 0
57508- 0 0 0 0 0 0 0 0 0 14 14 14
57509- 42 42 42 94 94 94 14 14 14 101 101 101
57510-128 128 128 2 2 6 18 18 18 116 116 116
57511-118 98 46 121 92 8 121 92 8 98 78 10
57512-162 162 162 106 106 106 2 2 6 2 2 6
57513- 2 2 6 195 195 195 195 195 195 6 6 6
57514- 2 2 6 2 2 6 2 2 6 2 2 6
57515- 74 74 74 62 62 62 22 22 22 6 6 6
57516- 0 0 0 0 0 0 0 0 0 0 0 0
57517- 0 0 0 0 0 0 0 0 0 0 0 0
57518- 0 0 0 0 0 0 0 0 0 0 0 0
57519- 0 0 0 0 0 0 0 0 0 0 0 0
57520- 0 0 0 0 0 0 0 0 0 0 0 0
57521- 0 0 0 0 0 0 0 0 0 0 0 0
57522- 0 0 0 0 0 0 0 0 1 0 0 1
57523- 0 0 1 0 0 0 0 0 1 0 0 0
57524- 0 0 0 0 0 0 0 0 0 0 0 0
57525- 0 0 0 0 0 0 0 0 0 0 0 0
57526- 0 0 0 0 0 0 0 0 0 0 0 0
57527- 0 0 0 0 0 0 0 0 0 0 0 0
57528- 0 0 0 0 0 0 0 0 0 10 10 10
57529- 38 38 38 90 90 90 14 14 14 58 58 58
57530-210 210 210 26 26 26 54 38 6 154 114 10
57531-226 170 11 236 186 11 225 175 15 184 144 12
57532-215 174 15 175 146 61 37 26 9 2 2 6
57533- 70 70 70 246 246 246 138 138 138 2 2 6
57534- 2 2 6 2 2 6 2 2 6 2 2 6
57535- 70 70 70 66 66 66 26 26 26 6 6 6
57536- 0 0 0 0 0 0 0 0 0 0 0 0
57537- 0 0 0 0 0 0 0 0 0 0 0 0
57538- 0 0 0 0 0 0 0 0 0 0 0 0
57539- 0 0 0 0 0 0 0 0 0 0 0 0
57540- 0 0 0 0 0 0 0 0 0 0 0 0
57541- 0 0 0 0 0 0 0 0 0 0 0 0
57542- 0 0 0 0 0 0 0 0 0 0 0 0
57543- 0 0 0 0 0 0 0 0 0 0 0 0
57544- 0 0 0 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 0 0 0
57547- 0 0 0 0 0 0 0 0 0 0 0 0
57548- 0 0 0 0 0 0 0 0 0 10 10 10
57549- 38 38 38 86 86 86 14 14 14 10 10 10
57550-195 195 195 188 164 115 192 133 9 225 175 15
57551-239 182 13 234 190 10 232 195 16 232 200 30
57552-245 207 45 241 208 19 232 195 16 184 144 12
57553-218 194 134 211 206 186 42 42 42 2 2 6
57554- 2 2 6 2 2 6 2 2 6 2 2 6
57555- 50 50 50 74 74 74 30 30 30 6 6 6
57556- 0 0 0 0 0 0 0 0 0 0 0 0
57557- 0 0 0 0 0 0 0 0 0 0 0 0
57558- 0 0 0 0 0 0 0 0 0 0 0 0
57559- 0 0 0 0 0 0 0 0 0 0 0 0
57560- 0 0 0 0 0 0 0 0 0 0 0 0
57561- 0 0 0 0 0 0 0 0 0 0 0 0
57562- 0 0 0 0 0 0 0 0 0 0 0 0
57563- 0 0 0 0 0 0 0 0 0 0 0 0
57564- 0 0 0 0 0 0 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 0 0 0
57567- 0 0 0 0 0 0 0 0 0 0 0 0
57568- 0 0 0 0 0 0 0 0 0 10 10 10
57569- 34 34 34 86 86 86 14 14 14 2 2 6
57570-121 87 25 192 133 9 219 162 10 239 182 13
57571-236 186 11 232 195 16 241 208 19 244 214 54
57572-246 218 60 246 218 38 246 215 20 241 208 19
57573-241 208 19 226 184 13 121 87 25 2 2 6
57574- 2 2 6 2 2 6 2 2 6 2 2 6
57575- 50 50 50 82 82 82 34 34 34 10 10 10
57576- 0 0 0 0 0 0 0 0 0 0 0 0
57577- 0 0 0 0 0 0 0 0 0 0 0 0
57578- 0 0 0 0 0 0 0 0 0 0 0 0
57579- 0 0 0 0 0 0 0 0 0 0 0 0
57580- 0 0 0 0 0 0 0 0 0 0 0 0
57581- 0 0 0 0 0 0 0 0 0 0 0 0
57582- 0 0 0 0 0 0 0 0 0 0 0 0
57583- 0 0 0 0 0 0 0 0 0 0 0 0
57584- 0 0 0 0 0 0 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 0 0 0 0 0 0
57587- 0 0 0 0 0 0 0 0 0 0 0 0
57588- 0 0 0 0 0 0 0 0 0 10 10 10
57589- 34 34 34 82 82 82 30 30 30 61 42 6
57590-180 123 7 206 145 10 230 174 11 239 182 13
57591-234 190 10 238 202 15 241 208 19 246 218 74
57592-246 218 38 246 215 20 246 215 20 246 215 20
57593-226 184 13 215 174 15 184 144 12 6 6 6
57594- 2 2 6 2 2 6 2 2 6 2 2 6
57595- 26 26 26 94 94 94 42 42 42 14 14 14
57596- 0 0 0 0 0 0 0 0 0 0 0 0
57597- 0 0 0 0 0 0 0 0 0 0 0 0
57598- 0 0 0 0 0 0 0 0 0 0 0 0
57599- 0 0 0 0 0 0 0 0 0 0 0 0
57600- 0 0 0 0 0 0 0 0 0 0 0 0
57601- 0 0 0 0 0 0 0 0 0 0 0 0
57602- 0 0 0 0 0 0 0 0 0 0 0 0
57603- 0 0 0 0 0 0 0 0 0 0 0 0
57604- 0 0 0 0 0 0 0 0 0 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 0 0 0 0 0 0
57607- 0 0 0 0 0 0 0 0 0 0 0 0
57608- 0 0 0 0 0 0 0 0 0 10 10 10
57609- 30 30 30 78 78 78 50 50 50 104 69 6
57610-192 133 9 216 158 10 236 178 12 236 186 11
57611-232 195 16 241 208 19 244 214 54 245 215 43
57612-246 215 20 246 215 20 241 208 19 198 155 10
57613-200 144 11 216 158 10 156 118 10 2 2 6
57614- 2 2 6 2 2 6 2 2 6 2 2 6
57615- 6 6 6 90 90 90 54 54 54 18 18 18
57616- 6 6 6 0 0 0 0 0 0 0 0 0
57617- 0 0 0 0 0 0 0 0 0 0 0 0
57618- 0 0 0 0 0 0 0 0 0 0 0 0
57619- 0 0 0 0 0 0 0 0 0 0 0 0
57620- 0 0 0 0 0 0 0 0 0 0 0 0
57621- 0 0 0 0 0 0 0 0 0 0 0 0
57622- 0 0 0 0 0 0 0 0 0 0 0 0
57623- 0 0 0 0 0 0 0 0 0 0 0 0
57624- 0 0 0 0 0 0 0 0 0 0 0 0
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 0 0 0 0 0 0 0 0 0
57627- 0 0 0 0 0 0 0 0 0 0 0 0
57628- 0 0 0 0 0 0 0 0 0 10 10 10
57629- 30 30 30 78 78 78 46 46 46 22 22 22
57630-137 92 6 210 162 10 239 182 13 238 190 10
57631-238 202 15 241 208 19 246 215 20 246 215 20
57632-241 208 19 203 166 17 185 133 11 210 150 10
57633-216 158 10 210 150 10 102 78 10 2 2 6
57634- 6 6 6 54 54 54 14 14 14 2 2 6
57635- 2 2 6 62 62 62 74 74 74 30 30 30
57636- 10 10 10 0 0 0 0 0 0 0 0 0
57637- 0 0 0 0 0 0 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 0 0 0
57639- 0 0 0 0 0 0 0 0 0 0 0 0
57640- 0 0 0 0 0 0 0 0 0 0 0 0
57641- 0 0 0 0 0 0 0 0 0 0 0 0
57642- 0 0 0 0 0 0 0 0 0 0 0 0
57643- 0 0 0 0 0 0 0 0 0 0 0 0
57644- 0 0 0 0 0 0 0 0 0 0 0 0
57645- 0 0 0 0 0 0 0 0 0 0 0 0
57646- 0 0 0 0 0 0 0 0 0 0 0 0
57647- 0 0 0 0 0 0 0 0 0 0 0 0
57648- 0 0 0 0 0 0 0 0 0 10 10 10
57649- 34 34 34 78 78 78 50 50 50 6 6 6
57650- 94 70 30 139 102 15 190 146 13 226 184 13
57651-232 200 30 232 195 16 215 174 15 190 146 13
57652-168 122 10 192 133 9 210 150 10 213 154 11
57653-202 150 34 182 157 106 101 98 89 2 2 6
57654- 2 2 6 78 78 78 116 116 116 58 58 58
57655- 2 2 6 22 22 22 90 90 90 46 46 46
57656- 18 18 18 6 6 6 0 0 0 0 0 0
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 0 0 0 0 0 0
57659- 0 0 0 0 0 0 0 0 0 0 0 0
57660- 0 0 0 0 0 0 0 0 0 0 0 0
57661- 0 0 0 0 0 0 0 0 0 0 0 0
57662- 0 0 0 0 0 0 0 0 0 0 0 0
57663- 0 0 0 0 0 0 0 0 0 0 0 0
57664- 0 0 0 0 0 0 0 0 0 0 0 0
57665- 0 0 0 0 0 0 0 0 0 0 0 0
57666- 0 0 0 0 0 0 0 0 0 0 0 0
57667- 0 0 0 0 0 0 0 0 0 0 0 0
57668- 0 0 0 0 0 0 0 0 0 10 10 10
57669- 38 38 38 86 86 86 50 50 50 6 6 6
57670-128 128 128 174 154 114 156 107 11 168 122 10
57671-198 155 10 184 144 12 197 138 11 200 144 11
57672-206 145 10 206 145 10 197 138 11 188 164 115
57673-195 195 195 198 198 198 174 174 174 14 14 14
57674- 2 2 6 22 22 22 116 116 116 116 116 116
57675- 22 22 22 2 2 6 74 74 74 70 70 70
57676- 30 30 30 10 10 10 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 0 0 0 0 0 0
57679- 0 0 0 0 0 0 0 0 0 0 0 0
57680- 0 0 0 0 0 0 0 0 0 0 0 0
57681- 0 0 0 0 0 0 0 0 0 0 0 0
57682- 0 0 0 0 0 0 0 0 0 0 0 0
57683- 0 0 0 0 0 0 0 0 0 0 0 0
57684- 0 0 0 0 0 0 0 0 0 0 0 0
57685- 0 0 0 0 0 0 0 0 0 0 0 0
57686- 0 0 0 0 0 0 0 0 0 0 0 0
57687- 0 0 0 0 0 0 0 0 0 0 0 0
57688- 0 0 0 0 0 0 6 6 6 18 18 18
57689- 50 50 50 101 101 101 26 26 26 10 10 10
57690-138 138 138 190 190 190 174 154 114 156 107 11
57691-197 138 11 200 144 11 197 138 11 192 133 9
57692-180 123 7 190 142 34 190 178 144 187 187 187
57693-202 202 202 221 221 221 214 214 214 66 66 66
57694- 2 2 6 2 2 6 50 50 50 62 62 62
57695- 6 6 6 2 2 6 10 10 10 90 90 90
57696- 50 50 50 18 18 18 6 6 6 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 0 0 0 0 0 0 0 0 0
57699- 0 0 0 0 0 0 0 0 0 0 0 0
57700- 0 0 0 0 0 0 0 0 0 0 0 0
57701- 0 0 0 0 0 0 0 0 0 0 0 0
57702- 0 0 0 0 0 0 0 0 0 0 0 0
57703- 0 0 0 0 0 0 0 0 0 0 0 0
57704- 0 0 0 0 0 0 0 0 0 0 0 0
57705- 0 0 0 0 0 0 0 0 0 0 0 0
57706- 0 0 0 0 0 0 0 0 0 0 0 0
57707- 0 0 0 0 0 0 0 0 0 0 0 0
57708- 0 0 0 0 0 0 10 10 10 34 34 34
57709- 74 74 74 74 74 74 2 2 6 6 6 6
57710-144 144 144 198 198 198 190 190 190 178 166 146
57711-154 121 60 156 107 11 156 107 11 168 124 44
57712-174 154 114 187 187 187 190 190 190 210 210 210
57713-246 246 246 253 253 253 253 253 253 182 182 182
57714- 6 6 6 2 2 6 2 2 6 2 2 6
57715- 2 2 6 2 2 6 2 2 6 62 62 62
57716- 74 74 74 34 34 34 14 14 14 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 0 0 0 0 0 0 0 0 0
57719- 0 0 0 0 0 0 0 0 0 0 0 0
57720- 0 0 0 0 0 0 0 0 0 0 0 0
57721- 0 0 0 0 0 0 0 0 0 0 0 0
57722- 0 0 0 0 0 0 0 0 0 0 0 0
57723- 0 0 0 0 0 0 0 0 0 0 0 0
57724- 0 0 0 0 0 0 0 0 0 0 0 0
57725- 0 0 0 0 0 0 0 0 0 0 0 0
57726- 0 0 0 0 0 0 0 0 0 0 0 0
57727- 0 0 0 0 0 0 0 0 0 0 0 0
57728- 0 0 0 10 10 10 22 22 22 54 54 54
57729- 94 94 94 18 18 18 2 2 6 46 46 46
57730-234 234 234 221 221 221 190 190 190 190 190 190
57731-190 190 190 187 187 187 187 187 187 190 190 190
57732-190 190 190 195 195 195 214 214 214 242 242 242
57733-253 253 253 253 253 253 253 253 253 253 253 253
57734- 82 82 82 2 2 6 2 2 6 2 2 6
57735- 2 2 6 2 2 6 2 2 6 14 14 14
57736- 86 86 86 54 54 54 22 22 22 6 6 6
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 0 0 0 0 0 0 0 0 0 0 0 0
57739- 0 0 0 0 0 0 0 0 0 0 0 0
57740- 0 0 0 0 0 0 0 0 0 0 0 0
57741- 0 0 0 0 0 0 0 0 0 0 0 0
57742- 0 0 0 0 0 0 0 0 0 0 0 0
57743- 0 0 0 0 0 0 0 0 0 0 0 0
57744- 0 0 0 0 0 0 0 0 0 0 0 0
57745- 0 0 0 0 0 0 0 0 0 0 0 0
57746- 0 0 0 0 0 0 0 0 0 0 0 0
57747- 0 0 0 0 0 0 0 0 0 0 0 0
57748- 6 6 6 18 18 18 46 46 46 90 90 90
57749- 46 46 46 18 18 18 6 6 6 182 182 182
57750-253 253 253 246 246 246 206 206 206 190 190 190
57751-190 190 190 190 190 190 190 190 190 190 190 190
57752-206 206 206 231 231 231 250 250 250 253 253 253
57753-253 253 253 253 253 253 253 253 253 253 253 253
57754-202 202 202 14 14 14 2 2 6 2 2 6
57755- 2 2 6 2 2 6 2 2 6 2 2 6
57756- 42 42 42 86 86 86 42 42 42 18 18 18
57757- 6 6 6 0 0 0 0 0 0 0 0 0
57758- 0 0 0 0 0 0 0 0 0 0 0 0
57759- 0 0 0 0 0 0 0 0 0 0 0 0
57760- 0 0 0 0 0 0 0 0 0 0 0 0
57761- 0 0 0 0 0 0 0 0 0 0 0 0
57762- 0 0 0 0 0 0 0 0 0 0 0 0
57763- 0 0 0 0 0 0 0 0 0 0 0 0
57764- 0 0 0 0 0 0 0 0 0 0 0 0
57765- 0 0 0 0 0 0 0 0 0 0 0 0
57766- 0 0 0 0 0 0 0 0 0 0 0 0
57767- 0 0 0 0 0 0 0 0 0 6 6 6
57768- 14 14 14 38 38 38 74 74 74 66 66 66
57769- 2 2 6 6 6 6 90 90 90 250 250 250
57770-253 253 253 253 253 253 238 238 238 198 198 198
57771-190 190 190 190 190 190 195 195 195 221 221 221
57772-246 246 246 253 253 253 253 253 253 253 253 253
57773-253 253 253 253 253 253 253 253 253 253 253 253
57774-253 253 253 82 82 82 2 2 6 2 2 6
57775- 2 2 6 2 2 6 2 2 6 2 2 6
57776- 2 2 6 78 78 78 70 70 70 34 34 34
57777- 14 14 14 6 6 6 0 0 0 0 0 0
57778- 0 0 0 0 0 0 0 0 0 0 0 0
57779- 0 0 0 0 0 0 0 0 0 0 0 0
57780- 0 0 0 0 0 0 0 0 0 0 0 0
57781- 0 0 0 0 0 0 0 0 0 0 0 0
57782- 0 0 0 0 0 0 0 0 0 0 0 0
57783- 0 0 0 0 0 0 0 0 0 0 0 0
57784- 0 0 0 0 0 0 0 0 0 0 0 0
57785- 0 0 0 0 0 0 0 0 0 0 0 0
57786- 0 0 0 0 0 0 0 0 0 0 0 0
57787- 0 0 0 0 0 0 0 0 0 14 14 14
57788- 34 34 34 66 66 66 78 78 78 6 6 6
57789- 2 2 6 18 18 18 218 218 218 253 253 253
57790-253 253 253 253 253 253 253 253 253 246 246 246
57791-226 226 226 231 231 231 246 246 246 253 253 253
57792-253 253 253 253 253 253 253 253 253 253 253 253
57793-253 253 253 253 253 253 253 253 253 253 253 253
57794-253 253 253 178 178 178 2 2 6 2 2 6
57795- 2 2 6 2 2 6 2 2 6 2 2 6
57796- 2 2 6 18 18 18 90 90 90 62 62 62
57797- 30 30 30 10 10 10 0 0 0 0 0 0
57798- 0 0 0 0 0 0 0 0 0 0 0 0
57799- 0 0 0 0 0 0 0 0 0 0 0 0
57800- 0 0 0 0 0 0 0 0 0 0 0 0
57801- 0 0 0 0 0 0 0 0 0 0 0 0
57802- 0 0 0 0 0 0 0 0 0 0 0 0
57803- 0 0 0 0 0 0 0 0 0 0 0 0
57804- 0 0 0 0 0 0 0 0 0 0 0 0
57805- 0 0 0 0 0 0 0 0 0 0 0 0
57806- 0 0 0 0 0 0 0 0 0 0 0 0
57807- 0 0 0 0 0 0 10 10 10 26 26 26
57808- 58 58 58 90 90 90 18 18 18 2 2 6
57809- 2 2 6 110 110 110 253 253 253 253 253 253
57810-253 253 253 253 253 253 253 253 253 253 253 253
57811-250 250 250 253 253 253 253 253 253 253 253 253
57812-253 253 253 253 253 253 253 253 253 253 253 253
57813-253 253 253 253 253 253 253 253 253 253 253 253
57814-253 253 253 231 231 231 18 18 18 2 2 6
57815- 2 2 6 2 2 6 2 2 6 2 2 6
57816- 2 2 6 2 2 6 18 18 18 94 94 94
57817- 54 54 54 26 26 26 10 10 10 0 0 0
57818- 0 0 0 0 0 0 0 0 0 0 0 0
57819- 0 0 0 0 0 0 0 0 0 0 0 0
57820- 0 0 0 0 0 0 0 0 0 0 0 0
57821- 0 0 0 0 0 0 0 0 0 0 0 0
57822- 0 0 0 0 0 0 0 0 0 0 0 0
57823- 0 0 0 0 0 0 0 0 0 0 0 0
57824- 0 0 0 0 0 0 0 0 0 0 0 0
57825- 0 0 0 0 0 0 0 0 0 0 0 0
57826- 0 0 0 0 0 0 0 0 0 0 0 0
57827- 0 0 0 6 6 6 22 22 22 50 50 50
57828- 90 90 90 26 26 26 2 2 6 2 2 6
57829- 14 14 14 195 195 195 250 250 250 253 253 253
57830-253 253 253 253 253 253 253 253 253 253 253 253
57831-253 253 253 253 253 253 253 253 253 253 253 253
57832-253 253 253 253 253 253 253 253 253 253 253 253
57833-253 253 253 253 253 253 253 253 253 253 253 253
57834-250 250 250 242 242 242 54 54 54 2 2 6
57835- 2 2 6 2 2 6 2 2 6 2 2 6
57836- 2 2 6 2 2 6 2 2 6 38 38 38
57837- 86 86 86 50 50 50 22 22 22 6 6 6
57838- 0 0 0 0 0 0 0 0 0 0 0 0
57839- 0 0 0 0 0 0 0 0 0 0 0 0
57840- 0 0 0 0 0 0 0 0 0 0 0 0
57841- 0 0 0 0 0 0 0 0 0 0 0 0
57842- 0 0 0 0 0 0 0 0 0 0 0 0
57843- 0 0 0 0 0 0 0 0 0 0 0 0
57844- 0 0 0 0 0 0 0 0 0 0 0 0
57845- 0 0 0 0 0 0 0 0 0 0 0 0
57846- 0 0 0 0 0 0 0 0 0 0 0 0
57847- 6 6 6 14 14 14 38 38 38 82 82 82
57848- 34 34 34 2 2 6 2 2 6 2 2 6
57849- 42 42 42 195 195 195 246 246 246 253 253 253
57850-253 253 253 253 253 253 253 253 253 250 250 250
57851-242 242 242 242 242 242 250 250 250 253 253 253
57852-253 253 253 253 253 253 253 253 253 253 253 253
57853-253 253 253 250 250 250 246 246 246 238 238 238
57854-226 226 226 231 231 231 101 101 101 6 6 6
57855- 2 2 6 2 2 6 2 2 6 2 2 6
57856- 2 2 6 2 2 6 2 2 6 2 2 6
57857- 38 38 38 82 82 82 42 42 42 14 14 14
57858- 6 6 6 0 0 0 0 0 0 0 0 0
57859- 0 0 0 0 0 0 0 0 0 0 0 0
57860- 0 0 0 0 0 0 0 0 0 0 0 0
57861- 0 0 0 0 0 0 0 0 0 0 0 0
57862- 0 0 0 0 0 0 0 0 0 0 0 0
57863- 0 0 0 0 0 0 0 0 0 0 0 0
57864- 0 0 0 0 0 0 0 0 0 0 0 0
57865- 0 0 0 0 0 0 0 0 0 0 0 0
57866- 0 0 0 0 0 0 0 0 0 0 0 0
57867- 10 10 10 26 26 26 62 62 62 66 66 66
57868- 2 2 6 2 2 6 2 2 6 6 6 6
57869- 70 70 70 170 170 170 206 206 206 234 234 234
57870-246 246 246 250 250 250 250 250 250 238 238 238
57871-226 226 226 231 231 231 238 238 238 250 250 250
57872-250 250 250 250 250 250 246 246 246 231 231 231
57873-214 214 214 206 206 206 202 202 202 202 202 202
57874-198 198 198 202 202 202 182 182 182 18 18 18
57875- 2 2 6 2 2 6 2 2 6 2 2 6
57876- 2 2 6 2 2 6 2 2 6 2 2 6
57877- 2 2 6 62 62 62 66 66 66 30 30 30
57878- 10 10 10 0 0 0 0 0 0 0 0 0
57879- 0 0 0 0 0 0 0 0 0 0 0 0
57880- 0 0 0 0 0 0 0 0 0 0 0 0
57881- 0 0 0 0 0 0 0 0 0 0 0 0
57882- 0 0 0 0 0 0 0 0 0 0 0 0
57883- 0 0 0 0 0 0 0 0 0 0 0 0
57884- 0 0 0 0 0 0 0 0 0 0 0 0
57885- 0 0 0 0 0 0 0 0 0 0 0 0
57886- 0 0 0 0 0 0 0 0 0 0 0 0
57887- 14 14 14 42 42 42 82 82 82 18 18 18
57888- 2 2 6 2 2 6 2 2 6 10 10 10
57889- 94 94 94 182 182 182 218 218 218 242 242 242
57890-250 250 250 253 253 253 253 253 253 250 250 250
57891-234 234 234 253 253 253 253 253 253 253 253 253
57892-253 253 253 253 253 253 253 253 253 246 246 246
57893-238 238 238 226 226 226 210 210 210 202 202 202
57894-195 195 195 195 195 195 210 210 210 158 158 158
57895- 6 6 6 14 14 14 50 50 50 14 14 14
57896- 2 2 6 2 2 6 2 2 6 2 2 6
57897- 2 2 6 6 6 6 86 86 86 46 46 46
57898- 18 18 18 6 6 6 0 0 0 0 0 0
57899- 0 0 0 0 0 0 0 0 0 0 0 0
57900- 0 0 0 0 0 0 0 0 0 0 0 0
57901- 0 0 0 0 0 0 0 0 0 0 0 0
57902- 0 0 0 0 0 0 0 0 0 0 0 0
57903- 0 0 0 0 0 0 0 0 0 0 0 0
57904- 0 0 0 0 0 0 0 0 0 0 0 0
57905- 0 0 0 0 0 0 0 0 0 0 0 0
57906- 0 0 0 0 0 0 0 0 0 6 6 6
57907- 22 22 22 54 54 54 70 70 70 2 2 6
57908- 2 2 6 10 10 10 2 2 6 22 22 22
57909-166 166 166 231 231 231 250 250 250 253 253 253
57910-253 253 253 253 253 253 253 253 253 250 250 250
57911-242 242 242 253 253 253 253 253 253 253 253 253
57912-253 253 253 253 253 253 253 253 253 253 253 253
57913-253 253 253 253 253 253 253 253 253 246 246 246
57914-231 231 231 206 206 206 198 198 198 226 226 226
57915- 94 94 94 2 2 6 6 6 6 38 38 38
57916- 30 30 30 2 2 6 2 2 6 2 2 6
57917- 2 2 6 2 2 6 62 62 62 66 66 66
57918- 26 26 26 10 10 10 0 0 0 0 0 0
57919- 0 0 0 0 0 0 0 0 0 0 0 0
57920- 0 0 0 0 0 0 0 0 0 0 0 0
57921- 0 0 0 0 0 0 0 0 0 0 0 0
57922- 0 0 0 0 0 0 0 0 0 0 0 0
57923- 0 0 0 0 0 0 0 0 0 0 0 0
57924- 0 0 0 0 0 0 0 0 0 0 0 0
57925- 0 0 0 0 0 0 0 0 0 0 0 0
57926- 0 0 0 0 0 0 0 0 0 10 10 10
57927- 30 30 30 74 74 74 50 50 50 2 2 6
57928- 26 26 26 26 26 26 2 2 6 106 106 106
57929-238 238 238 253 253 253 253 253 253 253 253 253
57930-253 253 253 253 253 253 253 253 253 253 253 253
57931-253 253 253 253 253 253 253 253 253 253 253 253
57932-253 253 253 253 253 253 253 253 253 253 253 253
57933-253 253 253 253 253 253 253 253 253 253 253 253
57934-253 253 253 246 246 246 218 218 218 202 202 202
57935-210 210 210 14 14 14 2 2 6 2 2 6
57936- 30 30 30 22 22 22 2 2 6 2 2 6
57937- 2 2 6 2 2 6 18 18 18 86 86 86
57938- 42 42 42 14 14 14 0 0 0 0 0 0
57939- 0 0 0 0 0 0 0 0 0 0 0 0
57940- 0 0 0 0 0 0 0 0 0 0 0 0
57941- 0 0 0 0 0 0 0 0 0 0 0 0
57942- 0 0 0 0 0 0 0 0 0 0 0 0
57943- 0 0 0 0 0 0 0 0 0 0 0 0
57944- 0 0 0 0 0 0 0 0 0 0 0 0
57945- 0 0 0 0 0 0 0 0 0 0 0 0
57946- 0 0 0 0 0 0 0 0 0 14 14 14
57947- 42 42 42 90 90 90 22 22 22 2 2 6
57948- 42 42 42 2 2 6 18 18 18 218 218 218
57949-253 253 253 253 253 253 253 253 253 253 253 253
57950-253 253 253 253 253 253 253 253 253 253 253 253
57951-253 253 253 253 253 253 253 253 253 253 253 253
57952-253 253 253 253 253 253 253 253 253 253 253 253
57953-253 253 253 253 253 253 253 253 253 253 253 253
57954-253 253 253 253 253 253 250 250 250 221 221 221
57955-218 218 218 101 101 101 2 2 6 14 14 14
57956- 18 18 18 38 38 38 10 10 10 2 2 6
57957- 2 2 6 2 2 6 2 2 6 78 78 78
57958- 58 58 58 22 22 22 6 6 6 0 0 0
57959- 0 0 0 0 0 0 0 0 0 0 0 0
57960- 0 0 0 0 0 0 0 0 0 0 0 0
57961- 0 0 0 0 0 0 0 0 0 0 0 0
57962- 0 0 0 0 0 0 0 0 0 0 0 0
57963- 0 0 0 0 0 0 0 0 0 0 0 0
57964- 0 0 0 0 0 0 0 0 0 0 0 0
57965- 0 0 0 0 0 0 0 0 0 0 0 0
57966- 0 0 0 0 0 0 6 6 6 18 18 18
57967- 54 54 54 82 82 82 2 2 6 26 26 26
57968- 22 22 22 2 2 6 123 123 123 253 253 253
57969-253 253 253 253 253 253 253 253 253 253 253 253
57970-253 253 253 253 253 253 253 253 253 253 253 253
57971-253 253 253 253 253 253 253 253 253 253 253 253
57972-253 253 253 253 253 253 253 253 253 253 253 253
57973-253 253 253 253 253 253 253 253 253 253 253 253
57974-253 253 253 253 253 253 253 253 253 250 250 250
57975-238 238 238 198 198 198 6 6 6 38 38 38
57976- 58 58 58 26 26 26 38 38 38 2 2 6
57977- 2 2 6 2 2 6 2 2 6 46 46 46
57978- 78 78 78 30 30 30 10 10 10 0 0 0
57979- 0 0 0 0 0 0 0 0 0 0 0 0
57980- 0 0 0 0 0 0 0 0 0 0 0 0
57981- 0 0 0 0 0 0 0 0 0 0 0 0
57982- 0 0 0 0 0 0 0 0 0 0 0 0
57983- 0 0 0 0 0 0 0 0 0 0 0 0
57984- 0 0 0 0 0 0 0 0 0 0 0 0
57985- 0 0 0 0 0 0 0 0 0 0 0 0
57986- 0 0 0 0 0 0 10 10 10 30 30 30
57987- 74 74 74 58 58 58 2 2 6 42 42 42
57988- 2 2 6 22 22 22 231 231 231 253 253 253
57989-253 253 253 253 253 253 253 253 253 253 253 253
57990-253 253 253 253 253 253 253 253 253 250 250 250
57991-253 253 253 253 253 253 253 253 253 253 253 253
57992-253 253 253 253 253 253 253 253 253 253 253 253
57993-253 253 253 253 253 253 253 253 253 253 253 253
57994-253 253 253 253 253 253 253 253 253 253 253 253
57995-253 253 253 246 246 246 46 46 46 38 38 38
57996- 42 42 42 14 14 14 38 38 38 14 14 14
57997- 2 2 6 2 2 6 2 2 6 6 6 6
57998- 86 86 86 46 46 46 14 14 14 0 0 0
57999- 0 0 0 0 0 0 0 0 0 0 0 0
58000- 0 0 0 0 0 0 0 0 0 0 0 0
58001- 0 0 0 0 0 0 0 0 0 0 0 0
58002- 0 0 0 0 0 0 0 0 0 0 0 0
58003- 0 0 0 0 0 0 0 0 0 0 0 0
58004- 0 0 0 0 0 0 0 0 0 0 0 0
58005- 0 0 0 0 0 0 0 0 0 0 0 0
58006- 0 0 0 6 6 6 14 14 14 42 42 42
58007- 90 90 90 18 18 18 18 18 18 26 26 26
58008- 2 2 6 116 116 116 253 253 253 253 253 253
58009-253 253 253 253 253 253 253 253 253 253 253 253
58010-253 253 253 253 253 253 250 250 250 238 238 238
58011-253 253 253 253 253 253 253 253 253 253 253 253
58012-253 253 253 253 253 253 253 253 253 253 253 253
58013-253 253 253 253 253 253 253 253 253 253 253 253
58014-253 253 253 253 253 253 253 253 253 253 253 253
58015-253 253 253 253 253 253 94 94 94 6 6 6
58016- 2 2 6 2 2 6 10 10 10 34 34 34
58017- 2 2 6 2 2 6 2 2 6 2 2 6
58018- 74 74 74 58 58 58 22 22 22 6 6 6
58019- 0 0 0 0 0 0 0 0 0 0 0 0
58020- 0 0 0 0 0 0 0 0 0 0 0 0
58021- 0 0 0 0 0 0 0 0 0 0 0 0
58022- 0 0 0 0 0 0 0 0 0 0 0 0
58023- 0 0 0 0 0 0 0 0 0 0 0 0
58024- 0 0 0 0 0 0 0 0 0 0 0 0
58025- 0 0 0 0 0 0 0 0 0 0 0 0
58026- 0 0 0 10 10 10 26 26 26 66 66 66
58027- 82 82 82 2 2 6 38 38 38 6 6 6
58028- 14 14 14 210 210 210 253 253 253 253 253 253
58029-253 253 253 253 253 253 253 253 253 253 253 253
58030-253 253 253 253 253 253 246 246 246 242 242 242
58031-253 253 253 253 253 253 253 253 253 253 253 253
58032-253 253 253 253 253 253 253 253 253 253 253 253
58033-253 253 253 253 253 253 253 253 253 253 253 253
58034-253 253 253 253 253 253 253 253 253 253 253 253
58035-253 253 253 253 253 253 144 144 144 2 2 6
58036- 2 2 6 2 2 6 2 2 6 46 46 46
58037- 2 2 6 2 2 6 2 2 6 2 2 6
58038- 42 42 42 74 74 74 30 30 30 10 10 10
58039- 0 0 0 0 0 0 0 0 0 0 0 0
58040- 0 0 0 0 0 0 0 0 0 0 0 0
58041- 0 0 0 0 0 0 0 0 0 0 0 0
58042- 0 0 0 0 0 0 0 0 0 0 0 0
58043- 0 0 0 0 0 0 0 0 0 0 0 0
58044- 0 0 0 0 0 0 0 0 0 0 0 0
58045- 0 0 0 0 0 0 0 0 0 0 0 0
58046- 6 6 6 14 14 14 42 42 42 90 90 90
58047- 26 26 26 6 6 6 42 42 42 2 2 6
58048- 74 74 74 250 250 250 253 253 253 253 253 253
58049-253 253 253 253 253 253 253 253 253 253 253 253
58050-253 253 253 253 253 253 242 242 242 242 242 242
58051-253 253 253 253 253 253 253 253 253 253 253 253
58052-253 253 253 253 253 253 253 253 253 253 253 253
58053-253 253 253 253 253 253 253 253 253 253 253 253
58054-253 253 253 253 253 253 253 253 253 253 253 253
58055-253 253 253 253 253 253 182 182 182 2 2 6
58056- 2 2 6 2 2 6 2 2 6 46 46 46
58057- 2 2 6 2 2 6 2 2 6 2 2 6
58058- 10 10 10 86 86 86 38 38 38 10 10 10
58059- 0 0 0 0 0 0 0 0 0 0 0 0
58060- 0 0 0 0 0 0 0 0 0 0 0 0
58061- 0 0 0 0 0 0 0 0 0 0 0 0
58062- 0 0 0 0 0 0 0 0 0 0 0 0
58063- 0 0 0 0 0 0 0 0 0 0 0 0
58064- 0 0 0 0 0 0 0 0 0 0 0 0
58065- 0 0 0 0 0 0 0 0 0 0 0 0
58066- 10 10 10 26 26 26 66 66 66 82 82 82
58067- 2 2 6 22 22 22 18 18 18 2 2 6
58068-149 149 149 253 253 253 253 253 253 253 253 253
58069-253 253 253 253 253 253 253 253 253 253 253 253
58070-253 253 253 253 253 253 234 234 234 242 242 242
58071-253 253 253 253 253 253 253 253 253 253 253 253
58072-253 253 253 253 253 253 253 253 253 253 253 253
58073-253 253 253 253 253 253 253 253 253 253 253 253
58074-253 253 253 253 253 253 253 253 253 253 253 253
58075-253 253 253 253 253 253 206 206 206 2 2 6
58076- 2 2 6 2 2 6 2 2 6 38 38 38
58077- 2 2 6 2 2 6 2 2 6 2 2 6
58078- 6 6 6 86 86 86 46 46 46 14 14 14
58079- 0 0 0 0 0 0 0 0 0 0 0 0
58080- 0 0 0 0 0 0 0 0 0 0 0 0
58081- 0 0 0 0 0 0 0 0 0 0 0 0
58082- 0 0 0 0 0 0 0 0 0 0 0 0
58083- 0 0 0 0 0 0 0 0 0 0 0 0
58084- 0 0 0 0 0 0 0 0 0 0 0 0
58085- 0 0 0 0 0 0 0 0 0 6 6 6
58086- 18 18 18 46 46 46 86 86 86 18 18 18
58087- 2 2 6 34 34 34 10 10 10 6 6 6
58088-210 210 210 253 253 253 253 253 253 253 253 253
58089-253 253 253 253 253 253 253 253 253 253 253 253
58090-253 253 253 253 253 253 234 234 234 242 242 242
58091-253 253 253 253 253 253 253 253 253 253 253 253
58092-253 253 253 253 253 253 253 253 253 253 253 253
58093-253 253 253 253 253 253 253 253 253 253 253 253
58094-253 253 253 253 253 253 253 253 253 253 253 253
58095-253 253 253 253 253 253 221 221 221 6 6 6
58096- 2 2 6 2 2 6 6 6 6 30 30 30
58097- 2 2 6 2 2 6 2 2 6 2 2 6
58098- 2 2 6 82 82 82 54 54 54 18 18 18
58099- 6 6 6 0 0 0 0 0 0 0 0 0
58100- 0 0 0 0 0 0 0 0 0 0 0 0
58101- 0 0 0 0 0 0 0 0 0 0 0 0
58102- 0 0 0 0 0 0 0 0 0 0 0 0
58103- 0 0 0 0 0 0 0 0 0 0 0 0
58104- 0 0 0 0 0 0 0 0 0 0 0 0
58105- 0 0 0 0 0 0 0 0 0 10 10 10
58106- 26 26 26 66 66 66 62 62 62 2 2 6
58107- 2 2 6 38 38 38 10 10 10 26 26 26
58108-238 238 238 253 253 253 253 253 253 253 253 253
58109-253 253 253 253 253 253 253 253 253 253 253 253
58110-253 253 253 253 253 253 231 231 231 238 238 238
58111-253 253 253 253 253 253 253 253 253 253 253 253
58112-253 253 253 253 253 253 253 253 253 253 253 253
58113-253 253 253 253 253 253 253 253 253 253 253 253
58114-253 253 253 253 253 253 253 253 253 253 253 253
58115-253 253 253 253 253 253 231 231 231 6 6 6
58116- 2 2 6 2 2 6 10 10 10 30 30 30
58117- 2 2 6 2 2 6 2 2 6 2 2 6
58118- 2 2 6 66 66 66 58 58 58 22 22 22
58119- 6 6 6 0 0 0 0 0 0 0 0 0
58120- 0 0 0 0 0 0 0 0 0 0 0 0
58121- 0 0 0 0 0 0 0 0 0 0 0 0
58122- 0 0 0 0 0 0 0 0 0 0 0 0
58123- 0 0 0 0 0 0 0 0 0 0 0 0
58124- 0 0 0 0 0 0 0 0 0 0 0 0
58125- 0 0 0 0 0 0 0 0 0 10 10 10
58126- 38 38 38 78 78 78 6 6 6 2 2 6
58127- 2 2 6 46 46 46 14 14 14 42 42 42
58128-246 246 246 253 253 253 253 253 253 253 253 253
58129-253 253 253 253 253 253 253 253 253 253 253 253
58130-253 253 253 253 253 253 231 231 231 242 242 242
58131-253 253 253 253 253 253 253 253 253 253 253 253
58132-253 253 253 253 253 253 253 253 253 253 253 253
58133-253 253 253 253 253 253 253 253 253 253 253 253
58134-253 253 253 253 253 253 253 253 253 253 253 253
58135-253 253 253 253 253 253 234 234 234 10 10 10
58136- 2 2 6 2 2 6 22 22 22 14 14 14
58137- 2 2 6 2 2 6 2 2 6 2 2 6
58138- 2 2 6 66 66 66 62 62 62 22 22 22
58139- 6 6 6 0 0 0 0 0 0 0 0 0
58140- 0 0 0 0 0 0 0 0 0 0 0 0
58141- 0 0 0 0 0 0 0 0 0 0 0 0
58142- 0 0 0 0 0 0 0 0 0 0 0 0
58143- 0 0 0 0 0 0 0 0 0 0 0 0
58144- 0 0 0 0 0 0 0 0 0 0 0 0
58145- 0 0 0 0 0 0 6 6 6 18 18 18
58146- 50 50 50 74 74 74 2 2 6 2 2 6
58147- 14 14 14 70 70 70 34 34 34 62 62 62
58148-250 250 250 253 253 253 253 253 253 253 253 253
58149-253 253 253 253 253 253 253 253 253 253 253 253
58150-253 253 253 253 253 253 231 231 231 246 246 246
58151-253 253 253 253 253 253 253 253 253 253 253 253
58152-253 253 253 253 253 253 253 253 253 253 253 253
58153-253 253 253 253 253 253 253 253 253 253 253 253
58154-253 253 253 253 253 253 253 253 253 253 253 253
58155-253 253 253 253 253 253 234 234 234 14 14 14
58156- 2 2 6 2 2 6 30 30 30 2 2 6
58157- 2 2 6 2 2 6 2 2 6 2 2 6
58158- 2 2 6 66 66 66 62 62 62 22 22 22
58159- 6 6 6 0 0 0 0 0 0 0 0 0
58160- 0 0 0 0 0 0 0 0 0 0 0 0
58161- 0 0 0 0 0 0 0 0 0 0 0 0
58162- 0 0 0 0 0 0 0 0 0 0 0 0
58163- 0 0 0 0 0 0 0 0 0 0 0 0
58164- 0 0 0 0 0 0 0 0 0 0 0 0
58165- 0 0 0 0 0 0 6 6 6 18 18 18
58166- 54 54 54 62 62 62 2 2 6 2 2 6
58167- 2 2 6 30 30 30 46 46 46 70 70 70
58168-250 250 250 253 253 253 253 253 253 253 253 253
58169-253 253 253 253 253 253 253 253 253 253 253 253
58170-253 253 253 253 253 253 231 231 231 246 246 246
58171-253 253 253 253 253 253 253 253 253 253 253 253
58172-253 253 253 253 253 253 253 253 253 253 253 253
58173-253 253 253 253 253 253 253 253 253 253 253 253
58174-253 253 253 253 253 253 253 253 253 253 253 253
58175-253 253 253 253 253 253 226 226 226 10 10 10
58176- 2 2 6 6 6 6 30 30 30 2 2 6
58177- 2 2 6 2 2 6 2 2 6 2 2 6
58178- 2 2 6 66 66 66 58 58 58 22 22 22
58179- 6 6 6 0 0 0 0 0 0 0 0 0
58180- 0 0 0 0 0 0 0 0 0 0 0 0
58181- 0 0 0 0 0 0 0 0 0 0 0 0
58182- 0 0 0 0 0 0 0 0 0 0 0 0
58183- 0 0 0 0 0 0 0 0 0 0 0 0
58184- 0 0 0 0 0 0 0 0 0 0 0 0
58185- 0 0 0 0 0 0 6 6 6 22 22 22
58186- 58 58 58 62 62 62 2 2 6 2 2 6
58187- 2 2 6 2 2 6 30 30 30 78 78 78
58188-250 250 250 253 253 253 253 253 253 253 253 253
58189-253 253 253 253 253 253 253 253 253 253 253 253
58190-253 253 253 253 253 253 231 231 231 246 246 246
58191-253 253 253 253 253 253 253 253 253 253 253 253
58192-253 253 253 253 253 253 253 253 253 253 253 253
58193-253 253 253 253 253 253 253 253 253 253 253 253
58194-253 253 253 253 253 253 253 253 253 253 253 253
58195-253 253 253 253 253 253 206 206 206 2 2 6
58196- 22 22 22 34 34 34 18 14 6 22 22 22
58197- 26 26 26 18 18 18 6 6 6 2 2 6
58198- 2 2 6 82 82 82 54 54 54 18 18 18
58199- 6 6 6 0 0 0 0 0 0 0 0 0
58200- 0 0 0 0 0 0 0 0 0 0 0 0
58201- 0 0 0 0 0 0 0 0 0 0 0 0
58202- 0 0 0 0 0 0 0 0 0 0 0 0
58203- 0 0 0 0 0 0 0 0 0 0 0 0
58204- 0 0 0 0 0 0 0 0 0 0 0 0
58205- 0 0 0 0 0 0 6 6 6 26 26 26
58206- 62 62 62 106 106 106 74 54 14 185 133 11
58207-210 162 10 121 92 8 6 6 6 62 62 62
58208-238 238 238 253 253 253 253 253 253 253 253 253
58209-253 253 253 253 253 253 253 253 253 253 253 253
58210-253 253 253 253 253 253 231 231 231 246 246 246
58211-253 253 253 253 253 253 253 253 253 253 253 253
58212-253 253 253 253 253 253 253 253 253 253 253 253
58213-253 253 253 253 253 253 253 253 253 253 253 253
58214-253 253 253 253 253 253 253 253 253 253 253 253
58215-253 253 253 253 253 253 158 158 158 18 18 18
58216- 14 14 14 2 2 6 2 2 6 2 2 6
58217- 6 6 6 18 18 18 66 66 66 38 38 38
58218- 6 6 6 94 94 94 50 50 50 18 18 18
58219- 6 6 6 0 0 0 0 0 0 0 0 0
58220- 0 0 0 0 0 0 0 0 0 0 0 0
58221- 0 0 0 0 0 0 0 0 0 0 0 0
58222- 0 0 0 0 0 0 0 0 0 0 0 0
58223- 0 0 0 0 0 0 0 0 0 0 0 0
58224- 0 0 0 0 0 0 0 0 0 6 6 6
58225- 10 10 10 10 10 10 18 18 18 38 38 38
58226- 78 78 78 142 134 106 216 158 10 242 186 14
58227-246 190 14 246 190 14 156 118 10 10 10 10
58228- 90 90 90 238 238 238 253 253 253 253 253 253
58229-253 253 253 253 253 253 253 253 253 253 253 253
58230-253 253 253 253 253 253 231 231 231 250 250 250
58231-253 253 253 253 253 253 253 253 253 253 253 253
58232-253 253 253 253 253 253 253 253 253 253 253 253
58233-253 253 253 253 253 253 253 253 253 253 253 253
58234-253 253 253 253 253 253 253 253 253 246 230 190
58235-238 204 91 238 204 91 181 142 44 37 26 9
58236- 2 2 6 2 2 6 2 2 6 2 2 6
58237- 2 2 6 2 2 6 38 38 38 46 46 46
58238- 26 26 26 106 106 106 54 54 54 18 18 18
58239- 6 6 6 0 0 0 0 0 0 0 0 0
58240- 0 0 0 0 0 0 0 0 0 0 0 0
58241- 0 0 0 0 0 0 0 0 0 0 0 0
58242- 0 0 0 0 0 0 0 0 0 0 0 0
58243- 0 0 0 0 0 0 0 0 0 0 0 0
58244- 0 0 0 6 6 6 14 14 14 22 22 22
58245- 30 30 30 38 38 38 50 50 50 70 70 70
58246-106 106 106 190 142 34 226 170 11 242 186 14
58247-246 190 14 246 190 14 246 190 14 154 114 10
58248- 6 6 6 74 74 74 226 226 226 253 253 253
58249-253 253 253 253 253 253 253 253 253 253 253 253
58250-253 253 253 253 253 253 231 231 231 250 250 250
58251-253 253 253 253 253 253 253 253 253 253 253 253
58252-253 253 253 253 253 253 253 253 253 253 253 253
58253-253 253 253 253 253 253 253 253 253 253 253 253
58254-253 253 253 253 253 253 253 253 253 228 184 62
58255-241 196 14 241 208 19 232 195 16 38 30 10
58256- 2 2 6 2 2 6 2 2 6 2 2 6
58257- 2 2 6 6 6 6 30 30 30 26 26 26
58258-203 166 17 154 142 90 66 66 66 26 26 26
58259- 6 6 6 0 0 0 0 0 0 0 0 0
58260- 0 0 0 0 0 0 0 0 0 0 0 0
58261- 0 0 0 0 0 0 0 0 0 0 0 0
58262- 0 0 0 0 0 0 0 0 0 0 0 0
58263- 0 0 0 0 0 0 0 0 0 0 0 0
58264- 6 6 6 18 18 18 38 38 38 58 58 58
58265- 78 78 78 86 86 86 101 101 101 123 123 123
58266-175 146 61 210 150 10 234 174 13 246 186 14
58267-246 190 14 246 190 14 246 190 14 238 190 10
58268-102 78 10 2 2 6 46 46 46 198 198 198
58269-253 253 253 253 253 253 253 253 253 253 253 253
58270-253 253 253 253 253 253 234 234 234 242 242 242
58271-253 253 253 253 253 253 253 253 253 253 253 253
58272-253 253 253 253 253 253 253 253 253 253 253 253
58273-253 253 253 253 253 253 253 253 253 253 253 253
58274-253 253 253 253 253 253 253 253 253 224 178 62
58275-242 186 14 241 196 14 210 166 10 22 18 6
58276- 2 2 6 2 2 6 2 2 6 2 2 6
58277- 2 2 6 2 2 6 6 6 6 121 92 8
58278-238 202 15 232 195 16 82 82 82 34 34 34
58279- 10 10 10 0 0 0 0 0 0 0 0 0
58280- 0 0 0 0 0 0 0 0 0 0 0 0
58281- 0 0 0 0 0 0 0 0 0 0 0 0
58282- 0 0 0 0 0 0 0 0 0 0 0 0
58283- 0 0 0 0 0 0 0 0 0 0 0 0
58284- 14 14 14 38 38 38 70 70 70 154 122 46
58285-190 142 34 200 144 11 197 138 11 197 138 11
58286-213 154 11 226 170 11 242 186 14 246 190 14
58287-246 190 14 246 190 14 246 190 14 246 190 14
58288-225 175 15 46 32 6 2 2 6 22 22 22
58289-158 158 158 250 250 250 253 253 253 253 253 253
58290-253 253 253 253 253 253 253 253 253 253 253 253
58291-253 253 253 253 253 253 253 253 253 253 253 253
58292-253 253 253 253 253 253 253 253 253 253 253 253
58293-253 253 253 253 253 253 253 253 253 253 253 253
58294-253 253 253 250 250 250 242 242 242 224 178 62
58295-239 182 13 236 186 11 213 154 11 46 32 6
58296- 2 2 6 2 2 6 2 2 6 2 2 6
58297- 2 2 6 2 2 6 61 42 6 225 175 15
58298-238 190 10 236 186 11 112 100 78 42 42 42
58299- 14 14 14 0 0 0 0 0 0 0 0 0
58300- 0 0 0 0 0 0 0 0 0 0 0 0
58301- 0 0 0 0 0 0 0 0 0 0 0 0
58302- 0 0 0 0 0 0 0 0 0 0 0 0
58303- 0 0 0 0 0 0 0 0 0 6 6 6
58304- 22 22 22 54 54 54 154 122 46 213 154 11
58305-226 170 11 230 174 11 226 170 11 226 170 11
58306-236 178 12 242 186 14 246 190 14 246 190 14
58307-246 190 14 246 190 14 246 190 14 246 190 14
58308-241 196 14 184 144 12 10 10 10 2 2 6
58309- 6 6 6 116 116 116 242 242 242 253 253 253
58310-253 253 253 253 253 253 253 253 253 253 253 253
58311-253 253 253 253 253 253 253 253 253 253 253 253
58312-253 253 253 253 253 253 253 253 253 253 253 253
58313-253 253 253 253 253 253 253 253 253 253 253 253
58314-253 253 253 231 231 231 198 198 198 214 170 54
58315-236 178 12 236 178 12 210 150 10 137 92 6
58316- 18 14 6 2 2 6 2 2 6 2 2 6
58317- 6 6 6 70 47 6 200 144 11 236 178 12
58318-239 182 13 239 182 13 124 112 88 58 58 58
58319- 22 22 22 6 6 6 0 0 0 0 0 0
58320- 0 0 0 0 0 0 0 0 0 0 0 0
58321- 0 0 0 0 0 0 0 0 0 0 0 0
58322- 0 0 0 0 0 0 0 0 0 0 0 0
58323- 0 0 0 0 0 0 0 0 0 10 10 10
58324- 30 30 30 70 70 70 180 133 36 226 170 11
58325-239 182 13 242 186 14 242 186 14 246 186 14
58326-246 190 14 246 190 14 246 190 14 246 190 14
58327-246 190 14 246 190 14 246 190 14 246 190 14
58328-246 190 14 232 195 16 98 70 6 2 2 6
58329- 2 2 6 2 2 6 66 66 66 221 221 221
58330-253 253 253 253 253 253 253 253 253 253 253 253
58331-253 253 253 253 253 253 253 253 253 253 253 253
58332-253 253 253 253 253 253 253 253 253 253 253 253
58333-253 253 253 253 253 253 253 253 253 253 253 253
58334-253 253 253 206 206 206 198 198 198 214 166 58
58335-230 174 11 230 174 11 216 158 10 192 133 9
58336-163 110 8 116 81 8 102 78 10 116 81 8
58337-167 114 7 197 138 11 226 170 11 239 182 13
58338-242 186 14 242 186 14 162 146 94 78 78 78
58339- 34 34 34 14 14 14 6 6 6 0 0 0
58340- 0 0 0 0 0 0 0 0 0 0 0 0
58341- 0 0 0 0 0 0 0 0 0 0 0 0
58342- 0 0 0 0 0 0 0 0 0 0 0 0
58343- 0 0 0 0 0 0 0 0 0 6 6 6
58344- 30 30 30 78 78 78 190 142 34 226 170 11
58345-239 182 13 246 190 14 246 190 14 246 190 14
58346-246 190 14 246 190 14 246 190 14 246 190 14
58347-246 190 14 246 190 14 246 190 14 246 190 14
58348-246 190 14 241 196 14 203 166 17 22 18 6
58349- 2 2 6 2 2 6 2 2 6 38 38 38
58350-218 218 218 253 253 253 253 253 253 253 253 253
58351-253 253 253 253 253 253 253 253 253 253 253 253
58352-253 253 253 253 253 253 253 253 253 253 253 253
58353-253 253 253 253 253 253 253 253 253 253 253 253
58354-250 250 250 206 206 206 198 198 198 202 162 69
58355-226 170 11 236 178 12 224 166 10 210 150 10
58356-200 144 11 197 138 11 192 133 9 197 138 11
58357-210 150 10 226 170 11 242 186 14 246 190 14
58358-246 190 14 246 186 14 225 175 15 124 112 88
58359- 62 62 62 30 30 30 14 14 14 6 6 6
58360- 0 0 0 0 0 0 0 0 0 0 0 0
58361- 0 0 0 0 0 0 0 0 0 0 0 0
58362- 0 0 0 0 0 0 0 0 0 0 0 0
58363- 0 0 0 0 0 0 0 0 0 10 10 10
58364- 30 30 30 78 78 78 174 135 50 224 166 10
58365-239 182 13 246 190 14 246 190 14 246 190 14
58366-246 190 14 246 190 14 246 190 14 246 190 14
58367-246 190 14 246 190 14 246 190 14 246 190 14
58368-246 190 14 246 190 14 241 196 14 139 102 15
58369- 2 2 6 2 2 6 2 2 6 2 2 6
58370- 78 78 78 250 250 250 253 253 253 253 253 253
58371-253 253 253 253 253 253 253 253 253 253 253 253
58372-253 253 253 253 253 253 253 253 253 253 253 253
58373-253 253 253 253 253 253 253 253 253 253 253 253
58374-250 250 250 214 214 214 198 198 198 190 150 46
58375-219 162 10 236 178 12 234 174 13 224 166 10
58376-216 158 10 213 154 11 213 154 11 216 158 10
58377-226 170 11 239 182 13 246 190 14 246 190 14
58378-246 190 14 246 190 14 242 186 14 206 162 42
58379-101 101 101 58 58 58 30 30 30 14 14 14
58380- 6 6 6 0 0 0 0 0 0 0 0 0
58381- 0 0 0 0 0 0 0 0 0 0 0 0
58382- 0 0 0 0 0 0 0 0 0 0 0 0
58383- 0 0 0 0 0 0 0 0 0 10 10 10
58384- 30 30 30 74 74 74 174 135 50 216 158 10
58385-236 178 12 246 190 14 246 190 14 246 190 14
58386-246 190 14 246 190 14 246 190 14 246 190 14
58387-246 190 14 246 190 14 246 190 14 246 190 14
58388-246 190 14 246 190 14 241 196 14 226 184 13
58389- 61 42 6 2 2 6 2 2 6 2 2 6
58390- 22 22 22 238 238 238 253 253 253 253 253 253
58391-253 253 253 253 253 253 253 253 253 253 253 253
58392-253 253 253 253 253 253 253 253 253 253 253 253
58393-253 253 253 253 253 253 253 253 253 253 253 253
58394-253 253 253 226 226 226 187 187 187 180 133 36
58395-216 158 10 236 178 12 239 182 13 236 178 12
58396-230 174 11 226 170 11 226 170 11 230 174 11
58397-236 178 12 242 186 14 246 190 14 246 190 14
58398-246 190 14 246 190 14 246 186 14 239 182 13
58399-206 162 42 106 106 106 66 66 66 34 34 34
58400- 14 14 14 6 6 6 0 0 0 0 0 0
58401- 0 0 0 0 0 0 0 0 0 0 0 0
58402- 0 0 0 0 0 0 0 0 0 0 0 0
58403- 0 0 0 0 0 0 0 0 0 6 6 6
58404- 26 26 26 70 70 70 163 133 67 213 154 11
58405-236 178 12 246 190 14 246 190 14 246 190 14
58406-246 190 14 246 190 14 246 190 14 246 190 14
58407-246 190 14 246 190 14 246 190 14 246 190 14
58408-246 190 14 246 190 14 246 190 14 241 196 14
58409-190 146 13 18 14 6 2 2 6 2 2 6
58410- 46 46 46 246 246 246 253 253 253 253 253 253
58411-253 253 253 253 253 253 253 253 253 253 253 253
58412-253 253 253 253 253 253 253 253 253 253 253 253
58413-253 253 253 253 253 253 253 253 253 253 253 253
58414-253 253 253 221 221 221 86 86 86 156 107 11
58415-216 158 10 236 178 12 242 186 14 246 186 14
58416-242 186 14 239 182 13 239 182 13 242 186 14
58417-242 186 14 246 186 14 246 190 14 246 190 14
58418-246 190 14 246 190 14 246 190 14 246 190 14
58419-242 186 14 225 175 15 142 122 72 66 66 66
58420- 30 30 30 10 10 10 0 0 0 0 0 0
58421- 0 0 0 0 0 0 0 0 0 0 0 0
58422- 0 0 0 0 0 0 0 0 0 0 0 0
58423- 0 0 0 0 0 0 0 0 0 6 6 6
58424- 26 26 26 70 70 70 163 133 67 210 150 10
58425-236 178 12 246 190 14 246 190 14 246 190 14
58426-246 190 14 246 190 14 246 190 14 246 190 14
58427-246 190 14 246 190 14 246 190 14 246 190 14
58428-246 190 14 246 190 14 246 190 14 246 190 14
58429-232 195 16 121 92 8 34 34 34 106 106 106
58430-221 221 221 253 253 253 253 253 253 253 253 253
58431-253 253 253 253 253 253 253 253 253 253 253 253
58432-253 253 253 253 253 253 253 253 253 253 253 253
58433-253 253 253 253 253 253 253 253 253 253 253 253
58434-242 242 242 82 82 82 18 14 6 163 110 8
58435-216 158 10 236 178 12 242 186 14 246 190 14
58436-246 190 14 246 190 14 246 190 14 246 190 14
58437-246 190 14 246 190 14 246 190 14 246 190 14
58438-246 190 14 246 190 14 246 190 14 246 190 14
58439-246 190 14 246 190 14 242 186 14 163 133 67
58440- 46 46 46 18 18 18 6 6 6 0 0 0
58441- 0 0 0 0 0 0 0 0 0 0 0 0
58442- 0 0 0 0 0 0 0 0 0 0 0 0
58443- 0 0 0 0 0 0 0 0 0 10 10 10
58444- 30 30 30 78 78 78 163 133 67 210 150 10
58445-236 178 12 246 186 14 246 190 14 246 190 14
58446-246 190 14 246 190 14 246 190 14 246 190 14
58447-246 190 14 246 190 14 246 190 14 246 190 14
58448-246 190 14 246 190 14 246 190 14 246 190 14
58449-241 196 14 215 174 15 190 178 144 253 253 253
58450-253 253 253 253 253 253 253 253 253 253 253 253
58451-253 253 253 253 253 253 253 253 253 253 253 253
58452-253 253 253 253 253 253 253 253 253 253 253 253
58453-253 253 253 253 253 253 253 253 253 218 218 218
58454- 58 58 58 2 2 6 22 18 6 167 114 7
58455-216 158 10 236 178 12 246 186 14 246 190 14
58456-246 190 14 246 190 14 246 190 14 246 190 14
58457-246 190 14 246 190 14 246 190 14 246 190 14
58458-246 190 14 246 190 14 246 190 14 246 190 14
58459-246 190 14 246 186 14 242 186 14 190 150 46
58460- 54 54 54 22 22 22 6 6 6 0 0 0
58461- 0 0 0 0 0 0 0 0 0 0 0 0
58462- 0 0 0 0 0 0 0 0 0 0 0 0
58463- 0 0 0 0 0 0 0 0 0 14 14 14
58464- 38 38 38 86 86 86 180 133 36 213 154 11
58465-236 178 12 246 186 14 246 190 14 246 190 14
58466-246 190 14 246 190 14 246 190 14 246 190 14
58467-246 190 14 246 190 14 246 190 14 246 190 14
58468-246 190 14 246 190 14 246 190 14 246 190 14
58469-246 190 14 232 195 16 190 146 13 214 214 214
58470-253 253 253 253 253 253 253 253 253 253 253 253
58471-253 253 253 253 253 253 253 253 253 253 253 253
58472-253 253 253 253 253 253 253 253 253 253 253 253
58473-253 253 253 250 250 250 170 170 170 26 26 26
58474- 2 2 6 2 2 6 37 26 9 163 110 8
58475-219 162 10 239 182 13 246 186 14 246 190 14
58476-246 190 14 246 190 14 246 190 14 246 190 14
58477-246 190 14 246 190 14 246 190 14 246 190 14
58478-246 190 14 246 190 14 246 190 14 246 190 14
58479-246 186 14 236 178 12 224 166 10 142 122 72
58480- 46 46 46 18 18 18 6 6 6 0 0 0
58481- 0 0 0 0 0 0 0 0 0 0 0 0
58482- 0 0 0 0 0 0 0 0 0 0 0 0
58483- 0 0 0 0 0 0 6 6 6 18 18 18
58484- 50 50 50 109 106 95 192 133 9 224 166 10
58485-242 186 14 246 190 14 246 190 14 246 190 14
58486-246 190 14 246 190 14 246 190 14 246 190 14
58487-246 190 14 246 190 14 246 190 14 246 190 14
58488-246 190 14 246 190 14 246 190 14 246 190 14
58489-242 186 14 226 184 13 210 162 10 142 110 46
58490-226 226 226 253 253 253 253 253 253 253 253 253
58491-253 253 253 253 253 253 253 253 253 253 253 253
58492-253 253 253 253 253 253 253 253 253 253 253 253
58493-198 198 198 66 66 66 2 2 6 2 2 6
58494- 2 2 6 2 2 6 50 34 6 156 107 11
58495-219 162 10 239 182 13 246 186 14 246 190 14
58496-246 190 14 246 190 14 246 190 14 246 190 14
58497-246 190 14 246 190 14 246 190 14 246 190 14
58498-246 190 14 246 190 14 246 190 14 242 186 14
58499-234 174 13 213 154 11 154 122 46 66 66 66
58500- 30 30 30 10 10 10 0 0 0 0 0 0
58501- 0 0 0 0 0 0 0 0 0 0 0 0
58502- 0 0 0 0 0 0 0 0 0 0 0 0
58503- 0 0 0 0 0 0 6 6 6 22 22 22
58504- 58 58 58 154 121 60 206 145 10 234 174 13
58505-242 186 14 246 186 14 246 190 14 246 190 14
58506-246 190 14 246 190 14 246 190 14 246 190 14
58507-246 190 14 246 190 14 246 190 14 246 190 14
58508-246 190 14 246 190 14 246 190 14 246 190 14
58509-246 186 14 236 178 12 210 162 10 163 110 8
58510- 61 42 6 138 138 138 218 218 218 250 250 250
58511-253 253 253 253 253 253 253 253 253 250 250 250
58512-242 242 242 210 210 210 144 144 144 66 66 66
58513- 6 6 6 2 2 6 2 2 6 2 2 6
58514- 2 2 6 2 2 6 61 42 6 163 110 8
58515-216 158 10 236 178 12 246 190 14 246 190 14
58516-246 190 14 246 190 14 246 190 14 246 190 14
58517-246 190 14 246 190 14 246 190 14 246 190 14
58518-246 190 14 239 182 13 230 174 11 216 158 10
58519-190 142 34 124 112 88 70 70 70 38 38 38
58520- 18 18 18 6 6 6 0 0 0 0 0 0
58521- 0 0 0 0 0 0 0 0 0 0 0 0
58522- 0 0 0 0 0 0 0 0 0 0 0 0
58523- 0 0 0 0 0 0 6 6 6 22 22 22
58524- 62 62 62 168 124 44 206 145 10 224 166 10
58525-236 178 12 239 182 13 242 186 14 242 186 14
58526-246 186 14 246 190 14 246 190 14 246 190 14
58527-246 190 14 246 190 14 246 190 14 246 190 14
58528-246 190 14 246 190 14 246 190 14 246 190 14
58529-246 190 14 236 178 12 216 158 10 175 118 6
58530- 80 54 7 2 2 6 6 6 6 30 30 30
58531- 54 54 54 62 62 62 50 50 50 38 38 38
58532- 14 14 14 2 2 6 2 2 6 2 2 6
58533- 2 2 6 2 2 6 2 2 6 2 2 6
58534- 2 2 6 6 6 6 80 54 7 167 114 7
58535-213 154 11 236 178 12 246 190 14 246 190 14
58536-246 190 14 246 190 14 246 190 14 246 190 14
58537-246 190 14 242 186 14 239 182 13 239 182 13
58538-230 174 11 210 150 10 174 135 50 124 112 88
58539- 82 82 82 54 54 54 34 34 34 18 18 18
58540- 6 6 6 0 0 0 0 0 0 0 0 0
58541- 0 0 0 0 0 0 0 0 0 0 0 0
58542- 0 0 0 0 0 0 0 0 0 0 0 0
58543- 0 0 0 0 0 0 6 6 6 18 18 18
58544- 50 50 50 158 118 36 192 133 9 200 144 11
58545-216 158 10 219 162 10 224 166 10 226 170 11
58546-230 174 11 236 178 12 239 182 13 239 182 13
58547-242 186 14 246 186 14 246 190 14 246 190 14
58548-246 190 14 246 190 14 246 190 14 246 190 14
58549-246 186 14 230 174 11 210 150 10 163 110 8
58550-104 69 6 10 10 10 2 2 6 2 2 6
58551- 2 2 6 2 2 6 2 2 6 2 2 6
58552- 2 2 6 2 2 6 2 2 6 2 2 6
58553- 2 2 6 2 2 6 2 2 6 2 2 6
58554- 2 2 6 6 6 6 91 60 6 167 114 7
58555-206 145 10 230 174 11 242 186 14 246 190 14
58556-246 190 14 246 190 14 246 186 14 242 186 14
58557-239 182 13 230 174 11 224 166 10 213 154 11
58558-180 133 36 124 112 88 86 86 86 58 58 58
58559- 38 38 38 22 22 22 10 10 10 6 6 6
58560- 0 0 0 0 0 0 0 0 0 0 0 0
58561- 0 0 0 0 0 0 0 0 0 0 0 0
58562- 0 0 0 0 0 0 0 0 0 0 0 0
58563- 0 0 0 0 0 0 0 0 0 14 14 14
58564- 34 34 34 70 70 70 138 110 50 158 118 36
58565-167 114 7 180 123 7 192 133 9 197 138 11
58566-200 144 11 206 145 10 213 154 11 219 162 10
58567-224 166 10 230 174 11 239 182 13 242 186 14
58568-246 186 14 246 186 14 246 186 14 246 186 14
58569-239 182 13 216 158 10 185 133 11 152 99 6
58570-104 69 6 18 14 6 2 2 6 2 2 6
58571- 2 2 6 2 2 6 2 2 6 2 2 6
58572- 2 2 6 2 2 6 2 2 6 2 2 6
58573- 2 2 6 2 2 6 2 2 6 2 2 6
58574- 2 2 6 6 6 6 80 54 7 152 99 6
58575-192 133 9 219 162 10 236 178 12 239 182 13
58576-246 186 14 242 186 14 239 182 13 236 178 12
58577-224 166 10 206 145 10 192 133 9 154 121 60
58578- 94 94 94 62 62 62 42 42 42 22 22 22
58579- 14 14 14 6 6 6 0 0 0 0 0 0
58580- 0 0 0 0 0 0 0 0 0 0 0 0
58581- 0 0 0 0 0 0 0 0 0 0 0 0
58582- 0 0 0 0 0 0 0 0 0 0 0 0
58583- 0 0 0 0 0 0 0 0 0 6 6 6
58584- 18 18 18 34 34 34 58 58 58 78 78 78
58585-101 98 89 124 112 88 142 110 46 156 107 11
58586-163 110 8 167 114 7 175 118 6 180 123 7
58587-185 133 11 197 138 11 210 150 10 219 162 10
58588-226 170 11 236 178 12 236 178 12 234 174 13
58589-219 162 10 197 138 11 163 110 8 130 83 6
58590- 91 60 6 10 10 10 2 2 6 2 2 6
58591- 18 18 18 38 38 38 38 38 38 38 38 38
58592- 38 38 38 38 38 38 38 38 38 38 38 38
58593- 38 38 38 38 38 38 26 26 26 2 2 6
58594- 2 2 6 6 6 6 70 47 6 137 92 6
58595-175 118 6 200 144 11 219 162 10 230 174 11
58596-234 174 13 230 174 11 219 162 10 210 150 10
58597-192 133 9 163 110 8 124 112 88 82 82 82
58598- 50 50 50 30 30 30 14 14 14 6 6 6
58599- 0 0 0 0 0 0 0 0 0 0 0 0
58600- 0 0 0 0 0 0 0 0 0 0 0 0
58601- 0 0 0 0 0 0 0 0 0 0 0 0
58602- 0 0 0 0 0 0 0 0 0 0 0 0
58603- 0 0 0 0 0 0 0 0 0 0 0 0
58604- 6 6 6 14 14 14 22 22 22 34 34 34
58605- 42 42 42 58 58 58 74 74 74 86 86 86
58606-101 98 89 122 102 70 130 98 46 121 87 25
58607-137 92 6 152 99 6 163 110 8 180 123 7
58608-185 133 11 197 138 11 206 145 10 200 144 11
58609-180 123 7 156 107 11 130 83 6 104 69 6
58610- 50 34 6 54 54 54 110 110 110 101 98 89
58611- 86 86 86 82 82 82 78 78 78 78 78 78
58612- 78 78 78 78 78 78 78 78 78 78 78 78
58613- 78 78 78 82 82 82 86 86 86 94 94 94
58614-106 106 106 101 101 101 86 66 34 124 80 6
58615-156 107 11 180 123 7 192 133 9 200 144 11
58616-206 145 10 200 144 11 192 133 9 175 118 6
58617-139 102 15 109 106 95 70 70 70 42 42 42
58618- 22 22 22 10 10 10 0 0 0 0 0 0
58619- 0 0 0 0 0 0 0 0 0 0 0 0
58620- 0 0 0 0 0 0 0 0 0 0 0 0
58621- 0 0 0 0 0 0 0 0 0 0 0 0
58622- 0 0 0 0 0 0 0 0 0 0 0 0
58623- 0 0 0 0 0 0 0 0 0 0 0 0
58624- 0 0 0 0 0 0 6 6 6 10 10 10
58625- 14 14 14 22 22 22 30 30 30 38 38 38
58626- 50 50 50 62 62 62 74 74 74 90 90 90
58627-101 98 89 112 100 78 121 87 25 124 80 6
58628-137 92 6 152 99 6 152 99 6 152 99 6
58629-138 86 6 124 80 6 98 70 6 86 66 30
58630-101 98 89 82 82 82 58 58 58 46 46 46
58631- 38 38 38 34 34 34 34 34 34 34 34 34
58632- 34 34 34 34 34 34 34 34 34 34 34 34
58633- 34 34 34 34 34 34 38 38 38 42 42 42
58634- 54 54 54 82 82 82 94 86 76 91 60 6
58635-134 86 6 156 107 11 167 114 7 175 118 6
58636-175 118 6 167 114 7 152 99 6 121 87 25
58637-101 98 89 62 62 62 34 34 34 18 18 18
58638- 6 6 6 0 0 0 0 0 0 0 0 0
58639- 0 0 0 0 0 0 0 0 0 0 0 0
58640- 0 0 0 0 0 0 0 0 0 0 0 0
58641- 0 0 0 0 0 0 0 0 0 0 0 0
58642- 0 0 0 0 0 0 0 0 0 0 0 0
58643- 0 0 0 0 0 0 0 0 0 0 0 0
58644- 0 0 0 0 0 0 0 0 0 0 0 0
58645- 0 0 0 6 6 6 6 6 6 10 10 10
58646- 18 18 18 22 22 22 30 30 30 42 42 42
58647- 50 50 50 66 66 66 86 86 86 101 98 89
58648-106 86 58 98 70 6 104 69 6 104 69 6
58649-104 69 6 91 60 6 82 62 34 90 90 90
58650- 62 62 62 38 38 38 22 22 22 14 14 14
58651- 10 10 10 10 10 10 10 10 10 10 10 10
58652- 10 10 10 10 10 10 6 6 6 10 10 10
58653- 10 10 10 10 10 10 10 10 10 14 14 14
58654- 22 22 22 42 42 42 70 70 70 89 81 66
58655- 80 54 7 104 69 6 124 80 6 137 92 6
58656-134 86 6 116 81 8 100 82 52 86 86 86
58657- 58 58 58 30 30 30 14 14 14 6 6 6
58658- 0 0 0 0 0 0 0 0 0 0 0 0
58659- 0 0 0 0 0 0 0 0 0 0 0 0
58660- 0 0 0 0 0 0 0 0 0 0 0 0
58661- 0 0 0 0 0 0 0 0 0 0 0 0
58662- 0 0 0 0 0 0 0 0 0 0 0 0
58663- 0 0 0 0 0 0 0 0 0 0 0 0
58664- 0 0 0 0 0 0 0 0 0 0 0 0
58665- 0 0 0 0 0 0 0 0 0 0 0 0
58666- 0 0 0 6 6 6 10 10 10 14 14 14
58667- 18 18 18 26 26 26 38 38 38 54 54 54
58668- 70 70 70 86 86 86 94 86 76 89 81 66
58669- 89 81 66 86 86 86 74 74 74 50 50 50
58670- 30 30 30 14 14 14 6 6 6 0 0 0
58671- 0 0 0 0 0 0 0 0 0 0 0 0
58672- 0 0 0 0 0 0 0 0 0 0 0 0
58673- 0 0 0 0 0 0 0 0 0 0 0 0
58674- 6 6 6 18 18 18 34 34 34 58 58 58
58675- 82 82 82 89 81 66 89 81 66 89 81 66
58676- 94 86 66 94 86 76 74 74 74 50 50 50
58677- 26 26 26 14 14 14 6 6 6 0 0 0
58678- 0 0 0 0 0 0 0 0 0 0 0 0
58679- 0 0 0 0 0 0 0 0 0 0 0 0
58680- 0 0 0 0 0 0 0 0 0 0 0 0
58681- 0 0 0 0 0 0 0 0 0 0 0 0
58682- 0 0 0 0 0 0 0 0 0 0 0 0
58683- 0 0 0 0 0 0 0 0 0 0 0 0
58684- 0 0 0 0 0 0 0 0 0 0 0 0
58685- 0 0 0 0 0 0 0 0 0 0 0 0
58686- 0 0 0 0 0 0 0 0 0 0 0 0
58687- 6 6 6 6 6 6 14 14 14 18 18 18
58688- 30 30 30 38 38 38 46 46 46 54 54 54
58689- 50 50 50 42 42 42 30 30 30 18 18 18
58690- 10 10 10 0 0 0 0 0 0 0 0 0
58691- 0 0 0 0 0 0 0 0 0 0 0 0
58692- 0 0 0 0 0 0 0 0 0 0 0 0
58693- 0 0 0 0 0 0 0 0 0 0 0 0
58694- 0 0 0 6 6 6 14 14 14 26 26 26
58695- 38 38 38 50 50 50 58 58 58 58 58 58
58696- 54 54 54 42 42 42 30 30 30 18 18 18
58697- 10 10 10 0 0 0 0 0 0 0 0 0
58698- 0 0 0 0 0 0 0 0 0 0 0 0
58699- 0 0 0 0 0 0 0 0 0 0 0 0
58700- 0 0 0 0 0 0 0 0 0 0 0 0
58701- 0 0 0 0 0 0 0 0 0 0 0 0
58702- 0 0 0 0 0 0 0 0 0 0 0 0
58703- 0 0 0 0 0 0 0 0 0 0 0 0
58704- 0 0 0 0 0 0 0 0 0 0 0 0
58705- 0 0 0 0 0 0 0 0 0 0 0 0
58706- 0 0 0 0 0 0 0 0 0 0 0 0
58707- 0 0 0 0 0 0 0 0 0 6 6 6
58708- 6 6 6 10 10 10 14 14 14 18 18 18
58709- 18 18 18 14 14 14 10 10 10 6 6 6
58710- 0 0 0 0 0 0 0 0 0 0 0 0
58711- 0 0 0 0 0 0 0 0 0 0 0 0
58712- 0 0 0 0 0 0 0 0 0 0 0 0
58713- 0 0 0 0 0 0 0 0 0 0 0 0
58714- 0 0 0 0 0 0 0 0 0 6 6 6
58715- 14 14 14 18 18 18 22 22 22 22 22 22
58716- 18 18 18 14 14 14 10 10 10 6 6 6
58717- 0 0 0 0 0 0 0 0 0 0 0 0
58718- 0 0 0 0 0 0 0 0 0 0 0 0
58719- 0 0 0 0 0 0 0 0 0 0 0 0
58720- 0 0 0 0 0 0 0 0 0 0 0 0
58721- 0 0 0 0 0 0 0 0 0 0 0 0
58722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58733+4 4 4 4 4 4 4 4 4 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
58736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58747+4 4 4 4 4 4 4 4 4 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
58750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58761+4 4 4 4 4 4 4 4 4 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
58764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58775+4 4 4 4 4 4 4 4 4 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
58778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58789+4 4 4 4 4 4 4 4 4 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
58792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58803+4 4 4 4 4 4 4 4 4 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
58806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58810+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58811+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58815+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58816+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58817+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
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
58820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58824+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58825+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58826+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58829+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58830+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58831+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58832+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58833+4 4 4 4 4 4
58834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58838+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58839+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58840+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58843+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58844+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58845+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58846+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4
58848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58851+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58852+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58853+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58854+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58856+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58857+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58858+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58859+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58860+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58861+4 4 4 4 4 4
58862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58865+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58866+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58867+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58868+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58869+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58870+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58871+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58872+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58873+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58874+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4
58876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58879+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58880+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58881+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58882+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58883+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58884+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58885+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58886+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58887+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58888+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58889+4 4 4 4 4 4
58890+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58892+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58893+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58894+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58895+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58896+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58897+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58898+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58899+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58900+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58901+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58902+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58903+4 4 4 4 4 4
58904+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58906+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58907+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58908+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58909+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58910+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58911+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58912+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58913+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58914+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58915+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58916+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58917+4 4 4 4 4 4
58918+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58919+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58920+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58921+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58922+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58923+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58924+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58925+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58926+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58927+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58928+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58929+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58930+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58931+4 4 4 4 4 4
58932+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58934+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58935+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58936+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58937+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58938+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58939+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58940+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58941+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58942+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58943+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58944+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58945+4 4 4 4 4 4
58946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58947+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58948+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58949+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58950+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58951+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58952+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58953+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58954+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58955+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58956+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58957+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58958+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58959+4 4 4 4 4 4
58960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58961+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58962+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58963+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58964+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58965+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58966+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58967+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58968+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58969+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58970+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58971+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58972+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58973+0 0 0 4 4 4
58974+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58975+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58976+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58977+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58978+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58979+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58980+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58981+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58982+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58983+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58984+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58985+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58986+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58987+2 0 0 0 0 0
58988+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58989+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58990+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58991+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58992+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58993+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58994+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58995+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58996+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58997+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58998+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58999+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
59000+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
59001+37 38 37 0 0 0
59002+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
59003+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
59004+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
59005+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
59006+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
59007+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
59008+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
59009+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
59010+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
59011+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
59012+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
59013+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
59014+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
59015+85 115 134 4 0 0
59016+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
59017+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
59018+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
59019+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
59020+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
59021+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
59022+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
59023+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
59024+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
59025+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
59026+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
59027+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
59028+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
59029+60 73 81 4 0 0
59030+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
59031+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
59032+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
59033+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
59034+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
59035+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
59036+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
59037+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
59038+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
59039+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
59040+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
59041+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
59042+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
59043+16 19 21 4 0 0
59044+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
59045+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
59046+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
59047+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
59048+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
59049+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
59050+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
59051+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
59052+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
59053+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
59054+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
59055+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
59056+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
59057+4 0 0 4 3 3
59058+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
59059+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
59060+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
59061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
59062+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
59063+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
59064+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
59065+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
59066+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
59067+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
59068+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
59069+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
59070+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
59071+3 2 2 4 4 4
59072+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
59073+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
59074+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
59075+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
59076+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
59077+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
59078+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
59079+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
59080+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
59081+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
59082+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
59083+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
59084+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
59085+4 4 4 4 4 4
59086+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
59087+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
59088+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
59089+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
59090+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
59091+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
59092+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
59093+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
59094+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
59095+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
59096+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
59097+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
59098+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
59099+4 4 4 4 4 4
59100+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
59101+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
59102+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
59103+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
59104+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
59105+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
59106+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
59107+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
59108+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
59109+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
59110+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
59111+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
59112+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
59113+5 5 5 5 5 5
59114+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
59115+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
59116+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
59117+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
59118+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
59119+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59120+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
59121+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
59122+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
59123+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
59124+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
59125+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
59126+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59127+5 5 5 4 4 4
59128+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
59129+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
59130+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
59131+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
59132+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59133+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
59134+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
59135+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
59136+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
59137+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
59138+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
59139+4 0 0 4 0 0 5 5 5 5 5 5 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
59142+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
59143+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
59144+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
59145+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
59146+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
59147+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59148+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59149+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
59150+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
59151+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
59152+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
59153+3 3 3 5 5 5 6 6 6 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
59156+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
59157+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
59158+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
59159+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
59160+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59161+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
59162+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
59163+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
59164+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
59165+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
59166+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 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
59170+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
59171+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
59172+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
59173+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
59174+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59175+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59176+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59177+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
59178+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
59179+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
59180+6 6 6 4 0 0 4 0 0 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
59184+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
59185+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
59186+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
59187+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
59188+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59189+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
59190+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
59191+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
59192+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
59193+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
59194+4 0 0 4 3 3 5 5 5 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
59198+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
59199+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
59200+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
59201+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
59202+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59203+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
59204+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
59205+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
59206+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
59207+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
59208+6 6 6 4 0 0 6 6 6 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
59212+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
59213+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
59214+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
59215+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
59216+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59217+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
59218+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
59219+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
59220+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
59221+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
59222+4 0 0 3 2 2 5 5 5 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
59226+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
59227+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
59228+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
59229+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59230+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
59231+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
59232+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
59233+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
59234+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
59235+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
59236+4 0 0 4 3 3 5 5 5 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
59240+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
59241+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
59242+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
59243+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59244+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59245+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
59246+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
59247+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
59248+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
59249+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
59250+4 0 0 4 3 3 5 5 5 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
59254+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
59255+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
59256+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59257+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59258+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59259+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
59260+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
59261+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
59262+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
59263+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
59264+4 0 0 3 3 3 5 5 5 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
59268+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
59269+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
59270+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59271+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59272+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59273+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
59274+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
59275+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
59276+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59277+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59278+0 0 0 3 3 3 5 5 5 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
59282+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59283+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
59284+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59285+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
59286+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
59287+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
59288+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
59289+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
59290+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59291+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59292+0 0 0 3 3 3 5 5 5 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
59296+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59297+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
59298+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59299+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
59300+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59301+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
59302+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
59303+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
59304+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59305+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59306+0 0 0 3 3 3 5 5 5 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
59310+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59311+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59312+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59313+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59314+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59315+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59316+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59317+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59318+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59319+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59320+0 0 0 3 3 3 5 5 5 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
59324+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59325+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59326+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59327+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59328+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59329+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59330+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59331+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59332+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59333+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59334+0 0 0 3 3 3 5 5 5 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
59338+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59339+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59340+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59341+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59342+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59343+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59344+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59345+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59346+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59347+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59348+0 0 0 3 3 3 5 5 5 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
59352+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59353+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59354+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59355+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59356+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59357+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59358+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59359+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59360+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59361+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59362+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 4 4
59366+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59367+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59368+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59369+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59370+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59371+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59372+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59373+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59374+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59375+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59376+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59379+4 4 4 4 4 4
59380+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59381+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59382+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59383+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59384+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59385+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59386+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59387+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59388+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59389+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59390+0 0 0 3 3 3 5 5 5 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
59394+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59395+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59396+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59397+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59398+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59399+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59400+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59401+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59402+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59403+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59404+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59407+4 4 4 4 4 4
59408+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59409+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59410+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59411+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59412+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59413+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59414+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59415+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59416+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59417+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59418+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59421+4 4 4 4 4 4
59422+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59423+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59424+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59425+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59426+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59427+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59428+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59429+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59430+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59431+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59432+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59435+4 4 4 4 4 4
59436+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59437+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59438+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59439+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59440+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59441+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59442+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59443+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59444+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59445+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59446+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59449+4 4 4 4 4 4
59450+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59451+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59452+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59453+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59454+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59455+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59456+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59457+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59458+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59459+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59460+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59463+4 4 4 4 4 4
59464+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59465+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59466+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59467+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59468+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59469+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59470+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59471+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59472+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59473+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59474+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59477+4 4 4 4 4 4
59478+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59479+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59480+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59481+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59482+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59483+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59484+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59485+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59486+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59487+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59488+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59489+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59491+4 4 4 4 4 4
59492+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59493+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59494+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59495+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59496+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59497+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59498+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59499+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59500+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59501+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59502+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59505+4 4 4 4 4 4
59506+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59507+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59508+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59509+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59510+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59511+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59512+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59513+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59514+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59515+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59516+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59519+4 4 4 4 4 4
59520+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59521+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59522+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59523+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59524+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59525+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59526+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59527+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59528+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59529+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59530+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59533+4 4 4 4 4 4
59534+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59535+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59536+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59537+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59538+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59539+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59540+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59541+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59542+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59543+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59547+4 4 4 4 4 4
59548+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59549+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59550+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59551+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59552+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59553+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59554+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59555+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59556+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59557+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59561+4 4 4 4 4 4
59562+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59563+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59564+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59565+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59566+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59567+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59568+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59569+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59570+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59571+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59575+4 4 4 4 4 4
59576+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59577+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59578+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59579+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59580+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59581+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59582+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59583+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59584+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59585+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59589+4 4 4 4 4 4
59590+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59591+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59592+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59593+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59594+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59595+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59596+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59597+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59598+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59603+4 4 4 4 4 4
59604+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59605+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59606+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59607+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59608+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59609+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59610+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59611+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59612+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59617+4 4 4 4 4 4
59618+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59619+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59620+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59621+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59622+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59623+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59624+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59625+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59626+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59631+4 4 4 4 4 4
59632+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59633+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59634+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59635+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59636+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59637+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59638+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59639+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59645+4 4 4 4 4 4
59646+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59647+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59648+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59649+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59650+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59651+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59652+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59653+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59659+4 4 4 4 4 4
59660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59661+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59662+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59663+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59664+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59665+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59666+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59667+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59673+4 4 4 4 4 4
59674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59675+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59676+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59677+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59678+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59679+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59680+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59681+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59682+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59687+4 4 4 4 4 4
59688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59689+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59690+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59691+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59692+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59693+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59694+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59695+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59696+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59701+4 4 4 4 4 4
59702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59704+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59705+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59706+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59707+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59708+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59709+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59710+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59715+4 4 4 4 4 4
59716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59719+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59720+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59721+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59722+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59729+4 4 4 4 4 4
59730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59733+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59734+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59735+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59736+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59743+4 4 4 4 4 4
59744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59747+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59748+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59749+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59750+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59757+4 4 4 4 4 4
59758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59761+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59762+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59763+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59764+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59771+4 4 4 4 4 4
59772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59776+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59777+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59778+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59785+4 4 4 4 4 4
59786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59790+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59791+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59792+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59799+4 4 4 4 4 4
59800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59804+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59805+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59806+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59813+4 4 4 4 4 4
59814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59818+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59819+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59827+4 4 4 4 4 4
59828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59832+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59833+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59841+4 4 4 4 4 4
59842diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59843index 3838795..0d48d61 100644
59844--- a/drivers/xen/events/events_base.c
59845+++ b/drivers/xen/events/events_base.c
59846@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59847 restore_pirqs();
59848 }
59849
59850-static struct irq_chip xen_dynamic_chip __read_mostly = {
59851+static struct irq_chip xen_dynamic_chip = {
59852 .name = "xen-dyn",
59853
59854 .irq_disable = disable_dynirq,
59855@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59856 .irq_retrigger = retrigger_dynirq,
59857 };
59858
59859-static struct irq_chip xen_pirq_chip __read_mostly = {
59860+static struct irq_chip xen_pirq_chip = {
59861 .name = "xen-pirq",
59862
59863 .irq_startup = startup_pirq,
59864@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59865 .irq_retrigger = retrigger_dynirq,
59866 };
59867
59868-static struct irq_chip xen_percpu_chip __read_mostly = {
59869+static struct irq_chip xen_percpu_chip = {
59870 .name = "xen-percpu",
59871
59872 .irq_disable = disable_dynirq,
59873diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
59874index 00f40f0..e3c0b15 100644
59875--- a/drivers/xen/evtchn.c
59876+++ b/drivers/xen/evtchn.c
59877@@ -201,8 +201,8 @@ static ssize_t evtchn_read(struct file *file, char __user *buf,
59878
59879 /* Byte lengths of two chunks. Chunk split (if any) is at ring wrap. */
59880 if (((c ^ p) & EVTCHN_RING_SIZE) != 0) {
59881- bytes1 = (EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c)) *
59882- sizeof(evtchn_port_t);
59883+ bytes1 = EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c);
59884+ bytes1 *= sizeof(evtchn_port_t);
59885 bytes2 = EVTCHN_RING_MASK(p) * sizeof(evtchn_port_t);
59886 } else {
59887 bytes1 = (p - c) * sizeof(evtchn_port_t);
59888diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59889index fef20db..d28b1ab 100644
59890--- a/drivers/xen/xenfs/xenstored.c
59891+++ b/drivers/xen/xenfs/xenstored.c
59892@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59893 static int xsd_kva_open(struct inode *inode, struct file *file)
59894 {
59895 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59896+#ifdef CONFIG_GRKERNSEC_HIDESYM
59897+ NULL);
59898+#else
59899 xen_store_interface);
59900+#endif
59901+
59902 if (!file->private_data)
59903 return -ENOMEM;
59904 return 0;
59905diff --git a/firmware/Makefile b/firmware/Makefile
59906index e297e1b..aeb0982 100644
59907--- a/firmware/Makefile
59908+++ b/firmware/Makefile
59909@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59910 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59911 bnx2x/bnx2x-e2-6.2.9.0.fw
59912 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59913+ bnx2/bnx2-mips-09-6.2.1b.fw \
59914 bnx2/bnx2-rv2p-09-6.0.17.fw \
59915 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59916 bnx2/bnx2-mips-06-6.2.1.fw \
59917+ bnx2/bnx2-mips-06-6.2.3.fw \
59918 bnx2/bnx2-rv2p-06-6.0.15.fw
59919 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
59920 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
59921diff --git a/firmware/WHENCE b/firmware/WHENCE
59922index 0c4d96d..b17700f 100644
59923--- a/firmware/WHENCE
59924+++ b/firmware/WHENCE
59925@@ -653,21 +653,23 @@ Found in hex form in kernel source.
59926 Driver: BNX2 - Broadcom NetXtremeII
59927
59928 File: bnx2/bnx2-mips-06-6.2.1.fw
59929+File: bnx2/bnx2-mips-06-6.2.3.fw
59930 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59931 File: bnx2/bnx2-mips-09-6.2.1a.fw
59932+File: bnx2/bnx2-mips-09-6.2.1b.fw
59933 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59934 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59935
59936 Licence:
59937-
59938- This file contains firmware data derived from proprietary unpublished
59939- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59940-
59941- Permission is hereby granted for the distribution of this firmware data
59942- in hexadecimal or equivalent format, provided this copyright notice is
59943- accompanying it.
59944-
59945-Found in hex form in kernel source.
59946+
59947+ This file contains firmware data derived from proprietary unpublished
59948+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59949+
59950+ Permission is hereby granted for the distribution of this firmware data
59951+ in hexadecimal or equivalent format, provided this copyright notice is
59952+ accompanying it.
59953+
59954+Found in hex form in kernel source.
59955
59956 --------------------------------------------------------------------------
59957
59958diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59959new file mode 100644
59960index 0000000..da72bf1
59961--- /dev/null
59962+++ b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59963@@ -0,0 +1,5804 @@
59964+:10000000080001180800000000004A68000000C84D
59965+:1000100000000000000000000000000008004A6826
59966+:100020000000001400004B30080000A00800000091
59967+:100030000000569400004B44080058200000008443
59968+:100040000000A1D808005694000001580000A25CEE
59969+:100050000800321008000000000072F00000A3B495
59970+:10006000000000000000000000000000080072F026
59971+:1000700000000024000116A40800049008000400F9
59972+:10008000000017D4000116C80000000000000000A6
59973+:100090000000000000000000000000000000000060
59974+:1000A000080000A80800000000003BFC00012E9C96
59975+:1000B0000000000000000000000000000000000040
59976+:1000C00000000000000000000A00004600000000E0
59977+:1000D000000000000000000D636F6D362E322E33DD
59978+:1000E0000000000006020302000000000000000300
59979+:1000F000000000C800000032000000030000000003
59980+:1001000000000000000000000000000000000000EF
59981+:1001100000000010000001360000EA600000000549
59982+:1001200000000000000000000000000000000008C7
59983+:1001300000000000000000000000000000000000BF
59984+:1001400000000000000000000000000000000000AF
59985+:10015000000000000000000000000000000000009F
59986+:10016000000000020000000000000000000000008D
59987+:10017000000000000000000000000000000000007F
59988+:10018000000000000000000000000010000000005F
59989+:10019000000000000000000000000000000000005F
59990+:1001A000000000000000000000000000000000004F
59991+:1001B000000000000000000000000000000000003F
59992+:1001C000000000000000000000000000000000002F
59993+:1001D000000000000000000000000000000000001F
59994+:1001E0000000000010000003000000000000000DEF
59995+:1001F0000000000D3C02080024424AA03C03080015
59996+:1002000024634B9CAC4000000043202B1480FFFD76
59997+:10021000244200043C1D080037BD7FFC03A0F021F0
59998+:100220003C100800261001183C1C0800279C4AA01E
59999+:100230000E000168000000000000000D27470100CB
60000+:1002400090E3000B2402001A94E5000814620028D1
60001+:10025000000020218CE200003C0308008C63004475
60002+:1002600094E60014000211C20002104030A4000203
60003+:10027000005A10212463000130A50004A446008028
60004+:100280003C010800AC23004410A000190004202BFE
60005+:100290008F4202B804410008240400013C02080017
60006+:1002A0008C420060244200013C010800AC22006046
60007+:1002B00003E00008008010218CE2002094E3001687
60008+:1002C00000002021AF4202808CE20004A743028498
60009+:1002D000AF4202883C021000AF4202B83C02080064
60010+:1002E0008C42005C244200013C010800AC22005C0E
60011+:1002F00003E00008008010212747010090E3000B75
60012+:100300002402000394E50008146200280000202164
60013+:100310008CE200003C0308008C63004494E6001467
60014+:10032000000211C20002104030A40002005A102145
60015+:100330002463000130A50004A44600803C010800AD
60016+:10034000AC23004410A000190004202B8F4202B8F7
60017+:1003500004410008240400013C0208008C420060B3
60018+:10036000244200013C010800AC22006003E00008C8
60019+:10037000008010218CE2002094E300160000202170
60020+:10038000AF4202808CE20004A7430284AF4202889D
60021+:100390003C021000AF4202B83C0208008C42005CF4
60022+:1003A000244200013C010800AC22005C03E000088C
60023+:1003B000008010218F4301002402010050620003DD
60024+:1003C000000311C20000000D000311C20002104022
60025+:1003D000005A1021A440008003E000080000102112
60026+:1003E0009362000003E00008AF80000003E0000813
60027+:1003F0000000102103E00008000010212402010089
60028+:1004000014820008000000003C0208008C4200FC3E
60029+:10041000244200013C010800AC2200FC0A0000DD7F
60030+:1004200030A200203C0208008C42008424420001DB
60031+:100430003C010800AC22008430A2002010400008DB
60032+:1004400030A300103C0208008C4201082442000145
60033+:100450003C010800AC22010803E000080000000095
60034+:1004600010600008000000003C0208008C420104FB
60035+:10047000244200013C010800AC22010403E0000812
60036+:10048000000000003C0208008C42010024420001F0
60037+:100490003C010800AC22010003E00008000000005D
60038+:1004A00027BDFFE8AFBF0010274401009483000878
60039+:1004B000306200041040001B306600028F4202B818
60040+:1004C00004410008240500013C0208008C42006041
60041+:1004D000244200013C010800AC2200600A0001290E
60042+:1004E0008FBF00108C82002094830016000028210A
60043+:1004F000AF4202808C820004A7430284AF4202888C
60044+:100500003C021000AF4202B83C0208008C42005C82
60045+:10051000244200013C010800AC22005C0A000129D1
60046+:100520008FBF001010C00006006028218F4401001A
60047+:100530000E0000CD000000000A0001282405000183
60048+:100540008F8200088F4301045043000700002821D8
60049+:100550008F4401000E0000CD000000008F42010416
60050+:10056000AF820008000028218FBF001000A01021DA
60051+:1005700003E0000827BD001827BDFFE8AFBF001447
60052+:10058000AFB00010974201083043700024022000F1
60053+:100590001062000B286220011440002F000010217F
60054+:1005A00024024000106200250000000024026000C8
60055+:1005B00010620026000010210A0001658FBF0014A0
60056+:1005C00027500100920200091040001A2403000184
60057+:1005D0003C0208008C420020104000160000182148
60058+:1005E0000E00049300000000960300083C0608007B
60059+:1005F00094C64B5E8E0400188F8200209605000C76
60060+:1006000000031C0000661825AC440000AC45000443
60061+:1006100024040001AC400008AC40000CAC400010C9
60062+:10062000AC400014AC4000180E0004B8AC43001CF1
60063+:10063000000018210A000164006010210E0003254B
60064+:10064000000000000A000164000010210E000EE905
60065+:1006500000000000000010218FBF00148FB00010B8
60066+:1006600003E0000827BD001827BDFFE0AFB2001867
60067+:100670003C036010AFBF001CAFB10014AFB000105E
60068+:100680008C6450002402FF7F3C1A800000822024EA
60069+:100690003484380C24020037AC6450003C1208004B
60070+:1006A00026524AD8AF42000824020C80AF420024F0
60071+:1006B0003C1B80083C06080024C60324024010218D
60072+:1006C0002404001D2484FFFFAC4600000481FFFDCC
60073+:1006D000244200043C020800244204B03C0108000B
60074+:1006E000AC224AE03C020800244202303C010800EF
60075+:1006F000AC224AE43C020800244201743C03080096
60076+:100700002463032C3C040800248403D83C0508001F
60077+:1007100024A538F03C010800AC224B403C02080004
60078+:10072000244202EC3C010800AC264B243C010800AA
60079+:10073000AC254B343C010800AC234B3C3C01080089
60080+:10074000AC244B443C010800AC224B483C0108005F
60081+:10075000AC234ADC3C010800AC204AE83C0108001C
60082+:10076000AC204AEC3C010800AC204AF03C010800F7
60083+:10077000AC204AF43C010800AC204AF83C010800D7
60084+:10078000AC204AFC3C010800AC204B003C010800B6
60085+:10079000AC244B043C010800AC204B083C01080091
60086+:1007A000AC204B0C3C010800AC204B103C01080075
60087+:1007B000AC204B143C010800AC204B183C01080055
60088+:1007C000AC264B1C3C010800AC264B203C01080029
60089+:1007D000AC254B303C010800AC234B380E000623FF
60090+:1007E000000000003C028000344200708C42000097
60091+:1007F000AF8200143C0308008C6300208F82000449
60092+:10080000104300043C0280000E00045BAF83000430
60093+:100810003C028000344600703C0308008C6300A05A
60094+:100820003C0208008C4200A4104300048F84001492
60095+:100830003C010800AC2300A4A743009E8CCA000022
60096+:100840003C0308008C6300BC3C0208008C4200B8EA
60097+:100850000144202300641821000040210064202B63
60098+:1008600000481021004410213C010800AC2300BCCA
60099+:100870003C010800AC2200B88F5100003222000772
60100+:100880001040FFDCAF8A00148CC600003C05080055
60101+:100890008CA500BC3C0408008C8400B800CA30233E
60102+:1008A00000A628210000102100A6302B0082202164
60103+:1008B00000862021322700013C010800AC2500BC45
60104+:1008C0003C010800AC2400B810E0001F32220002F6
60105+:1008D0008F420100AF4200208F420104AF4200A8C6
60106+:1008E0009342010B0E0000C6305000FF2E02001E86
60107+:1008F00054400004001010800E0000C90A000213CA
60108+:1009000000000000005210218C4200000040F80955
60109+:1009100000000000104000053C0240008F4301042D
60110+:100920003C026020AC4300143C024000AF4201385E
60111+:100930003C0208008C420034244200013C010800C3
60112+:10094000AC220034322200021040000E3222000499
60113+:100950008F4201400E0000C6AF4200200E000295FB
60114+:10096000000000003C024000AF4201783C02080059
60115+:100970008C420038244200013C010800AC220038BF
60116+:10098000322200041040FF983C0280008F42018018
60117+:100990000E0000C6AF4200208F43018024020F00EA
60118+:1009A00014620005000000008F420188A742009CED
60119+:1009B0000A0002483C0240009362000024030050F9
60120+:1009C000304200FF144300083C0240000E00027B4E
60121+:1009D00000000000544000043C0240000E000D7571
60122+:1009E000000000003C024000AF4201B83C02080099
60123+:1009F0008C42003C244200013C010800AC22003C37
60124+:100A00000A0001C83C0280003C0290003442000110
60125+:100A100000822025AF4400208F4200200440FFFECA
60126+:100A20000000000003E00008000000003C0280001D
60127+:100A3000344200010082202503E00008AF4400207A
60128+:100A400027BDFFE0AFB10014AFB0001000808821D7
60129+:100A5000AFBF00180E00025030B000FF9362007D5F
60130+:100A60000220202102028025A370007D8F70007477
60131+:100A70003C0280000E000259020280241600000988
60132+:100A80008FBF00188F4201F80440FFFE24020002CD
60133+:100A9000AF5101C0A34201C43C021000AF4201F8B3
60134+:100AA0008FBF00188FB100148FB0001003E0000852
60135+:100AB00027BD002027BDFFE8AFBF0010974201848B
60136+:100AC0008F440188304202001040000500002821B8
60137+:100AD0000E000FAA000000000A00028D240500018C
60138+:100AE0003C02FF0004800005008218243C02040040
60139+:100AF000506200019362003E240500018FBF001088
60140+:100B000000A0102103E0000827BD0018A360002208
60141+:100B10008F4401400A00025E2405000127BDFFE862
60142+:100B2000AFBF0014AFB0001093620000304400FF6C
60143+:100B300038830020388200300003182B0002102B6D
60144+:100B40000062182410600003240200501482008008
60145+:100B50008FBF001493620005304200011040007CFA
60146+:100B60008FBF0014934201482443FFFF2C6200050D
60147+:100B7000104000788FB00010000310803C03080084
60148+:100B800024634A68004310218C42000000400008A2
60149+:100B9000000000000E0002508F4401408F70000CD6
60150+:100BA0008F4201441602000224020001AF62000CD1
60151+:100BB0000E0002598F4401408F420144145000043A
60152+:100BC0008FBF00148FB000100A000F2027BD00183F
60153+:100BD0008F62000C0A0003040000000097620010FE
60154+:100BE0008F4301443042FFFF1462001A00000000EE
60155+:100BF00024020001A76200108F4202380443001053
60156+:100C00008F4201403C02003F3446F0003C0560004A
60157+:100C10003C04FFC08CA22BBC0044182400461024C6
60158+:100C20000002130200031D82106200390000000060
60159+:100C30008F4202380440FFF7000000008F4201405D
60160+:100C4000AF4202003C021000AF4202380A00032209
60161+:100C50008FBF0014976200100A0003040000000018
60162+:100C60000E0002508F440140976200128F430144EE
60163+:100C70003050FFFF1603000224020001A762001299
60164+:100C80000E0002598F4401408F42014416020004B5
60165+:100C90008FBF00148FB000100A00029127BD00180A
60166+:100CA000976200120A00030400000000976200141B
60167+:100CB0008F4301443042FFFF14620006240200010A
60168+:100CC0008FBF00148FB00010A76200140A00124AF0
60169+:100CD00027BD0018976200141440001D8FBF001438
60170+:100CE0000A00031C00000000976200168F430144B5
60171+:100CF0003042FFFF1462000B240200018FBF00147A
60172+:100D00008FB00010A76200160A000B1227BD001852
60173+:100D10009742007824420004A76200100A000322D0
60174+:100D20008FBF001497620016240300013042FFFFBA
60175+:100D3000144300078FBF00143C0208008C4200706F
60176+:100D4000244200013C010800AC2200708FBF001457
60177+:100D50008FB0001003E0000827BD001827BDFFE892
60178+:100D6000AFBF0014AFB000108F50010093620000BD
60179+:100D700093430109304400FF2402001F106200A5C4
60180+:100D80002862002010400018240200382862000A5F
60181+:100D90001040000C2402000B286200081040002CB8
60182+:100DA00000000000046000E52862000214400028F2
60183+:100DB00024020006106200268FBF00140A00041FE0
60184+:100DC0008FB000101062005E2862000B144000DC3F
60185+:100DD0008FBF00142402000E106200738FB0001049
60186+:100DE0000A00041F00000000106200C028620039E1
60187+:100DF0001040000A2402008024020036106200CA5B
60188+:100E000028620037104000B424020035106200C18F
60189+:100E10008FBF00140A00041F8FB000101062002B57
60190+:100E20002862008110400006240200C82402003914
60191+:100E3000106200B48FBF00140A00041F8FB00010AE
60192+:100E4000106200998FBF00140A00041F8FB00010B9
60193+:100E50003C0208008C420020104000B98FBF0014F3
60194+:100E60000E000493000000008F4201008F830020D9
60195+:100E70009745010C97460108AC6200008F420104BF
60196+:100E80003C04080094844B5E00052C00AC62000416
60197+:100E90008F4201180006340000C43025AC620008FF
60198+:100EA0008F42011C24040001AC62000C9342010A31
60199+:100EB00000A22825AC650010AC600014AC600018DE
60200+:100EC000AC66001C0A0003F58FBF00143C0208004A
60201+:100ED0008C4200201040009A8FBF00140E00049333
60202+:100EE00000000000974401083C03080094634B5E37
60203+:100EF0009745010C000422029746010E8F820020C4
60204+:100F0000000426000083202500052C003C030080FF
60205+:100F100000A6282500832025AC400000AC4000043A
60206+:100F2000AC400008AC40000CAC450010AC400014D4
60207+:100F3000AC400018AC44001C0A0003F42404000177
60208+:100F40009742010C14400015000000009362000558
60209+:100F50003042001014400011000000000E0002504A
60210+:100F6000020020219362000502002021344200107B
60211+:100F70000E000259A36200059362000024030020C2
60212+:100F8000304200FF1043006D020020218FBF00148B
60213+:100F90008FB000100A000FC027BD00180000000D20
60214+:100FA0000A00041E8FBF00143C0208008C4200207F
60215+:100FB000104000638FBF00140E0004930000000077
60216+:100FC0008F4201048F8300209744010C3C050800E8
60217+:100FD00094A54B5EAC6200009762002C00042400D4
60218+:100FE0003042FFFF008220253C02400E00A228254F
60219+:100FF000AC640004AC600008AC60000CAC60001095
60220+:10100000AC600014AC600018AC65001C0A0003F46E
60221+:10101000240400010E00025002002021A7600008F5
60222+:101020000E00025902002021020020210E00025E63
60223+:10103000240500013C0208008C42002010400040C2
60224+:101040008FBF00140E000493000000009742010CB3
60225+:101050008F8300203C05080094A54B5E000214001D
60226+:10106000AC700000AC620004AC6000088F64004CFF
60227+:101070003C02401F00A22825AC64000C8F62005087
60228+:1010800024040001AC6200108F620054AC620014B2
60229+:10109000AC600018AC65001C8FBF00148FB000104E
60230+:1010A0000A0004B827BD0018240200205082002541
60231+:1010B0008FB000100E000F0A020020211040002007
60232+:1010C0008FBF0014020020218FB0001000002821E3
60233+:1010D0000A00025E27BD0018020020218FBF001405
60234+:1010E0008FB000100A00058027BD00189745010C3D
60235+:1010F000020020218FBF00148FB000100A0005A04D
60236+:1011000027BD0018020020218FB000100A0005C57D
60237+:1011100027BD00189345010D020020218FB000105B
60238+:101120000A00060F27BD0018020020218FBF0014FF
60239+:101130008FB000100A0005EB27BD00188FBF001408
60240+:101140008FB0001003E0000827BD00188F4202781E
60241+:101150000440FFFE2402000234840080AF440240B9
60242+:10116000A34202443C02100003E00008AF420278B0
60243+:101170003C04080094844B6A3C0208008C424B7487
60244+:101180003083FFFF000318C000431021AF42003C32
60245+:101190003C0208008C424B70AF4200383C020050C9
60246+:1011A00034420008AF4200300000000000000000A0
60247+:1011B000000000008F420000304200201040FFFD80
60248+:1011C000000000008F4204003C010800AC224B608C
60249+:1011D0008F4204043C010800AC224B643C02002016
60250+:1011E000AF420030000000003C02080094424B680F
60251+:1011F0003C03080094634B6C3C05080094A54B6EBF
60252+:1012000024840001004310213083FFFF3C010800CB
60253+:10121000A4224B683C010800A4244B6A1465000317
60254+:10122000000000003C010800A4204B6A03E0000815
60255+:10123000000000003C05000A27BDFFE80345282107
60256+:101240003C04080024844B50AFBF00100E00051D65
60257+:101250002406000A3C02080094424B523C0308005A
60258+:1012600094634B6E3042000F244200030043180485
60259+:1012700024027FFF0043102B10400002AF83001CAC
60260+:101280000000000D0E00042A000000003C020800CF
60261+:1012900094424B5A8FBF001027BD001803E000088E
60262+:1012A000A74200A23C02000A034210219443000618
60263+:1012B0003C02080094424B5A3C010800A4234B56C0
60264+:1012C000004310238F83001C00021400000214034B
60265+:1012D0000043102B03E000083842000127BDFFE85F
60266+:1012E000AFBF00103C02000A0342102194420006E6
60267+:1012F0003C010800A4224B560E00047700000000B9
60268+:101300005440FFF93C02000A8FBF001003E00008C0
60269+:1013100027BD001827BDFFE8AFBF00100E000477FF
60270+:101320000000000010400003000000000E000485D3
60271+:10133000000000003C0208008C424B608FBF001090
60272+:1013400027430400AF4200383C0208008C424B6443
60273+:1013500027BD0018AF830020AF42003C3C020005CF
60274+:10136000AF42003003E00008AF8000188F82001801
60275+:101370003C0300060002114000431025AF4200303C
60276+:101380000000000000000000000000008F4200008C
60277+:10139000304200101040FFFD27420400AF820020C1
60278+:1013A00003E00008AF8000183C0608008CC64B64C0
60279+:1013B0008F8500188F8300203C02080094424B5A0E
60280+:1013C00027BDFFE024A50001246300202442000182
60281+:1013D00024C70020AFB10014AFB00010AFBF001899
60282+:1013E000AF850018AF8300203C010800A4224B5AAF
60283+:1013F000309000FF3C010800AC274B6404C100089A
60284+:101400000000882104E00006000000003C02080003
60285+:101410008C424B60244200013C010800AC224B602E
60286+:101420003C02080094424B5A3C03080094634B680A
60287+:101430000010202B004310262C42000100441025F0
60288+:10144000144000048F830018240200101462000F5F
60289+:10145000000000000E0004A9241100013C03080054
60290+:1014600094634B5A3C02080094424B681462000398
60291+:10147000000000000E00042A000000001600000317
60292+:10148000000000000E000493000000003C03080070
60293+:1014900094634B5E3C02080094424B5C2463000161
60294+:1014A0003064FFFF3C010800A4234B5E148200035C
60295+:1014B000000000003C010800A4204B5E1200000662
60296+:1014C000000000003C02080094424B5AA74200A2D0
60297+:1014D0000A00050B022010210E0004770000000016
60298+:1014E00010400004022010210E00048500000000BE
60299+:1014F000022010218FBF00188FB100148FB0001090
60300+:1015000003E0000827BD00203084FFFF30A5FFFF67
60301+:101510000000182110800007000000003082000148
60302+:101520001040000200042042006518210A00051343
60303+:101530000005284003E000080060102110C00006EC
60304+:1015400024C6FFFF8CA2000024A50004AC8200008A
60305+:101550000A00051D2484000403E0000800000000C8
60306+:1015600010A0000824A3FFFFAC86000000000000CC
60307+:10157000000000002402FFFF2463FFFF1462FFFA53
60308+:101580002484000403E0000800000000240200019D
60309+:10159000AF62000CA7620010A7620012A7620014DD
60310+:1015A00003E00008A76200163082007F034210218A
60311+:1015B0003C08000E004818213C0208008C42002024
60312+:1015C00027BDFFD82407FF80AFB3001CAFB20018BF
60313+:1015D000AFB10014AFB00010AFBF00200080802179
60314+:1015E00030B100FF0087202430D200FF1040002FD0
60315+:1015F00000009821AF44002C9062000024030050AA
60316+:10160000304200FF1443000E000000003C020800BE
60317+:101610008C4200E00202102100471024AF42002C4F
60318+:101620003C0208008C4200E0020210213042007FA0
60319+:101630000342102100481021944200D43053FFFF90
60320+:101640000E000493000000003C02080094424B5E30
60321+:101650008F8300200011340000C2302500122C00BE
60322+:101660003C02400000C2302534A50001AC700000EF
60323+:101670008FBF0020AC6000048FB20018AC7300086C
60324+:101680008FB10014AC60000C8FB3001CAC6500106F
60325+:101690008FB00010AC60001424040001AC6000188E
60326+:1016A00027BD00280A0004B8AC66001C8FBF0020CC
60327+:1016B0008FB3001C8FB200188FB100148FB00010D0
60328+:1016C00003E0000827BD00289343010F2402001007
60329+:1016D0001062000E2865001110A0000724020012FD
60330+:1016E000240200082405003A1062000600003021A0
60331+:1016F00003E0000800000000240500351462FFFC30
60332+:10170000000030210A000538000000008F420074FC
60333+:1017100024420FA003E00008AF62000C27BDFFE8E1
60334+:10172000AFBF00100E00025E240500018FBF001045
60335+:1017300024020001A762001227BD00182402000144
60336+:1017400003E00008A360002227BDFFE0AFB1001452
60337+:10175000AFB00010AFBF001830B1FFFF0E00025055
60338+:10176000008080219362003F24030004304200FF88
60339+:101770001443000C02002021122000082402000A59
60340+:101780000E00053100000000936200052403FFFEF7
60341+:1017900000431024A362000524020012A362003F4C
60342+:1017A000020020210E000259A360008116200003D0
60343+:1017B000020020210E0005950000000002002021FB
60344+:1017C000322600FF8FBF00188FB100148FB00010B9
60345+:1017D000240500380A00053827BD002027BDFFE09A
60346+:1017E000AFBF001CAFB20018AFB10014AFB0001013
60347+:1017F0000E000250008080210E0005310000000024
60348+:101800009362003F24120018305100FF123200038F
60349+:101810000200202124020012A362003F936200050F
60350+:101820002403FFFE004310240E000259A3620005AA
60351+:10183000020020212405002016320007000030217C
60352+:101840008FBF001C8FB200188FB100148FB0001032
60353+:101850000A00025E27BD00208FBF001C8FB2001857
60354+:101860008FB100148FB00010240500390A0005382C
60355+:1018700027BD002027BDFFE8AFB00010AFBF0014A8
60356+:101880009742010C2405003600808021144000108E
60357+:10189000304600FF0E00025000000000240200123B
60358+:1018A000A362003F93620005344200100E00053130
60359+:1018B000A36200050E00025902002021020020212F
60360+:1018C0000E00025E240500200A000604000000004D
60361+:1018D0000E000538000000000E000250020020211A
60362+:1018E000936200232403FF9F020020210043102461
60363+:1018F0008FBF00148FB00010A36200230A000259AA
60364+:1019000027BD001827BDFFE0AFBF0018AFB100141E
60365+:10191000AFB0001030B100FF0E00025000808021F7
60366+:10192000240200120E000531A362003F0E0002598E
60367+:101930000200202102002021022030218FBF001848
60368+:101940008FB100148FB00010240500350A0005384F
60369+:1019500027BD0020A380002C03E00008A380002DF9
60370+:101960008F4202780440FFFE8F820034AF42024073
60371+:1019700024020002A34202443C02100003E00008DB
60372+:10198000AF4202783C0360008C6254003042000891
60373+:101990001440FFFD000000008C625408AF82000C70
60374+:1019A00024020052AC605408AC645430AC6254342D
60375+:1019B0002402000803E00008AC6254003C0260000E
60376+:1019C0008C42540030420008104000053C03600087
60377+:1019D0008C625400304200081440FFFD00000000FB
60378+:1019E0008F83000C3C02600003E00008AC43540805
60379+:1019F00090A3000024020005008040213063003FD6
60380+:101A000000004821146200050000502190A2001C33
60381+:101A100094A3001E304900FF306AFFFFAD00000CA8
60382+:101A2000AD000010AD000024950200148D05001CCF
60383+:101A30008D0400183042FFFF0049102300021100FE
60384+:101A4000000237C3004038210086202300A2102B5B
60385+:101A50000082202300A72823AD05001CAD04001838
60386+:101A6000A5090014A5090020A50A001603E0000836
60387+:101A7000A50A00228F4201F80440FFFE2402000262
60388+:101A8000AF4401C0A34201C43C02100003E00008BF
60389+:101A9000AF4201F83C0208008C4200B427BDFFE8C9
60390+:101AA000AFBF001424420001AFB000103C01080099
60391+:101AB000AC2200B48F4300243C02001F30AA00FF78
60392+:101AC0003442FF8030D800FF006280240080F8217B
60393+:101AD00030EF00FF1158003B01405821240CFF80DB
60394+:101AE0003C19000A3163007F000310C00003194055
60395+:101AF000006218213C0208008C4200DC25680001CD
60396+:101B0000310D007F03E21021004310213043007F9C
60397+:101B100003431821004C102400794821AF420024CF
60398+:101B20008D220024016C1824006C7026AD22000C5C
60399+:101B30008D220024310800FFAD22001095220014F0
60400+:101B4000952300208D27001C3042FFFF3063FFFFEC
60401+:101B50008D2600180043102300021100000227C345
60402+:101B60000040282100C4302300E2102B00C23023A3
60403+:101B700000E53823AD27001CAD2600189522002073
60404+:101B8000A522001495220022154B000AA52200165A
60405+:101B90008D2300248D220008254600013145008058
60406+:101BA0001462000430C4007F108F000238AA008045
60407+:101BB00000C0502151AF000131C800FF1518FFC906
60408+:101BC000010058218F8400343082007F03421821A5
60409+:101BD0003C02000A006218212402FF8000822024B7
60410+:101BE000AF440024A06A0079A06A00838C62005090
60411+:101BF0008F840034AC6200708C6500743C027FFFFF
60412+:101C00003442FFFF00A228240E00066BAC6500746E
60413+:101C1000AF5000248FBF00148FB0001003E0000805
60414+:101C200027BD001827BDFFC0AFBE0038AFB70034D6
60415+:101C3000AFB5002CAFB20020AFB1001CAFB00018A0
60416+:101C4000AFBF003CAFB60030AFB40028AFB3002444
60417+:101C50008F4500248F4600288F43002C3C02001F34
60418+:101C60003442FF800062182400C230240080A82182
60419+:101C7000AFA3001400A2F0240E00062FAFA60010A0
60420+:101C80003C0208008C4200E02410FF8003608821A1
60421+:101C900002A2102100501024AF4200243C02080090
60422+:101CA0008C4200E002A210213042007F0342182142
60423+:101CB0003C02000A00629021924200D293630084A9
60424+:101CC000305700FF306300FF24020001106200342F
60425+:101CD000036020212402000214620036000000008C
60426+:101CE0000E001216024028219223008392220083C4
60427+:101CF0003063007F3042007F000210C000031940B3
60428+:101D0000006218213C0208008C4200DC02A2102173
60429+:101D10000043382100F01024AF42002892250078BB
60430+:101D20009224008330E2007F034218213C02000C21
60431+:101D300014850007006280212402FFFFA24200F107
60432+:101D40002402FFFFA64200F20A0007272402FFFF39
60433+:101D500096020020A24200F196020022A64200F262
60434+:101D60008E020024AE4200F492220083A24200F0D0
60435+:101D70008E4200C8AE4200FC8E4200C4AE4200F863
60436+:101D80008E220050AE4201008E4200CCAE420104D1
60437+:101D9000922200853042003F0A0007823442004010
60438+:101DA0000E00123902402821922200850A00078283
60439+:101DB0003042003F936200852403FFDF3042003F42
60440+:101DC000A36200859362008500431024A36200850E
60441+:101DD0009363008393620078307400FF304200FF09
60442+:101DE00010540036240AFF803C0C000C3283007F24
60443+:101DF000000310C000031940006218213C020800D3
60444+:101E00008C4200DC268800013109007F02A21021EB
60445+:101E10000043382130E2007F0342182100EA1024F9
60446+:101E2000AF420028006C80218E020024028A182410
60447+:101E3000006A5826AE02000C8E020024310800FF12
60448+:101E4000AE02001096020014960300208E07001CBC
60449+:101E50003042FFFF3063FFFF8E060018004310235F
60450+:101E600000021100000227C30040282100C43023D3
60451+:101E700000E2102B00C2302300E53823AE07001C1F
60452+:101E8000AE06001896020020A60200149602002258
60453+:101E9000A602001692220079304200FF105400077B
60454+:101EA0000000000051370001316800FF92220078E5
60455+:101EB000304200FF1448FFCD0100A0219222008390
60456+:101EC000A22200798E2200500A0007E2AE220070A2
60457+:101ED000A22200858E22004C2405FF80AE42010C18
60458+:101EE0009222008534420020A2220085924200D135
60459+:101EF0003C0308008C6300DC305400FF3C02080007
60460+:101F00008C4200E400143140001420C002A31821C8
60461+:101F100000C4202102A210210064382100461021B3
60462+:101F20000045182400E52824AF450028AF43002CC5
60463+:101F30003042007F924400D030E3007F03422821EA
60464+:101F4000034318213C02000C006280213C02000E79
60465+:101F5000309600FF00A298211296002A000000008F
60466+:101F60008E02000C02002021026028211040002572
60467+:101F7000261000280E00064A000000009262000DA4
60468+:101F800026830001307400FF3042007FA262000D02
60469+:101F90002404FF801697FFF0267300203C020800FF
60470+:101FA0008C4200DC0000A02102A210210044102479
60471+:101FB000AF4200283C0208008C4200E43C030800C9
60472+:101FC0008C6300DC02A2102100441024AF42002CDC
60473+:101FD0003C0208008C4200E402A318213063007F19
60474+:101FE00002A210213042007F034220210343182126
60475+:101FF0003C02000C006280213C02000E0A0007A493
60476+:10200000008298218E4200D8AE2200508E4200D825
60477+:10201000AE22007092250083924600D19223008365
60478+:10202000924400D12402FF8000A228243063007F64
60479+:10203000308400FF00A628250064182A10600002E2
60480+:1020400030A500FF38A50080A2250083A2250079D5
60481+:102050000E00063D000000009222007E02A020211A
60482+:10206000A222007A8E2300743C027FFF3442FFFFDD
60483+:10207000006218240E00066BAE2300748FA20010BD
60484+:10208000AF5E00248FBF003CAF4200288FBE0038F7
60485+:102090008FA200148FB700348FB600308FB5002C9C
60486+:1020A0008FB400288FB300248FB200208FB1001CA2
60487+:1020B0008FB0001827BD004003E00008AF42002C9D
60488+:1020C00090A2000024420001A0A200003C030800EE
60489+:1020D0008C6300F4304200FF1443000F0080302175
60490+:1020E000A0A000003C0208008C4200E48F84003471
60491+:1020F000008220213082007F034218213C02000C24
60492+:10210000006218212402FF8000822024ACC300005A
60493+:1021100003E00008AF4400288C8200002442002025
60494+:1021200003E00008AC82000094C200003C080800F4
60495+:10213000950800CA30E7FFFF008048210102102106
60496+:10214000A4C2000094C200003042FFFF00E2102B46
60497+:1021500054400001A4C7000094A200003C03080002
60498+:102160008C6300CC24420001A4A2000094A20000D1
60499+:102170003042FFFF544300078F8600280107102BD1
60500+:10218000A4A000005440000101003821A4C70000B1
60501+:102190008F8600288CC4001CAF44003C94A2000031
60502+:1021A0008F43003C3042FFFF000210C00062182144
60503+:1021B000AF43003C8F42003C008220231880000483
60504+:1021C000000000008CC200180A00084324420001ED
60505+:1021D0008CC20018AF4200383C020050344200105C
60506+:1021E000AF420030000000000000000000000000CE
60507+:1021F0008F420000304200201040FFFD0000000030
60508+:102200008F420404AD2200048F420400AD2200007E
60509+:102210003C020020AF42003003E000080000000054
60510+:1022200027BDFFE0AFB20018AFB10014AFB000108F
60511+:10223000AFBF001C94C2000000C080213C12080007
60512+:10224000965200C624420001A60200009603000038
60513+:1022500094E2000000E03021144300058FB100300B
60514+:102260000E000818024038210A000875000000001E
60515+:102270008C8300048C820004244200400461000727
60516+:10228000AC8200048C8200040440000400000000C2
60517+:102290008C82000024420001AC8200009602000003
60518+:1022A0003042FFFF50520001A600000096220000BD
60519+:1022B00024420001A62200008F82002896230000FD
60520+:1022C00094420016144300048FBF001C2402000136
60521+:1022D000A62200008FBF001C8FB200188FB100141F
60522+:1022E0008FB0001003E0000827BD00208F89002870
60523+:1022F00027BDFFE0AFBF00188D220028274804004B
60524+:1023000030E700FFAF4200388D22002CAF8800304C
60525+:10231000AF42003C3C020005AF420030000000002C
60526+:1023200000000000000000000000000000000000AD
60527+:10233000000000008C82000C8C82000CAD020000BA
60528+:102340008C820010AD0200048C820018AD020008DF
60529+:102350008C82001CAD02000C8CA20014AD02001097
60530+:102360008C820020AD02001490820005304200FFF4
60531+:1023700000021200AD0200188CA20018AD02001C71
60532+:102380008CA2000CAD0200208CA20010AD02002433
60533+:102390008CA2001CAD0200288CA20020AD02002CF3
60534+:1023A000AD060030AD000034978300263402FFFFF5
60535+:1023B00014620002006020213404FFFF10E00011CD
60536+:1023C000AD04003895230036952400362402000120
60537+:1023D0003063FFFF000318C20069182190650040B8
60538+:1023E000308400070082100400451025A0620040E0
60539+:1023F0008F820028944200563042FFFF0A0008DC1A
60540+:10240000AD02003C952300369524003624020001DD
60541+:102410003063FFFF000318C2006918219065004077
60542+:1024200030840007008210040002102700451024A9
60543+:10243000A0620040AD00003C000000000000000071
60544+:10244000000000003C02000634420040AF42003071
60545+:102450000000000000000000000000008F420000AB
60546+:10246000304200101040FFFD8F860028AF880030FA
60547+:1024700024C2005624C7003C24C4002824C50032CE
60548+:1024800024C600360E000856AFA200108FBF0018F9
60549+:1024900003E0000827BD00208F8300243C060800CD
60550+:1024A0008CC600E88F82003430633FFF0003198040
60551+:1024B00000461021004310212403FF803046007F96
60552+:1024C00000431024AF420028034618213C02000CB0
60553+:1024D0000062302190C2000D30A500FF00003821BD
60554+:1024E00034420010A0C2000D8F8900288F8A00247A
60555+:1024F00095230036000A13823048000324020001AD
60556+:10250000A4C3000E1102000B2902000210400005B6
60557+:10251000240200021100000C240300010A0009201B
60558+:102520000000182111020006000000000A00092026
60559+:10253000000018218CC2002C0A000920244300014D
60560+:102540008CC20014244300018CC200180043102BDD
60561+:1025500050400009240700012402002714A20003B0
60562+:10256000000000000A00092C240700019522003E0B
60563+:1025700024420001A522003E000A138230430003DA
60564+:102580002C62000210400009008028211460000421
60565+:102590000000000094C200360A00093C3046FFFFEC
60566+:1025A0008CC600380A00093C008028210000302138
60567+:1025B0003C04080024844B780A00088900000000CD
60568+:1025C000274901008D22000C9523000601202021BF
60569+:1025D000000216023046003F3063FFFF240200274E
60570+:1025E00000C0282128C7002810C2000EAF83002495
60571+:1025F00010E00008240200312402002110C200096A
60572+:102600002402002510C200079382002D0A00095BF6
60573+:102610000000000010C200059382002D0A00095B33
60574+:10262000000000000A0008F4000000000A0006266E
60575+:102630000000000095230006912400058D25000C64
60576+:102640008D2600108D2700188D28001C8D29002054
60577+:10265000244200013C010800A4234B7E3C010800F9
60578+:10266000A0244B7D3C010800AC254B843C010800B4
60579+:10267000AC264B883C010800AC274B903C0108007D
60580+:10268000AC284B943C010800AC294B9803E00008AF
60581+:10269000A382002D8F87002827BDFFC0AFB3003471
60582+:1026A000AFB20030AFB1002CAFB00028AFBF0038E0
60583+:1026B0003C0208008C4200D094E3003030B0FFFFB1
60584+:1026C000005010073045FFFF3063FFFF00C0982126
60585+:1026D000A7A200103C110800963100C614A3000602
60586+:1026E0003092FFFF8CE2002424420030AF42003CD5
60587+:1026F0000A0009948CE2002094E200323042FFFF8D
60588+:1027000054A2000827A400188CE2002C24420030B8
60589+:10271000AF42003C8CE20028AF4200380A0009A218
60590+:102720008F84002827A5001027A60020022038212A
60591+:102730000E000818A7A000208FA200182442003025
60592+:10274000AF4200388FA2001CAF42003C8F840028AB
60593+:102750003C020005AF42003094820034274304005D
60594+:102760003042FFFF0202102B14400007AF830030FD
60595+:1027700094820054948300340202102100431023F9
60596+:102780000A0009B63043FFFF94830054948200345A
60597+:102790000223182100501023006218233063FFFF2A
60598+:1027A000948200163042FFFF144300030000000033
60599+:1027B0000A0009C424030001948200163042FFFF7E
60600+:1027C0000043102B104000058F82003094820016C9
60601+:1027D000006210233043FFFF8F820030AC530000B3
60602+:1027E000AC400004AC520008AC43000C3C020006B4
60603+:1027F00034420010AF420030000000000000000032
60604+:10280000000000008F420000304200101040FFFD29
60605+:10281000001018C2006418219065004032040007BF
60606+:10282000240200018FBF00388FB300348FB2003014
60607+:102830008FB1002C8FB000280082100400451025B5
60608+:1028400027BD004003E00008A062004027BDFFA8AC
60609+:10285000AFB60050AFB5004CAFB40048AFB30044C2
60610+:10286000AFB1003CAFBF0054AFB20040AFB00038D2
60611+:102870008C9000003C0208008C4200E88F860034F7
60612+:10288000960300022413FF8000C2302130633FFF13
60613+:102890000003198000C3382100F3102490B2000017
60614+:1028A000AF42002C9203000230E2007F034230214D
60615+:1028B0003C02000E00C28821306300C024020040A8
60616+:1028C0000080A82100A0B021146200260000A021F1
60617+:1028D0008E3400388E2200181440000224020001B9
60618+:1028E000AE2200189202000D304200201440001564
60619+:1028F0008F8200343C0308008C6300DC001238C077
60620+:10290000001231400043102100C730210046382119
60621+:1029100030E300073C02008030E6007800C230253A
60622+:102920000343182100F31024AF4208002463090078
60623+:10293000AF4608108E2200188C6300080043102157
60624+:10294000AE2200188E22002C8E2300182442000193
60625+:102950000062182B1060003D000000000A000A7899
60626+:1029600000000000920300022402FFC00043102474
60627+:10297000304200FF1440000524020001AE2200187E
60628+:10298000962200360A000A613054FFFF8E2200149E
60629+:1029900024420001AE22001892020000000216003C
60630+:1029A0000002160304410029000000009602000204
60631+:1029B00027A4001000802821A7A20016960200027A
60632+:1029C00024070001000030213042FFFFAF820024C5
60633+:1029D0000E000889AFA0001C960300023C0408000A
60634+:1029E0008C8400E88F82003430633FFF000319803D
60635+:1029F00000441021004310213043007F3C05000CAF
60636+:102A00000053102403431821AF4200280065182109
60637+:102A10009062000D001221403042007FA062000D44
60638+:102A20003C0308008C6300E48F82003400431021D3
60639+:102A30000044382130E2007F03421021004510217C
60640+:102A400000F31824AF430028AEA200009222000D2C
60641+:102A5000304200101040001302A020218F83002874
60642+:102A60008EA40000028030219462003E2442FFFFC9
60643+:102A7000A462003E948400029625000E3084FFFF7D
60644+:102A80000E00097330A5FFFF8F82002894430034A5
60645+:102A90009622000E1443000302A02021240200010C
60646+:102AA000A382002C02C028210E0007FE00000000B7
60647+:102AB0008FBF00548FB600508FB5004C8FB40048C4
60648+:102AC0008FB300448FB200408FB1003C8FB000380C
60649+:102AD00003E0000827BD00588F82002827BDFFD0E3
60650+:102AE000AFB40028AFB20020AFBF002CAFB30024BA
60651+:102AF000AFB1001CAFB00018904400D0904300D19B
60652+:102B00000000A021309200FFA3A30010306300FF5B
60653+:102B10008C5100D88C5300DC1072002B2402000171
60654+:102B20003C0308008C6300E493A400108F820034FF
60655+:102B30002406FF800004214000431021004410219E
60656+:102B40003043007F00461024AF4200280343182181
60657+:102B50003C02000C006218218C62000427A40014BF
60658+:102B600027A50010022280210270102304400015C6
60659+:102B7000AFA300149062000D00C21024304200FF89
60660+:102B800014400007020088219062000D344200408A
60661+:102B90000E0007FEA062000D0A000ABD93A20010FD
60662+:102BA0000E0009E1241400018F830028AC7000D8C6
60663+:102BB00093A20010A06200D193A200101452FFD87B
60664+:102BC0000000000024020001168200048FBF002CC8
60665+:102BD0000E000626000000008FBF002C8FB40028D6
60666+:102BE0008FB300248FB200208FB1001C8FB000186B
60667+:102BF00003E0000827BD003027BDFFD8AFB3001C9D
60668+:102C0000AFB20018AFB10014AFB00010AFBF0020DA
60669+:102C10000080982100E0802130B1FFFF0E00049376
60670+:102C200030D200FF000000000000000000000000A3
60671+:102C30008F820020AC510000AC520004AC5300085D
60672+:102C4000AC40000CAC400010AC400014AC4000188C
60673+:102C50003C03080094634B5E02038025AC50001CCB
60674+:102C6000000000000000000000000000240400013B
60675+:102C70008FBF00208FB3001C8FB200188FB10014DB
60676+:102C80008FB000100A0004B827BD002827BDFFE858
60677+:102C9000AFB00010AFBF001430A5FFFF30C600FF7B
60678+:102CA0000080802124020C80AF420024000000003C
60679+:102CB0000000000000000000000000000000000014
60680+:102CC0000E000ACC000000003C040800248400E050
60681+:102CD0008C8200002403FF808FBF001402021021A9
60682+:102CE00000431024AF4200248C8200003C03000A01
60683+:102CF000020280213210007F035010218FB000109B
60684+:102D00000043102127BD001803E00008AF8200280F
60685+:102D100027BDFFE8AFBF00108F4401403C0308000F
60686+:102D20008C6300E02402FF80AF840034008318210C
60687+:102D300000621024AF4200243C02000803424021FC
60688+:102D4000950500023063007F3C02000A034318210E
60689+:102D50000062182130A5FFFF3402FFFF0000302180
60690+:102D60003C07602010A20006AF8300282402FFFF6A
60691+:102D7000A5020002946500D40E000AF130A5FFFF01
60692+:102D80008FBF001024020C8027BD001803E000084C
60693+:102D9000AF4200243C020008034240219502000299
60694+:102DA0003C0A0800954A00C63046FFFF14C00007E1
60695+:102DB0003402FFFF8F8200288F8400343C0760209C
60696+:102DC000944500D40A000B5A30A5FFFF10C200241E
60697+:102DD0008F87002894E2005494E400163045FFFFEA
60698+:102DE00000A6102300A6182B3089FFFF10600004F6
60699+:102DF0003044FFFF00C51023012210233044FFFFA1
60700+:102E0000008A102B1040000C012A1023240200011C
60701+:102E1000A50200162402FFFFA502000294E500D4DB
60702+:102E20008F8400340000302130A5FFFF3C07602074
60703+:102E30000A000AF1000000000044102A10400008B7
60704+:102E4000000000009502001630420001104000040E
60705+:102E5000000000009742007E24420014A5020016E4
60706+:102E600003E00008000000008F84002827BDFFE079
60707+:102E7000AFBF0018948200349483003E1060001AA3
60708+:102E80003048FFFF9383002C2402000114620027C6
60709+:102E90008FBF00188F820028000818C23108000771
60710+:102EA000006218212447003A244900542444002099
60711+:102EB000244500302446003490620040304200FF38
60712+:102EC0000102100730420001104000168FBF0018A9
60713+:102ED0000E000856AFA900108F82002894420034DB
60714+:102EE0000A000B733048FFFF94830036948200344D
60715+:102EF0001043000E8FBF001894820036A482003465
60716+:102F000094820056A48200548C82002CAC8200244F
60717+:102F100094820032A48200309482003CA482003A61
60718+:102F20008FBF00180A000B3327BD002003E0000804
60719+:102F300027BD002027BDFFE8AFBF00108F4A01006A
60720+:102F40003C0508008CA500E03C02080090424B8440
60721+:102F50003C0C0800958C4B7E01452821304B003FEE
60722+:102F600030A2007F03424021396900323C02000A4E
60723+:102F70003963003F2C630001010240212D2900012B
60724+:102F80002402FF8000A2282401234825AF8A0034B0
60725+:102F900000801821AF450024000030210080282146
60726+:102FA00024070001AF8800283C04080024844B78E3
60727+:102FB000AF8C002415200007A380002D24020020E0
60728+:102FC0005562000F006020213402FFFF5582000C83
60729+:102FD000006020212402002015620005000000008E
60730+:102FE0008C6300142402FFFF106200070000000041
60731+:102FF0000E000889000000000A000BD0000000004D
60732+:103000000E0008F4016028210E000B68000000008B
60733+:103010008FBF001024020C8027BD001803E00008B9
60734+:10302000AF4200243C0208008C4200E027BDFFA014
60735+:10303000AFB1003C008210212411FF80AFBE0058C8
60736+:10304000AFB70054AFB20040AFB00038AFBF005CC4
60737+:10305000AFB60050AFB5004CAFB40048AFB30044BA
60738+:10306000005110248F4800248F4900288F470028E2
60739+:10307000AF4200243C0208008C4200E00080902116
60740+:1030800024060006008210213042007F03421821EE
60741+:103090003C02000A006280213C02001F3442FF8093
60742+:1030A00000E2382427A40010260500F00122F024B5
60743+:1030B0000102B8240E00051DAFA700308FA2001832
60744+:1030C000AE0200C48FA2001CAE0200C88FA2002472
60745+:1030D000AE0200CC93A40010920300D12402FF8022
60746+:1030E0000082102400431025304900FF3083007F08
60747+:1030F0003122007F0062102A10400004000310C03B
60748+:1031000001311026304900FF000310C000031940B0
60749+:10311000006218213C0208008C4200DC920400D2BC
60750+:10312000024210210043102100511024AF42002818
60751+:1031300093A300103063007F000310C00003194008
60752+:10314000006218213C0208008C4200DC024210217F
60753+:10315000004310213042007F034218213C02000C42
60754+:10316000006240218FA300142402FFFF1062003090
60755+:10317000309500FF93A2001195030014304400FF26
60756+:103180003063FFFF0064182B1060000D000000008A
60757+:10319000950400148D07001C8D0600183084FFFF75
60758+:1031A00000442023000421000000102100E4382105
60759+:1031B00000E4202B00C230210A000C4A00C4302158
60760+:1031C000950400148D07001C8D0600183084FFFF45
60761+:1031D000008220230004210000001021008018211B
60762+:1031E00000C2302300E4202B00C4302300E3382346
60763+:1031F000AD07001CAD06001893A20011A502001433
60764+:1032000097A20012A50200168FA20014AD020010B2
60765+:103210008FA20014AD02000C93A20011A5020020A1
60766+:1032200097A20012A50200228FA20014AD02002472
60767+:103230002406FF80024610243256007FAF4200244D
60768+:10324000035618213C02000A006280218E02004CC5
60769+:103250008FA200203124007F000428C0AE0200505D
60770+:103260008FA200200004214000852821AE020070BA
60771+:1032700093A2001001208821A202008393A20010D3
60772+:10328000A2020079920200853042003FA20200852E
60773+:103290003C0208008C4200DC024210210045102153
60774+:1032A00000461024AF42002C3C0208008C4200E48F
60775+:1032B0003C0308008C6300DC024210210044102112
60776+:1032C00000461024AF4200283C0208008C4200E473
60777+:1032D00002431821006518210242102100441021E8
60778+:1032E0003042007F3063007F93A50010034220210D
60779+:1032F000034318213C02000E006240213C02000CF6
60780+:1033000010B1008C008248213233007F1660001912
60781+:103310002404FF803C0208008C4200DC02421021A1
60782+:1033200000441024AF42002C3C0208008C4200E410
60783+:103330003C0308008C6300DC02421021004410248E
60784+:10334000AF4200283C0208008C4200E402431821EE
60785+:103350003063007F024210213042007F034220216F
60786+:10336000034318213C02000E006240213C02000C85
60787+:10337000008248219124000D2414FF8000001021B8
60788+:1033800000942025A124000D950400029505001449
60789+:103390008D07001C3084FFFF30A5FFFF8D0600184D
60790+:1033A000008520230004210000E4382100C23021E0
60791+:1033B00000E4202B00C43021AD07001CAD0600182E
60792+:1033C00095020002A5020014A50000168D02000857
60793+:1033D000AD0200108D020008AD02000C9502000243
60794+:1033E000A5020020A50000228D020008AD020024E5
60795+:1033F0009122000D30420040104000422622000180
60796+:103400003C0208008C4200E0A3B300283C10000AF4
60797+:103410000242102100541024AF4200243C02080054
60798+:103420008C4200E0A380002C27A4002C0242102133
60799+:103430003042007F03421821007018218C6200D8AE
60800+:103440008D26000427A50028AFA9002C00461021D6
60801+:10345000AC6200D80E0009E1AF83002893A30028D6
60802+:103460008F8200280E000626A04300D10E000B68B4
60803+:103470000000000002541024AF4200243C02080067
60804+:103480008C4200DC00132940001320C000A420213E
60805+:10349000024210210044102100541024AF42002C9D
60806+:1034A0003C0208008C4200E43C0308008C6300DC12
60807+:1034B00003563021024210210045102100541024EF
60808+:1034C000AF4200283C0208008C4200E4024318216D
60809+:1034D0000064182102421021004510213042007F73
60810+:1034E0003063007F03422021034318213C02000E79
60811+:1034F000006240213C02000C00D080210082482163
60812+:10350000262200013043007F14750005304400FF7F
60813+:103510002403FF800223102400431026304400FFC0
60814+:1035200093A2001000808821250800281444FF760B
60815+:103530002529002093A400108FA300142402FFFF6C
60816+:103540001062000A308900FF2482000124830001F8
60817+:103550003042007F14550005306900FF2403FF80CE
60818+:103560000083102400431026304900FF92020078A7
60819+:10357000305300FF11330032012088213C02080043
60820+:103580008C4200DC3225007F000520C00005294068
60821+:1035900000A42021024210212406FF8000441021B3
60822+:1035A00000461024AF42002C3C0308008C6300DC72
60823+:1035B0003C0208008C4200E4024318210242102120
60824+:1035C0000045102100641821004610243063007F5C
60825+:1035D000AF420028034318213C02000E0062402144
60826+:1035E0003C0208008C4200E48D06000C0100202102
60827+:1035F00002421021004510213042007F0342182171
60828+:103600003C02000C0062482110C0000D012028215E
60829+:103610000E00064A000000002402FF800222182447
60830+:1036200026240001006228263082007F1455000203
60831+:10363000308300FF30A300FF1473FFD000608821A7
60832+:103640008E0300743C027FFF3442FFFF00621824A7
60833+:10365000AE0300740E00066B02402021AF57002419
60834+:103660008FA20030AF5E00288FBF005C8FBE005875
60835+:103670008FB700548FB600508FB5004C8FB4004800
60836+:103680008FB300448FB200408FB1003C8FB0003840
60837+:1036900027BD006003E00008AF42002C27BDFFD823
60838+:1036A000AFB1001CAFBF0020AFB000182751018898
60839+:1036B000922200032408FF803C03000A3047007F69
60840+:1036C000A3A700108F4601803C0208008C4200E056
60841+:1036D000AF86003400C2282100A81024AF42002485
60842+:1036E0009224000030A2007F0342102100431021E9
60843+:1036F000AF8200283084007F24020002148200255B
60844+:10370000000719403C0208008C4200E400C210216E
60845+:103710000043282130A2007F0342182100A8102472
60846+:10372000AF4200283C02000C006218219062000D9C
60847+:10373000AFA3001400481025A062000D8FA3001451
60848+:103740009062000D304200405040006A8FBF002060
60849+:103750008F860028A380002C27A400148CC200D8D8
60850+:103760008C63000427A50010004310210E0009E11E
60851+:10377000ACC200D893A300108F8200280E0006264A
60852+:10378000A04300D10E000B68000000000A000E0BE1
60853+:103790008FBF00200E00062F00C020210E00063D26
60854+:1037A000000000003C020008034280219223000137
60855+:1037B0009202007B1443004F8FBF00209222000032
60856+:1037C0003044007F24020004108200172882000584
60857+:1037D00010400006240200052402000310820007A6
60858+:1037E0008FB1001C0A000E0C0000000010820012B5
60859+:1037F0008FBF00200A000E0C8FB1001C92050083C1
60860+:10380000920600788E0700748F84003430A500FF84
60861+:1038100000073E0230C600FF0E00067330E7007F4F
60862+:103820000A000E0B8FBF00200E000BD78F840034D0
60863+:103830000A000E0B8FBF002024020C80AF42002430
60864+:103840009202003E30420040104000200000000084
60865+:103850009202003E00021600000216030441000618
60866+:10386000000000008F8400340E0005A024050093A2
60867+:103870000A000E0B8FBF00209202003F24030018A5
60868+:10388000304200FF1443000C8F84003424050039BB
60869+:103890000E000538000030210E0002508F840034E5
60870+:1038A00024020012A202003F0E0002598F8400344D
60871+:1038B0000A000E0B8FBF0020240500360E000538CD
60872+:1038C000000030210A000E0B8FBF00200E000250B6
60873+:1038D0008F8400349202000534420020A2020005C9
60874+:1038E0000E0002598F8400340E000FC08F84003404
60875+:1038F0008FBF00208FB1001C8FB0001824020C80F5
60876+:1039000027BD002803E00008AF42002427BDFFE8E0
60877+:10391000AFB00010AFBF001427430100946200084D
60878+:103920000002140000021403044100020000802180
60879+:103930002410000194620008304200801040001AF8
60880+:10394000020010219462000830422000104000164E
60881+:10395000020010218C6300183C021C2D344219ED2A
60882+:10396000240600061062000F3C0760213C0208009C
60883+:103970008C4200D4104000078F8200288F830028DB
60884+:10398000906200623042000F34420040A062006248
60885+:103990008F8200288F840034944500D40E000AF1F1
60886+:1039A00030A5FFFF020010218FBF00148FB0001060
60887+:1039B00003E0000827BD001827BDFFE0AFB10014E9
60888+:1039C000AFB00010A380002CAFBF00188F450100DE
60889+:1039D0003C0308008C6300E02402FF80AF850034C4
60890+:1039E00000A318213064007F0344202100621824C2
60891+:1039F0003C02000A00822021AF430024275001002E
60892+:103A00008E0200148C8300DCAF8400280043102356
60893+:103A100018400004000088218E0200140E000A8461
60894+:103A2000AC8200DC9202000B24030002304200FF53
60895+:103A30001443002F0000000096020008304300FFEE
60896+:103A40002402008214620005240200840E00093E54
60897+:103A5000000000000A000E97000000001462000938
60898+:103A6000240200818F8200288F8400343C0760216B
60899+:103A7000944500D49206000530A5FFFF0A000E868B
60900+:103A800030C600FF14620027000000009202000A06
60901+:103A9000304300FF306200201040000430620040DC
60902+:103AA0008F8400340A000E82240600401040000477
60903+:103AB000000316008F8400340A000E8224060041A1
60904+:103AC00000021603044100178F84003424060042CC
60905+:103AD0008F8200283C076019944500D430A5FFFF71
60906+:103AE0000E000AF1000000000A000E97000000001E
60907+:103AF0009202000B24030016304200FF1043000620
60908+:103B0000000000009202000B24030017304200FF67
60909+:103B100014430004000000000E000E11000000001D
60910+:103B2000004088210E000B68000000009202000A8D
60911+:103B3000304200081040000624020C808F850028C7
60912+:103B40003C0400080E0011EE0344202124020C80E6
60913+:103B5000AF4200248FBF0018022010218FB0001048
60914+:103B60008FB1001403E0000827BD002027BDFFE847
60915+:103B7000AFBF0014AFB000108F5000243C0308000A
60916+:103B80008C6300E08F4501002402FF8000A3182110
60917+:103B90003064007F03442021006218243C02000AA4
60918+:103BA00000822021AF850034AF4300249082006260
60919+:103BB000AF8400283042000F34420050A0820062DF
60920+:103BC0003C02001F3442FF800E00062602028024C1
60921+:103BD000AF5000248FBF00148FB0001003E0000826
60922+:103BE00027BD00183C0208008C4200201040001D38
60923+:103BF0002745010090A300093C0200080342202150
60924+:103C000024020018546200033C0200080A000ED887
60925+:103C10002402000803422021240200161462000539
60926+:103C20002402001724020012A082003F0A000EE2C4
60927+:103C300094A700085462000694A700089362000548
60928+:103C40002403FFFE00431024A362000594A700088C
60929+:103C500090A6001B8CA4000094A500060A000ACCC4
60930+:103C600000073C0003E000080000000027440100BA
60931+:103C700094820008304500FF38A3008238A20084F7
60932+:103C80002C6300012C420001006218251060000620
60933+:103C9000240200839382002D1040000D00000000DC
60934+:103CA0000A000B9B0000000014A2000524A2FF8064
60935+:103CB0008F4301043C02602003E00008AC43001481
60936+:103CC000304200FF2C420002104000032402002278
60937+:103CD0000A000E3C0000000014A2000300000000D7
60938+:103CE0000A000EA9000000000A000EC70000000034
60939+:103CF0009363007E9362007A144300090000202140
60940+:103D00009362000024030050304200FF144300047B
60941+:103D1000240400019362007E24420001A362007E1D
60942+:103D200003E00008008010218F4201F80440FFFEEC
60943+:103D300024020002AF4401C0A34201C43C021000AF
60944+:103D400003E00008AF4201F827BDFFE8AFBF001055
60945+:103D50009362003F2403000A304200FF14430046F0
60946+:103D6000000000008F6300548F62004C1062007DE1
60947+:103D7000036030219362000024030050304200FFB2
60948+:103D80001443002F000000008F4401403C02080053
60949+:103D90008C4200E02403FF800082102100431024A5
60950+:103DA000AF4200243C0208008C4200E08F650054C2
60951+:103DB0003C03000A008220213084007F034410214C
60952+:103DC00000431021AC4501089762003C8F63004C12
60953+:103DD0003042FFFF0002104000621821AF63005C18
60954+:103DE0008F6300548F64004C9762003C006418237A
60955+:103DF0003042FFFF00031843000210400043102A26
60956+:103E000010400006000000008F6200548F63004CD9
60957+:103E1000004310230A000F58000210439762003C31
60958+:103E20003042FFFF00021040ACC2006424020001D7
60959+:103E3000A0C0007CA0C2008424020C80AF420024F9
60960+:103E40000E000F0A8F440140104000478FBF001042
60961+:103E50008F4301408F4201F80440FFFE240200021C
60962+:103E6000AF4301C0A34201C43C021000AF4201F8BD
60963+:103E70000A000FA88FBF00109362003F24030010B8
60964+:103E8000304200FF14430004000000008F44014052
60965+:103E90000A000F94000028219362003F24030016BB
60966+:103EA000304200FF1443000424020014A362003FC8
60967+:103EB0000A000FA2000000008F62004C8F630050C8
60968+:103EC00000431023044100288FBF0010936200813B
60969+:103ED00024420001A3620081936200812C4200040D
60970+:103EE00014400010000000009362003F240300040F
60971+:103EF000304200FF14430006000000008F440140E0
60972+:103F00008FBF0010240500930A0005A027BD0018EC
60973+:103F10008F440140240500938FBF00100A00060F54
60974+:103F200027BD00188F4401400E0002500000000021
60975+:103F30008F6200542442FFFFAF6200548F62005032
60976+:103F40002442FFFFAF6200500E0002598F4401402F
60977+:103F50008F4401408FBF0010240500040A00025E58
60978+:103F600027BD00188FBF001003E0000827BD001810
60979+:103F70008F4201889363007E00021402304400FFE8
60980+:103F8000306300FF1464000D0000000093620080A5
60981+:103F9000304200FF1044000900000000A3640080CC
60982+:103FA0009362000024030050304200FF14430004D9
60983+:103FB000000000000A0006D78F440180A36400803F
60984+:103FC00003E000080000000027BDFFE8AFB00010CC
60985+:103FD000AFBF00149362000524030030304200306C
60986+:103FE00014430089008080213C0208008C4200209C
60987+:103FF00010400080020020210E0004930000000009
60988+:104000008F850020ACB000009362003E9363003FB8
60989+:10401000304200FF00021200306300FF0043102511
60990+:10402000ACA2000493620082000216000002160394
60991+:1040300004410005000000003C0308008C630048B8
60992+:104040000A000FE6000000009362003E304200408C
60993+:10405000144000030000182193620081304300FFE8
60994+:104060009362008200031E00304200FF0002140031
60995+:1040700000621825ACA300088F620040ACA2000CBF
60996+:104080008F620048ACA200108F62004CACA20014FA
60997+:104090008F6200508F63004C0043102304410003E3
60998+:1040A000000000000A000FFA8F62004C8F6200507F
60999+:1040B000ACA200183C02080094424B5E3C03C00BCB
61000+:1040C00000002021004310250E0004B8ACA2001C03
61001+:1040D0008F6200548F840020AC8200008F620058F1
61002+:1040E000AC8200048F62005CAC8200088F620060CA
61003+:1040F0008F43007400431021AC82000C8F62006477
61004+:10410000AC820010976300689762006A00031C008D
61005+:104110003042FFFF00621825AC83001493620082D6
61006+:1041200024030080304200FF14430003000000001D
61007+:104130000A00102EAC8000188F63000C24020001CE
61008+:104140001062000E2402FFFF9362003E30420040E6
61009+:104150001440000A2402FFFF8F63000C8F4200749A
61010+:10416000006218233C020800006210241440000280
61011+:10417000000028210060282100051043AC820018AF
61012+:104180003C02080094424B5E3C03C00C000020211E
61013+:10419000004310258F8300200E0004B8AC62001C81
61014+:1041A0008F6200188F8300203C05080094A54B5EA9
61015+:1041B00024040001AC620000AC6000048F66006C57
61016+:1041C0003C02400D00A22825AC6600088F6200DC8E
61017+:1041D000AC62000CAC600010936200050002160097
61018+:1041E000AC620014AC6000180E0004B8AC65001C92
61019+:1041F000020020218FBF00148FB00010A3600005C3
61020+:104200000A00042127BD00188FBF00148FB00010D2
61021+:1042100003E0000827BD00189742007C30C600FF6D
61022+:10422000A08600843047FFFF2402000514C2000B63
61023+:1042300024E3465090A201122C42000710400007D0
61024+:1042400024E30A0090A30112240200140062100467
61025+:1042500000E210210A0010663047FFFF3067FFFFC1
61026+:1042600003E00008A4870014AC87004C8CA201086E
61027+:104270000080402100A0482100E2102330C600FF4A
61028+:104280001840000393AA001324E2FFFCACA201082B
61029+:1042900030C2000110400008000000008D020050F4
61030+:1042A00000E2102304410013240600058D0200548F
61031+:1042B00010E20010000000008D02005414E2001A09
61032+:1042C000000000003C0208008C4200D83042002070
61033+:1042D0001040000A2402000191030078910200833B
61034+:1042E000144300062402000101002021012028219E
61035+:1042F000240600040A00105400000000A1000084FD
61036+:1043000011400009A50200148F4301008F4201F8FB
61037+:104310000440FFFE24020002AF4301C0A34201C4D7
61038+:104320003C021000AF4201F803E00008000000006A
61039+:1043300027BDFFE88FA90028AFBF001000804021F3
61040+:1043400000E918231860007330C600FFA080007CCD
61041+:10435000A08000818CA2010800E210230440004DDF
61042+:10436000000000008C8200509483003C8C84006428
61043+:10437000004748233063FFFF012318210083202BCF
61044+:1043800010800004000000008D0200640A0010B7D5
61045+:1043900000E210219502003C3042FFFF0122102173
61046+:1043A00000E21021AD02005C9502003C8D03005C30
61047+:1043B0003042FFFF0002104000E210210043102BAA
61048+:1043C00010400003000000000A0010C68D02005CCF
61049+:1043D0009502003C3042FFFF0002104000E2102135
61050+:1043E000AD02005CA1000084AD07004C8CA2010866
61051+:1043F00000E210231840000224E2FFFCACA20108F6
61052+:1044000030C200011040000A000000008D02005080
61053+:1044100000E2102304410004010020218D02005419
61054+:1044200014E20003000000000A0010E82406000562
61055+:104430008D02005414E200478FBF00103C020800B8
61056+:104440008C4200D8304200201040000A24020001B3
61057+:1044500091030078910200831443000624020001B6
61058+:1044600001002021240600048FBF00100A00105410
61059+:1044700027BD0018A1000084A50200148F4301008D
61060+:104480008F4201F80440FFFE240200020A00110DD1
61061+:10449000000000008C82005C004910230043102BB8
61062+:1044A00054400001AC87005C9502003C3042FFFFA5
61063+:1044B0000062102B14400007240200029502003C09
61064+:1044C0008D03005C3042FFFF00621821AD03005CE9
61065+:1044D00024020002AD07004CA10200840E000F0A66
61066+:1044E0008F4401001040001B8FBF00108F4301005C
61067+:1044F0008F4201F80440FFFE24020002AF4301C0D6
61068+:10450000A34201C43C021000AF4201F80A0011238B
61069+:104510008FBF001030C200101040000E8FBF00107F
61070+:104520008C83005C9482003C006918233042FFFFBA
61071+:10453000006218213C023FFF3444FFFF0083102B30
61072+:10454000544000010080182101231021AD02005CBD
61073+:104550008FBF001003E0000827BD001827BDFFE84B
61074+:104560008FAA0028AFBF00100080402100EA482336
61075+:104570001920002130C600FF8C83005C8C8200640F
61076+:10458000006A18230043102B5040001000691821C6
61077+:1045900094A2011001221021A4A2011094A20110E2
61078+:1045A0003042FFFF0043102B1440000A3C023FFF43
61079+:1045B00094A2011000431023A4A201109482003C95
61080+:1045C0003042FFFF0A00114200621821A4A001102E
61081+:1045D0003C023FFF3444FFFF0083102B5440000196
61082+:1045E0000080182100671021AD02005CA100007C52
61083+:1045F0000A00118AA100008130C200101040003C66
61084+:10460000000000008C820050004A1023184000383F
61085+:10461000000000009082007C24420001A082007C07
61086+:104620009082007C3C0308008C630024304200FF31
61087+:104630000043102B1440005C8FBF00108CA20108B7
61088+:1046400000E2102318400058000000008C83005442
61089+:104650009482003C006A18233042FFFF0003184395
61090+:10466000000210400043102A104000050000000026
61091+:104670008C820054004A10230A001171000210437A
61092+:104680009482003C3042FFFF00021040AD02006403
61093+:104690009502003C8D0400649503003C3042FFFF0E
61094+:1046A00000021040008220213063FFFF00831821A8
61095+:1046B00001431021AD02005C8D020054ACA2010840
61096+:1046C00024020002A10200840E000F0A8F440100A0
61097+:1046D000104000358FBF00108F4301008F4201F85A
61098+:1046E0000440FFFE240200020A0011B30000000093
61099+:1046F000AD07004C8CA2010800E210231840000214
61100+:1047000024E2FFFCACA2010830C200011040000A04
61101+:10471000000000008D02005000E21023044100045C
61102+:10472000010020218D02005414E20003000000006B
61103+:104730000A0011AA240600058D02005414E2001A92
61104+:104740008FBF00103C0208008C4200D8304200208D
61105+:104750001040000A240200019103007891020083B6
61106+:104760001443000624020001010020212406000455
61107+:104770008FBF00100A00105427BD0018A10000844C
61108+:10478000A50200148F4301008F4201F80440FFFE90
61109+:1047900024020002AF4301C0A34201C43C02100046
61110+:1047A000AF4201F88FBF001003E0000827BD0018DA
61111+:1047B0008FAA00108C8200500080402130C600FF7C
61112+:1047C000004A102300A048211840000700E01821EB
61113+:1047D00024020001A0800084A0A00112A482001481
61114+:1047E0000A001125AFAA0010A0800081AD07004C7F
61115+:1047F0008CA2010800E210231840000224E2FFFC12
61116+:10480000ACA2010830C20001104000080000000006
61117+:104810008D0200500062102304410013240600059D
61118+:104820008D02005410620010000000008D02005440
61119+:1048300014620011000000003C0208008C4200D805
61120+:10484000304200201040000A240200019103007849
61121+:10485000910200831443000624020001010020217C
61122+:1048600001202821240600040A0010540000000042
61123+:10487000A1000084A502001403E00008000000006D
61124+:1048800027BDFFE0AFBF0018274201009046000A95
61125+:104890008C4800148C8B004C9082008430C900FF3F
61126+:1048A00001681823304A00FF1C60001A2D460006DC
61127+:1048B000240200010142100410C00016304300031E
61128+:1048C000012030210100382114600007304C000C19
61129+:1048D00015800009304200301440000B8FBF0018D3
61130+:1048E0000A001214000000000E001125AFAB0010EA
61131+:1048F0000A0012148FBF00180E00109AAFAB001000
61132+:104900000A0012148FBF0018AFAB00100E0011BACE
61133+:10491000AFAA00148FBF001803E0000827BD0020D5
61134+:1049200024020003A08200848C82005403E000086B
61135+:10493000ACA201083C0200080342182190620081E9
61136+:10494000240600433C07601924420001A062008154
61137+:10495000906300813C0208008C4200C0306300FF7D
61138+:10496000146200102403FF803C0208008C4200E027
61139+:104970000082102100431024AF4200243C020800B2
61140+:104980008C4200E03C03000A008210213042007F8C
61141+:104990000342102100431021944500D40A000AF17B
61142+:1049A00030A5FFFF03E000080000000027BDFFE086
61143+:1049B000AFBF0018AFB10014AFB000108F4201803C
61144+:1049C0000080802100A088210E00121B00402021C1
61145+:1049D000A20000848E0200548FBF00188FB0001018
61146+:1049E000AE2201088FB1001403E0000827BD0020AB
61147+:1049F00027BDFFE03C020008AFB00010AFBF0018B9
61148+:104A0000AFB10014034280218F5101409203008412
61149+:104A10008E0400508E02004C14820040306600FF6D
61150+:104A20003C0208008C4200E02403FF800222102197
61151+:104A300000431024AF4200243C0208008C4200E0F6
61152+:104A40009744007C92050081022210213042007FB1
61153+:104A5000034218213C02000A0062182114A0000B36
61154+:104A60003084FFFF2402000554C20014248205DCB8
61155+:104A70009062011224420001A062011224020C8003
61156+:104A8000AF4200240A00127324020005A060011244
61157+:104A90002402000514C20009248205DC9202008170
61158+:104AA0002C4200075040000524820A009203008136
61159+:104AB0002402001400621004008210213044FFFF21
61160+:104AC000A60400140E00121B022020219602003CB6
61161+:104AD0008E03004C022020213042FFFF00021040D4
61162+:104AE000006218210E000250AE03005C9202007DAD
61163+:104AF00002202021344200400E000259A202007D13
61164+:104B00008F4201F80440FFFE24020002AF5101C0B1
61165+:104B1000A34201C43C021000AF4201F88FBF00184D
61166+:104B20008FB100148FB0001003E0000827BD0020F3
61167+:104B300008000ACC08000B1408000B9808000BE4CE
61168+:104B400008000C200A0000280000000000000000FF
61169+:104B50000000000D6370362E322E3300000000007E
61170+:104B60000602030400000000000000000000000036
61171+:104B70000000000000000000000000000000000035
61172+:104B80000000000000000000000000000000002005
61173+:104B90000000000000000000000000000000000015
61174+:104BA0000000000000000000000000000000000005
61175+:104BB00000000000000000000000000000000001F4
61176+:104BC0000000002B000000000000000400030D4066
61177+:104BD00000000000000000000000000000000000D5
61178+:104BE00000000000000000001000000300000000B2
61179+:104BF0000000000D0000000D3C020800244258A4F3
61180+:104C00003C03080024635F70AC4000000043202B8D
61181+:104C10001480FFFD244200043C1D080037BD7FFCCA
61182+:104C200003A0F0213C100800261000A03C1C080046
61183+:104C3000279C58A40E0001AC000000000000000DED
61184+:104C400027BDFFE83C096018AFBF00108D2C500055
61185+:104C5000240DFF7F24080031018D5824356A380C5B
61186+:104C600024070C003C1A8000AD2A50003C04800A46
61187+:104C7000AF4800083C1B8008AF4700240E00091510
61188+:104C8000AF8400100E0008D8000000000E000825B8
61189+:104C9000000000000E001252000000003C046016EC
61190+:104CA0008C8500003C06FFFF3C02535300A61824ED
61191+:104CB0001062004734867C0094C201F2A780002C69
61192+:104CC00010400003A78000CC38581E1EA798002C67
61193+:104CD00094C201F810400004978300CC38591E1E7E
61194+:104CE000A79900CC978300CC2C7F006753E000018C
61195+:104CF000240300669784002C2C82040114400002D7
61196+:104D000000602821240404003C0760008CE904387A
61197+:104D10002403103C3128FFFF1103001F30B9FFFFAF
61198+:104D200057200010A38000CE24020050A38200CEA2
61199+:104D3000939F00CE53E0000FA78500CCA78000CC46
61200+:104D4000978500CC8FBF0010A780002CA78000346F
61201+:104D5000A78000E63C010800AC25008003E00008C5
61202+:104D600027BD0018939F00CE57E0FFF5A78000CC29
61203+:104D7000A78500CC978500CC8FBF0010A784002C9E
61204+:104D8000A7800034A78000E63C010800AC25008025
61205+:104D900003E0000827BD0018A38000CE8CCB003CA8
61206+:104DA000316A00011140000E0000000030A7FFFF33
61207+:104DB00010E0FFDE240200508CCC00C831860001D8
61208+:104DC00014C0FFDC939F00CE0A00007A2402005139
61209+:104DD0008C8F00043C0E60000A00005D01EE302163
61210+:104DE0008CEF0808240D5708000F740211CD000441
61211+:104DF00030B8FFFF240500660A00007B240404008D
61212+:104E00001700FFCC939F00CE0A00007A24020050C6
61213+:104E10008F8600103089FFFF000939408CC30010D5
61214+:104E20003C08005000E82025AF4300388CC5001432
61215+:104E300027420400AF82001CAF45003CAF44003065
61216+:104E40000000000000000000000000000000000062
61217+:104E50000000000000000000000000000000000052
61218+:104E60008F4B0000316A00201140FFFD0000000060
61219+:104E700003E00008000000008F840010948A001AEC
61220+:104E80008C8700243149FFFF000940C000E8302131
61221+:104E9000AF46003C8C8500248F43003C00A31023C8
61222+:104EA00018400029000000008C8B002025620001C2
61223+:104EB0003C0D005035AC0008AF420038AF4C00301C
61224+:104EC00000000000000000000000000000000000E2
61225+:104ED00000000000000000000000000000000000D2
61226+:104EE0008F4F000031EE002011C0FFFD00000000D8
61227+:104EF0008F4A04003C080020AC8A00108F4904044B
61228+:104F0000AC890014AF4800300000000094860018FF
61229+:104F10009487001C00C71821A48300189485001AE8
61230+:104F200024A20001A482001A9498001A9499001EE9
61231+:104F3000133800030000000003E000080000000038
61232+:104F400003E00008A480001A8C8200200A0000DC24
61233+:104F50003C0D00500A0000CD000000003C0308009A
61234+:104F60008C6300208F82001827BDFFE810620008C4
61235+:104F7000AFBF00100E000104AF8300183C0308000F
61236+:104F80008C63002024040001106400048F89001049
61237+:104F90008FBF001003E0000827BD00188FBF00106E
61238+:104FA0003C076012A520000A9528000A34E500108D
61239+:104FB00027BD00183106FFFF03E00008ACA60090F3
61240+:104FC0003C0208008C42002027BDFFC8AFBF003460
61241+:104FD000AFBE0030AFB7002CAFB60028AFB500248D
61242+:104FE000AFB40020AFB3001CAFB20018AFB10014D3
61243+:104FF00010400050AFB000108F840010948600065F
61244+:105000009483000A00C3282330B6FFFF12C0004A71
61245+:105010008FBF003494890018948A000A012A402323
61246+:105020003102FFFF02C2382B14E0000202C020212F
61247+:10503000004020212C8C0005158000020080A0215A
61248+:10504000241400040E0000B3028020218F8700107A
61249+:1050500002809821AF80001494ED000A028088211C
61250+:105060001280004E31B2FFFF3C1770003C1540002B
61251+:105070003C1E60008F8F001C8DEE000001D71824AD
61252+:10508000507500500220202102A3802B160000350D
61253+:105090003C182000507800470220202124100001F5
61254+:1050A0008F83001414600039029158230230F823D2
61255+:1050B0000250C82133F1FFFF1620FFEE3332FFFF0D
61256+:1050C0008F8700103C110020AF510030000000001D
61257+:1050D00094E6000A3C1E601237D5001002662821B3
61258+:1050E000A4E5000A94E2000A94F2000A94F400187D
61259+:1050F0003057FFFF1292003BAEB700908CED0014CA
61260+:105100008CE400100013714001AE4021000E5FC31B
61261+:10511000010E502B008B4821012A1821ACE8001405
61262+:10512000ACE3001002D3382330F6FFFF16C0FFB9FE
61263+:105130008F8400108FBF00348FBE00308FB7002CDB
61264+:105140008FB600288FB500248FB400208FB3001CC9
61265+:105150008FB200188FB100148FB0001003E0000868
61266+:1051600027BD0038107E001B000000001477FFCC24
61267+:10517000241000010E00159B000000008F83001416
61268+:105180001060FFCB0230F823029158238F87001064
61269+:10519000017020210A0001973093FFFF8F830014D4
61270+:1051A0001460FFCB3C110020AF5100300A000163B6
61271+:1051B000000000000E00077D024028210A00015770
61272+:1051C000004080210E00033A024028210A000157C6
61273+:1051D000004080210E001463022020210A000157A4
61274+:1051E000004080210E0000CD000000000A0001797F
61275+:1051F00002D3382327BDFFE8AFB00010AFBF0014C3
61276+:105200000E00003F000000003C028000345000709F
61277+:105210000A0001BA8E0600008F4F000039EE00012F
61278+:1052200031C20001104000248F8600A88E070000C4
61279+:105230003C0C08008D8C003C3C0908008D2900388E
61280+:1052400000E66823018D28210000502100AD302B9D
61281+:10525000012A4021010620213C010800AC25003C28
61282+:10526000AF8700A83C010800AC2400380E000106FE
61283+:10527000000000003C0308008C6300701060FFE633
61284+:10528000006020213C0508008CA500683C06080051
61285+:105290008CC6006C0E00152A000000003C010800BE
61286+:1052A000AC2000708F4F000039EE000131C20001C8
61287+:1052B0001440FFDE8F8600A88E0A00008F8B00A8A6
61288+:1052C0003C0508008CA5003C3C0408008C84003898
61289+:1052D000014B482300A938210082182100E9402B06
61290+:1052E000006810213C010800AC27003C3C0108008C
61291+:1052F000AC2200388F5F01002419FF0024180C0035
61292+:1053000003F9202410980012AF840000AF4400205D
61293+:10531000936D0000240C002031A600FF10CC001279
61294+:10532000240E005010CE00043C194000AF59013843
61295+:105330000A0001B3000000000E0011C800000000C8
61296+:105340003C194000AF5901380A0001B300000000C9
61297+:105350000E00011F000000003C194000AF59013849
61298+:105360000A0001B3000000008F58010000802821CE
61299+:10537000330F00FF01E020210E0002F1AF8F000487
61300+:105380003C194000AF5901380A0001B30000000089
61301+:1053900000A4102B2403000110400009000030215C
61302+:1053A0000005284000A4102B04A0000300031840AF
61303+:1053B0005440FFFC000528405060000A0004182BF0
61304+:1053C0000085382B54E000040003184200C3302548
61305+:1053D00000852023000318421460FFF900052842CD
61306+:1053E0000004182B03E0000800C310218F4201B80D
61307+:1053F0000440FFFE00000000AF4401803C031000A9
61308+:1054000024040040AF450184A3440188A3460189D8
61309+:10541000A747018A03E00008AF4301B83084FFFFCB
61310+:105420000080382130A5FFFF000020210A00022A59
61311+:10543000240600803087FFFF8CA40000240600387B
61312+:105440000A00022A000028218F8300388F8600304E
61313+:105450001066000B008040213C07080024E75A1822
61314+:10546000000328C000A710218C4400002463000121
61315+:10547000108800053063000F5466FFFA000328C04F
61316+:1054800003E00008000010213C07080024E75A1C34
61317+:1054900000A7302103E000088CC200003C0390000C
61318+:1054A0003462000100822025AF4400208F45002097
61319+:1054B00004A0FFFE0000000003E000080000000060
61320+:1054C0003C038000346200010082202503E00008D4
61321+:1054D000AF44002027BDFFE0AFB100143091FFFFC3
61322+:1054E000AFB00010AFBF00181220001300A0802141
61323+:1054F0008CA2000024040002240601401040000F8A
61324+:10550000004028210E000C5C00000000000010216B
61325+:10551000AE000000022038218FBF00188FB10014A8
61326+:105520008FB0001000402021000028210000302111
61327+:105530000A00022A27BD00208CA200000220382188
61328+:105540008FBF00188FB100148FB0001000402021D1
61329+:1055500000002821000030210A00022A27BD002077
61330+:1055600000A010213087FFFF8CA500048C440000B0
61331+:105570000A00022A2406000627BDFFE0AFB0001093
61332+:10558000AFBF0018AFB100149363003E00808021CC
61333+:105590000080282130620040000020211040000FD0
61334+:1055A0008E1100000E000851022020219367000098
61335+:1055B0002404005030E500FF50A400128E0F0000BC
61336+:1055C000022020218FBF00188FB100148FB000106F
61337+:1055D000A762013C0A00091127BD00200E000287C6
61338+:1055E000000000000E0008510220202193670000F7
61339+:1055F0002404005030E500FF14A4FFF20220202113
61340+:105600008E0F00003C1008008E1000503C0D000C66
61341+:10561000240BFF8001F05021314E007F01DA602120
61342+:10562000018D4021014B4824AF4900280220202150
61343+:105630008FBF00188FB100148FB00010A50200D6E4
61344+:1056400027BD00200A000911AF8800D027BDFFE068
61345+:10565000AFBF0018AFB10014AFB0001093660001E7
61346+:10566000008080210E00025630D1000493640005B2
61347+:10567000001029C2A765000034830040A363000521
61348+:105680000E00025F020020210E00091302002021FB
61349+:1056900024020001AF62000C02002821A762001062
61350+:1056A00024040002A762001224060140A76200142D
61351+:1056B0000E000C5CA76200161620000F8FBF0018AA
61352+:1056C000978C00343C0B08008D6B00782588FFFF19
61353+:1056D0003109FFFF256A0001012A382B10E000067E
61354+:1056E000A78800343C0F6006240E001635ED00102C
61355+:1056F000ADAE00508FBF00188FB100148FB00010F6
61356+:1057000003E0000827BD002027BDFFE0AFB1001473
61357+:10571000AFBF0018AFB0001000A088211080000AB1
61358+:105720003C03600024020080108200120000000090
61359+:105730000000000D8FBF00188FB100148FB0001053
61360+:1057400003E0000827BD00208C682BF80500FFFE51
61361+:1057500000000000AC712BC08FBF00188FB1001487
61362+:105760008FB000103C09100027BD002003E00008A6
61363+:10577000AC692BF80E00025600A0202193650005AD
61364+:10578000022020210E00025F30B000FF2403003E03
61365+:105790001603FFE7000000008F4401780480FFFE3D
61366+:1057A000240700073C061000AF51014002202021D1
61367+:1057B000A34701448FBF00188FB100148FB00010B1
61368+:1057C000AF4601780A0002C227BD002027BDFFE8CE
61369+:1057D000AFBF0014AFB000108F50002000000000D9
61370+:1057E0000E000913AF440020AF5000208FBF0014FB
61371+:1057F0008FB0001003E0000827BD00183084FFFFC1
61372+:10580000008038212406003500A020210A00022A49
61373+:10581000000028213084FFFF008038212406003654
61374+:1058200000A020210A00022A0000282127BDFFD065
61375+:10583000AFB3001C3093FFFFAFB50024AFB2001828
61376+:10584000AFBF0028AFB40020AFB10014AFB000105C
61377+:1058500030B5FFFF12600027000090218F90001CE0
61378+:105860008E0300003C0680002402004000033E023C
61379+:1058700000032C0230E4007F006688241482001D9F
61380+:1058800030A500FF8F8300282C68000A510000100B
61381+:105890008F910014000358803C0C0800258C56940E
61382+:1058A000016C50218D49000001200008000000001B
61383+:1058B00002B210213045FFFF0E000236240400849E
61384+:1058C000162000028F90001CAF8000288F910014DA
61385+:1058D000260C002026430001018080213072FFFF4A
61386+:1058E00016200004AF8C001C0253502B1540FFDC27
61387+:1058F00000000000024010218FBF00288FB5002457
61388+:105900008FB400208FB3001C8FB200188FB1001429
61389+:105910008FB0001003E0000827BD0030240E0034D3
61390+:1059200014AE00F9000000009203000E241F168040
61391+:105930003C07000CA36300219202000D0347C8211D
61392+:105940003C066000A3620020961100123C0A7FFF13
61393+:10595000354CFFFFA771003C960B00102403000597
61394+:105960003168FFFFAF6800848E05001CAF5F002820
61395+:105970008F3800008CC4444803057826008F3021FE
61396+:10598000AF66004C8F69004C24CE00013C057F00BF
61397+:10599000AF6900508F740050AF740054AF66007050
61398+:1059A000AF6E00588F6D005824140050AF6D005C2E
61399+:1059B000A3600023AF6C0064A36300378E02001461
61400+:1059C000AF6200488F710048AF7100248E0B001841
61401+:1059D000AF6B006C9208000CA3680036937F003E0A
61402+:1059E00037F90020A379003E8F78007403058024E6
61403+:1059F000360F4000AF6F007493640000308900FFE1
61404+:105A0000513402452404FF803C04080024845A9841
61405+:105A10000E00028D000000003C1008008E105A9805
61406+:105A20000E00025602002021240600042407000173
61407+:105A3000A366007D020020210E00025FA36700051F
61408+:105A40008F5F017807E0FFFE240B0002AF5001409A
61409+:105A5000A34B01448F90001C3C081000AF48017814
61410+:105A60000A000362AF8000282CAD003751A0FF98D8
61411+:105A70008F9100140005A0803C180800271856BC20
61412+:105A8000029878218DEE000001C00008000000009F
61413+:105A90002418000614B80011000000003C0808009B
61414+:105AA0008D085A9824040005AF4800208E1F001866
61415+:105AB000AF7F00188F79004CAF79001C8F650050C4
61416+:105AC000122000C0AF6500700A000362AF84002896
61417+:105AD0002406000710A60083240300063C050800E6
61418+:105AE00024A55A980E000264240400818F90001CA3
61419+:105AF0000011102B0A000362AF8200282407000463
61420+:105B000014A7FFF6240500503C1808008F185A9877
61421+:105B1000AF5800208E0F0008AF6F00408E090008BC
61422+:105B2000AF6900448E14000CAF7400488E0E001054
61423+:105B3000AF6E004C8E0D0010AF6D00848E0A001405
61424+:105B4000AF6A00508E0C0018AF6C00548E04001C1D
61425+:105B5000AF64005893630000306B00FF116501D8FB
61426+:105B6000000000008F7400488F6900400289702394
61427+:105B700005C000042404008C1620FFDE240200036C
61428+:105B8000240400823C05080024A55A980E000287D0
61429+:105B9000000000008F90001C000010210A0003622A
61430+:105BA000AF820028240F000514AFFFCC240520008D
61431+:105BB0003C0708008CE75A98AF4700208E06000487
61432+:105BC000AF66005C9208000824100008A36800215A
61433+:105BD0008F9F001C93F90009A37900208F86001C79
61434+:105BE00090D8000A330400FF10900011000000005C
61435+:105BF0002885000914A0006924020002240A00205C
61436+:105C0000108A000B34058000288D002115A00008A3
61437+:105C100024054000240E0040108E00053C050001C4
61438+:105C200024140080109400023C050002240540006A
61439+:105C30008F7800743C19FF00031980240205782531
61440+:105C4000AF6F007490C4000BA36400818F84001CAC
61441+:105C50009489000C11200192000000009490000C27
61442+:105C60002406FFBF24050004A770003C908F000E9F
61443+:105C7000A36F003E8F84001C9089000FA369003F32
61444+:105C80008F8B001C8D6E00108F54007401D468231C
61445+:105C9000AF6D00608D6A0014AF6A0064956C0018E7
61446+:105CA000A76C00689563001AA763006A8D62001CE8
61447+:105CB000AF62006C9167000EA367003E9368003EE0
61448+:105CC0000106F8241220014BA37F003E8F90001C98
61449+:105CD0000A000362AF8500282407002214A7FF7F73
61450+:105CE000240300073C0B08008D6B5A981220000C0F
61451+:105CF000AF4B00200A000362AF830028240C00335E
61452+:105D000010AC0014240A00283C05080024A55A9869
61453+:105D10000E00023C240400810A0003EB8F90001C5B
61454+:105D20003C04080024845A980E00028D00000000F4
61455+:105D30009363000024110050306200FF10510135C0
61456+:105D4000000000008F90001C000018210A00036270
61457+:105D5000AF8300283C0D08008DAD5A9824040081C3
61458+:105D6000AF4D00203C05080024A55A980E00023CC7
61459+:105D7000A36A00348F90001C240200090A00036209
61460+:105D8000AF82002802B288213225FFFF0E000236C2
61461+:105D9000240400840A0003628F90001C1082FFA478
61462+:105DA00024050400288B000311600170240C0004FA
61463+:105DB000240300015483FF9E240540000A00043B95
61464+:105DC000240501003C04080024845A988F62004C8A
61465+:105DD0000E00028D8F6300508F90001C0000202168
61466+:105DE0000A000362AF8400288E1000042404008A95
61467+:105DF000AF50002093790005333800021700015F8F
61468+:105E0000020028219368002302002821311F00206E
61469+:105E100017E0015A2404008D9367003F2406001206
61470+:105E200030E200FF10460155240400810E000256A6
61471+:105E30000200202193630023240500040200202196
61472+:105E4000346B0042A36B00230E00025FA365007D4C
61473+:105E50008F4401780480FFFE240A0002AF50014005
61474+:105E6000A34A01448F90001C3C0C1000AF4C0178F9
61475+:105E70000A0003EC0011102B8E1000042404008A89
61476+:105E8000AF500020936E000531CD000215A0001622
61477+:105E900002002821936F003F2414000402002821EF
61478+:105EA00031E900FF11340010240400810E00025675
61479+:105EB000020020219362002324080012241FFFFE09
61480+:105EC00034460020A3660023A368003F93790005B1
61481+:105ED00002002021033FC0240E00025FA3780005CA
61482+:105EE00002002821000020210E00033400000000E1
61483+:105EF0000A0003EB8F90001C8E1000043C03000886
61484+:105F00000343A021AF500020928B000024050050D5
61485+:105F1000316400FF10850161240700880200202100
61486+:105F2000000028210E00022A2406000E928D000097
61487+:105F3000240EFF800200282101AE8025A2900000DF
61488+:105F4000240400040E000C5C240600300A0003EB5D
61489+:105F50008F90001C8E0800043C14080026945A9868
61490+:105F60003C010800AC285A98AF480020921F00035B
61491+:105F700033F9000413200002240200122402000658
61492+:105F8000A362003F920B001B2404FFC03165003F59
61493+:105F900000A43825A367003E9206000330C200012A
61494+:105FA00014400132000000008E020008AE8200089A
61495+:105FB0003C0208008C425AA010400131000249C244
61496+:105FC000A76900088E14000C240C0001240300149F
61497+:105FD000AF74002C8E0E0010AF6E0030960D0016C0
61498+:105FE000A76D0038960A0014A76A003AAF6C000C3F
61499+:105FF000A76C0010A76C0012A76C0014A76C001609
61500+:1060000012200136A3630034920F000331F0000226
61501+:106010002E1100018F90001C262200080A00036246
61502+:10602000AF8200288E0400043C0E0008034E30218D
61503+:10603000AF4400208E05000890CD0000240C0050D5
61504+:1060400031AA00FF114C00862407008824060009AD
61505+:106050000E00022A000000000A0003EB8F90001CD3
61506+:106060008E04001C0E00024100000000104000F4ED
61507+:10607000004050218F89001C240700890140202105
61508+:106080008D25001C240600010E00022A00000000DD
61509+:106090000A0003EB8F90001C960D00023C140800D0
61510+:1060A00026945A9831AA0004514000B83C10600070
61511+:1060B0008E0E001C3C010800AC2E5A98AF4E0020FA
61512+:1060C000920700102408001430E200FF144800D6A4
61513+:1060D00000000000960B00023163000114600165AE
61514+:1060E000000000008E020004AE8200083C1408008C
61515+:1060F0008E945AA01280015B000000008F7400741F
61516+:106100003C0380002404000102835825AF6B007417
61517+:10611000A3600005AF64000C3C0708008CE75AA0A0
61518+:106120008F86001CA7640010000711C2A76400122C
61519+:10613000A7640014A7640016A76200088CC80008B2
61520+:1061400024040002AF68002C8CC5000CAF65003041
61521+:1061500090DF0010A37F00348F99001C9330001152
61522+:10616000A37000358F98001C930F0012A36F0036A8
61523+:106170008F89001C912E0013A36E00378F90001C96
61524+:10618000960D0014A76D0038960A0016A76A003A0B
61525+:106190008E0C0018AF6C00245620FDCCAF84002874
61526+:1061A0003C05080024A55A980E0002640000202136
61527+:1061B0008F90001C0A0004A7000020218E1000040C
61528+:1061C00024070081AF500020936900233134001070
61529+:1061D000128000170000000002002021000028218A
61530+:1061E0002406001F0E00022A000000000A0003EB34
61531+:1061F0008F90001C3C05080024A55A980E000287C9
61532+:10620000240400828F90001C000028210A000362F1
61533+:10621000AF8500283C0408008C845A980E0014E8CE
61534+:10622000000000008F90001C0A000482000018216A
61535+:106230000E00025602002021937800230200202144
61536+:10624000370F00100E00025FA36F002300003821FB
61537+:1062500002002021000028210A0005A82406001FB2
61538+:10626000920F000C31E90001112000030000000032
61539+:106270009618000EA4D8002C921F000C33F90002CF
61540+:1062800013200005000038218E0200149608001229
61541+:10629000ACC2001CA4C8001A0A0005432406000969
61542+:1062A0003C05080024A55A980E0002872404008BA0
61543+:1062B0008F90001C0011282B0A000362AF85002874
61544+:1062C000AF6000843C0A08008D4A5A983C0D0800D3
61545+:1062D0008DAD0050240CFF803C02000C014D1821B4
61546+:1062E000006C2024AF4400288E070014306B007F20
61547+:1062F000017A282100A2C821AF2700D88E060014F9
61548+:10630000AF9900D0AF2600DC8E080010251FFFFEDD
61549+:106310000A000408AF3F01083C0508008CA55A9804
61550+:106320003C1908008F39005024CCFFFE00B9C02171
61551+:1063300003047824AF4F00283C1408008E945A9828
61552+:106340003C0908008D2900500289702131CD007F61
61553+:1063500001BA502101478021AE0600D8AF9000D08D
61554+:10636000AE0000DC0A0003B1AE0C0108548CFE3014
61555+:10637000240540000A00043B240510000E00032EF3
61556+:10638000000000000A0003EB8F90001C8E0F442CCD
61557+:106390003C186C62370979703C010800AC205A98AF
61558+:1063A00015E9000824050140979F00349786002CCA
61559+:1063B0000280282103E6C82B132000112404009238
61560+:1063C000240501400E000C7A240400023C01080060
61561+:1063D000AC225A98AF4200203C0508008CA55A9880
61562+:1063E00010A00005240400830E00084500000000F2
61563+:1063F00010400009240400833C05080024A55A9895
61564+:106400000E000264000000008F90001C0011202B81
61565+:106410000A000362AF8400280E0008490000000053
61566+:106420000A00055F8F90001C0E00084D0000000060
61567+:106430003C05080024A55A980A00062F2404008B66
61568+:10644000240400040E000C7A240500301440002AB5
61569+:10645000004050218F89001C240700830140202127
61570+:106460008D25001C0A000551240600018E04000839
61571+:106470000E000241000000000A00051BAE82000869
61572+:106480003C05080024A55A980E00023C240400870D
61573+:106490008F90001C0A0005360011102B8F830038E6
61574+:1064A0008F8600301066FE9D000038213C070800F2
61575+:1064B00024E75A1C000320C0008728218CAC000070
61576+:1064C00011900061246A00013143000F5466FFFA05
61577+:1064D000000320C00A0004F6000038213C05080033
61578+:1064E00024A55A980E000287240400828F90001C75
61579+:1064F0000A000536000010213C0B0008034B202148
61580+:106500002403005024070001AF420020A0830000B4
61581+:10651000A08700018F82001C90480004A08800180A
61582+:106520008F85001C90A60005A08600198F9F001C77
61583+:1065300093F90006A099001A8F90001C921800078A
61584+:10654000A098001B8F94001C928F0008A08F001C45
61585+:106550008F89001C912E0009A08E001D8F8D001CBC
61586+:1065600091AC000AA08C001E8F8B001C3C0C080014
61587+:10657000258C5A1C9163000B3C0B0800256B5A18A4
61588+:10658000A083001F8F87001C90E8000CA0880020CB
61589+:106590008F82001C9045000D24024646A0850021F4
61590+:1065A0008F86001C90DF000EA09F00228F99001C98
61591+:1065B0009330000FA09000238F98001C93140010BC
61592+:1065C000A09400248F8F001C91E90011A089002560
61593+:1065D0008F89001C8F8E00308F900038952D00140D
61594+:1065E000000E18C025C80001A48D002895270016AC
61595+:1065F000006C3021006BC821A487002A9525001863
61596+:106600003108000FA485002CA482002E8D3F001CB1
61597+:10661000ACCA0000AF88003011100006AF3F000088
61598+:10662000000038218D25001C014020210A00055161
61599+:1066300024060001250C00013184000F00003821E0
61600+:106640000A0006B8AF8400383C07080024E75A184F
61601+:106650000087302100003821ACA000000A0004F6B9
61602+:10666000ACC000003C05080024A55A980A00062F7B
61603+:10667000240400878E0400040E0002410000000084
61604+:106680000A00056AAE8200083084FFFF30C600FFB2
61605+:106690008F4201B80440FFFE00064400010430258B
61606+:1066A0003C07200000C720253C031000AF400180BC
61607+:1066B000AF450184AF44018803E00008AF4301B84F
61608+:1066C00027BDFFE8AFB00010AFBF00143C0760006B
61609+:1066D000240600021080000600A080210010102B6C
61610+:1066E0008FBF00148FB0001003E0000827BD001812
61611+:1066F0003C09600EAD2000348CE5201C8F82001C0C
61612+:106700002408FFFC00A81824ACE3201C0E0006D1CE
61613+:106710008C45000C0010102B8FBF00148FB00010A0
61614+:1067200003E0000827BD00183C02600E344701005A
61615+:1067300024090018274A040000000000000000009F
61616+:10674000000000003C06005034C30200AF44003893
61617+:10675000AF45003CAF430030014018218F4B000093
61618+:10676000316800201100FFFD2406007F2408FFFF90
61619+:106770008C6C000024C6FFFF24630004ACEC000016
61620+:1067800014C8FFFB24E70004000000000000000024
61621+:10679000000000003C0F0020AF4F00300000000060
61622+:1067A00024AD020001A5702B2529FFFF008E2021BA
61623+:1067B0001520FFE101A0282103E0000800000000EF
61624+:1067C00027BDFFE0AFB10014AFBF0018AFB000109D
61625+:1067D0003C05600E8CA20034008088211440000625
61626+:1067E0003C0460008C87201C2408FFFC00E8302457
61627+:1067F00034C30001AC83201C8F8B001C24090001D2
61628+:10680000ACA90034956900028D6500148D70000CF0
61629+:106810002D2400818D6700048D660008108000071C
61630+:106820008D6A00102D2C00041580000E30CE00075C
61631+:10683000312D000311A0000B000000002404008B88
61632+:10684000020028210E0006D1240600030011102B9F
61633+:106850008FBF00188FB100148FB0001003E0000844
61634+:1068600027BD002015C0FFF62404008B3C03002048
61635+:10687000AF4300300000000024020001AF8200148A
61636+:106880000000000000000000000000003C1F01505C
61637+:10689000013FC825253800033C0F600EAF47003884
61638+:1068A00000181882AF46003C35E8003CAF59003074
61639+:1068B000274704008F4400003086002010C0FFFDF1
61640+:1068C00000000000106000082466FFFF2403FFFFA3
61641+:1068D0008CEB000024C6FFFF24E70004AD0B000092
61642+:1068E00014C3FFFB250800043C08600EAD09003806
61643+:1068F0000000000000000000000000003C07002035
61644+:10690000AF470030000000000E0006F901402021D2
61645+:1069100002002821000020210E0006D124060003D9
61646+:106920000011102B8FBF00188FB100148FB0001012
61647+:1069300003E0000827BD002027BDFFE0AFB200182C
61648+:106940003092FFFFAFB10014AFBF001CAFB000101A
61649+:106950001640000D000088210A0007AA022010211D
61650+:1069600024050001508500278CE5000C0000000D77
61651+:10697000262300013071FFFF24E200200232382B71
61652+:1069800010E00019AF82001C8F8200141440001622
61653+:106990008F87001C3C0670003C0320008CE5000043
61654+:1069A00000A62024148300108F84003C00054402BC
61655+:1069B0003C09800000A980241480FFE9310600FF13
61656+:1069C0002CCA00095140FFEB262300010006688015
61657+:1069D0003C0E080025CE579801AE60218D8B00003B
61658+:1069E0000160000800000000022010218FBF001C81
61659+:1069F0008FB200188FB100148FB0001003E00008B0
61660+:106A000027BD00200E0006D1240400841600FFD804
61661+:106A10008F87001C0A00078BAF80003C90EF0002BC
61662+:106A200000002021240600090E0006D1000F2E00D0
61663+:106A30008F87001C0010102B0A00078BAF82003CD0
61664+:106A4000020028210E0006DF240400018F87001CAD
61665+:106A50000A00078BAF82003C020028210E0006DFEF
61666+:106A6000000020210A0007C38F87001C0E00071FAB
61667+:106A7000020020210A0007C38F87001C30B0FFFFEF
61668+:106A8000001019C08F5801B80700FFFE3C1F2004FA
61669+:106A90003C191000AF430180AF400184AF5F018813
61670+:106AA000AF5901B80A00078C262300013082FFFF8E
61671+:106AB00014400003000018210004240224030010E5
61672+:106AC000308500FF14A000053087000F2466000801
61673+:106AD0000004220230C300FF3087000F14E00005DD
61674+:106AE000308900032468000400042102310300FF00
61675+:106AF0003089000315200005388B0001246A00024C
61676+:106B000000042082314300FF388B00013164000112
61677+:106B100010800002246C0001318300FF03E00008B4
61678+:106B200000601021308BFFFF000B394230E600FF80
61679+:106B30003C09080025295998000640800109602178
61680+:106B40008D8700003164001F240A0001008A1804A8
61681+:106B500030A500FF00E3202514A000020003102749
61682+:106B600000E22024240F000100CF700401096821F5
61683+:106B7000000E282714800005ADA400008F86000CAD
61684+:106B800000A6102403E00008AF82000C8F88000CE0
61685+:106B900001C8102503E00008AF82000C3C06001F6E
61686+:106BA0003C0360003084FFFF34C5FF8024020020D6
61687+:106BB000AC602008AC60200CAC602010AC652014E8
61688+:106BC000AC642018AC62200000000000000000004F
61689+:106BD00003E000080000000027BDFFE82402FFFFDB
61690+:106BE000AFBF0010AF82000C000020213C0608005F
61691+:106BF00024C659982405FFFF248900010004408021
61692+:106C00003124FFFF010618212C87002014E0FFFA31
61693+:106C1000AC6500000E0008160000202124020001CF
61694+:106C20003C04600024050020AC822018AC852000C4
61695+:106C3000000000000000000000000000244A0001E5
61696+:106C40003142FFFF2C46040014C0FFF78FBF001035
61697+:106C500003E0000827BD00188F8300082C620400A1
61698+:106C600003E00008384200018F830008246200011D
61699+:106C700003E00008AF8200088F8300082462FFFF52
61700+:106C800003E00008AF82000827BDFFE0AFB10014A9
61701+:106C9000AFBF0018AFB000108F6B00303C06600033
61702+:106CA00000808821ACCB20088F6A002C3C02800039
61703+:106CB00024030008ACCA200C9769003A9768003892
61704+:106CC00000092C003107FFFF00A72025ACC42010CD
61705+:106CD000ACC22014ACC32000000000000000000083
61706+:106CE000000000003C0360008C6D200031AC000807
61707+:106CF0001580FFF9000000008C6E201405C00020F4
61708+:106D0000000000000E0007DA8F84000C00024080B3
61709+:106D10003C09080025295998010938218CE4000014
61710+:106D20000E0007DA00028140020220213090FFFFAE
61711+:106D3000020020210E0007F8000028213C0C8000F2
61712+:106D4000022C58253210FFFF3C116000240A00205D
61713+:106D5000AE2B2014AE302018AE2A20000000000018
61714+:106D60000000000000000000020010218FBF00188A
61715+:106D70008FB100148FB0001003E0000827BD002081
61716+:106D80008C6620143C02001F3443FF803C1FFFE848
61717+:106D900000C3C02437F9080003198021001079C20C
61718+:106DA0003C0C8000022C582531F0FFFF3C116000A4
61719+:106DB000240A0020AE2B2014AE302018AE2A20006A
61720+:106DC0000000000000000000000000000200102190
61721+:106DD0008FBF00188FB100148FB0001003E00008BF
61722+:106DE00027BD002027BDFFE8AFB000103402FFFF31
61723+:106DF0003090FFFFAFBF00141202000602002021F6
61724+:106E00000E00081600000000020020210E0007F806
61725+:106E1000240500018F8400088FBF00148FB000107C
61726+:106E20002483FFFF27BD001803E00008AF8300089C
61727+:106E3000000439C230E6003F00043B42000718401E
61728+:106E4000240210002CC4002024C8FFE0AF42002C14
61729+:106E5000246300011480000330A900FF00071840DC
61730+:106E6000310600FF0003608024080001019A5821C8
61731+:106E70003C0A000E00C82804016A382111200005D0
61732+:106E8000000530278CE900000125302503E00008CB
61733+:106E9000ACE600008CEE000001C6682403E00008A8
61734+:106EA000ACED000027BDFFE8AFBF0014AFB000108D
61735+:106EB0003C0460008C8508083403F00030A2F00028
61736+:106EC00050430006240200018C8708083404E000C7
61737+:106ED00030E6F00010C4001E24020002AF82004021
61738+:106EE0003C1060003C0A0200AE0A0814240910009D
61739+:106EF0003C08000E8E03440003482021AF49002CBB
61740+:106F0000240501200E000CC0000030218F830040BA
61741+:106F1000106000043C021691240B0001106B000E5F
61742+:106F20003C023D2C344F0090AE0F44088FBF00143C
61743+:106F30008FB000103C0C6000240E10003C0D0200CD
61744+:106F400027BD0018AD8E442003E00008AD8D081069
61745+:106F50000A0008E7AF8000403C0218DA344F009086
61746+:106F6000AE0F44088FBF00148FB000103C0C6000BF
61747+:106F7000240E10003C0D020027BD0018AD8E4420E9
61748+:106F800003E00008AD8D08100A0008BB24050001CD
61749+:106F90000A0008BB000028213C08080025085DA461
61750+:106FA0002404FFFF010018212402001E2442FFFFD9
61751+:106FB000AC6400000441FFFD246300043C070800AA
61752+:106FC00024E75E208CE5FFFC2404001C240600015D
61753+:106FD000308A001F0146480424840001000910275C
61754+:106FE0002C8300201460FFFA00A22824ACE5FFFCEB
61755+:106FF0003C05666634A4616E3C06080024C65EE06B
61756+:10700000AF840058AF88009C2404FFFF00C0182103
61757+:107010002402001F2442FFFFAC6400000441FFFD76
61758+:10702000246300043C0766663C05080024A55EA0B6
61759+:10703000AF86004834E6616EAF8600982404FFFFF7
61760+:1070400000A018212402000F2442FFFFAC640000BE
61761+:107050000441FFFD246300043C0B66663C06080007
61762+:1070600024C65E203568616EAF8500A4AF880070CD
61763+:107070002404FFFF00C018212402001F2442FFFF48
61764+:10708000AC6400000441FFFD246300043C0D66660F
61765+:107090003C0A0800254A5F6035AC616EAF860090FF
61766+:1070A000AF8C005C2404FFFF014018212402000380
61767+:1070B0002442FFFFAC6400000441FFFD2463000490
61768+:1070C0003C09080025295F708D27FFFC2404000679
61769+:1070D000240500013099001F0325C0042484000109
61770+:1070E000001878272C8E002015C0FFFA00EF3824F6
61771+:1070F000AD27FFFC3C09666624030400240403DC7E
61772+:1071000024050200240600663522616E3C08080052
61773+:1071100025085AA4AF820074AF830044AF83006C8B
61774+:10712000AF830050AF830084AF8A008CAF840064CB
61775+:10713000AF85004CAF860054AF840078AF85006007
61776+:10714000AF86008001001821240200022442FFFFC4
61777+:10715000AC6000000441FFFD24630004240400032C
61778+:107160002403000C3C0A0800254A5AB0AF8A006884
61779+:107170000A00098E2405FFFF000418802484000102
61780+:10718000006858212C8700C014E0FFFBAD650000AB
61781+:107190003C0E666635CD616E240C17A024081800DD
61782+:1071A000AF8D0088AF8C009403E00008AF88007CAE
61783+:1071B0002484007F000421C200004021000030210F
61784+:1071C00000003821000028210A0009A5AF8400A092
61785+:1071D0001060000624E7000100C4302124A500014E
61786+:1071E0002CC20BF51440FFFA2CA300663C090800E2
61787+:1071F00025295F6001201821240200032442FFFF9B
61788+:10720000AC6000000441FFFD2463000410E0001A9C
61789+:1072100024E3FFFF0003294210A0000A0000202100
61790+:107220002406FFFF3C03080024635F602484000100
61791+:107230000085502BAC660000250800011540FFFBBF
61792+:107240002463000430E2001F10400008000868803A
61793+:10725000240C0001004C38040008588001692821E2
61794+:1072600024E6FFFF03E00008ACA6000001A94021CE
61795+:107270002409FFFFAD09000003E000080000000042
61796+:10728000AF4400283C04000C034420210005288260
61797+:107290000A000CC000003021000421803C03600083
61798+:1072A000AC6410080000000000052980AC65100CDB
61799+:1072B0000000000003E000088C62100C27BDFFE80E
61800+:1072C0000080282124040038AFBF00140E0009D527
61801+:1072D000AFB0001024040E00AF4400283C10000C96
61802+:1072E00003502021240500100E000CC000003021A6
61803+:1072F00003501021AC400000AC40000424040038CE
61804+:107300008FBF00148FB0001024053FFF27BD001869
61805+:107310000A0009D58C430000000421803C03600072
61806+:10732000AC641008000000008C62100C03E0000840
61807+:107330000002118227BDFFC8AFB400208F940068FF
61808+:10734000AFBE0030AFB7002CAFB600280000B821A8
61809+:107350000080B021241E00C0AFBF0034AFB50024B0
61810+:10736000AFB3001CAFB20018AFB10014AFB0001043
61811+:107370000A000A12AFA5003C504000018F9400683B
61812+:1073800027DEFFFF13C00028269400048E92000021
61813+:107390003C03080024635DA01240FFF70283102B1A
61814+:1073A0003C04080024845AA4028410230002A8C0CC
61815+:1073B000000098210A000A212411000100118840D0
61816+:1073C000122000260000000002B380210251282470
61817+:1073D0000200202110A0FFF9267300010E0009DE33
61818+:1073E000000000000016684032EC000101AC2021D2
61819+:1073F0000E0009D5020028218F89009426F700018C
61820+:107400008FA6003C3AEB0001316A00012528FFFFFE
61821+:107410000011382702CAB021AF88009416E6FFE7B2
61822+:1074200002479024AE92000002E010218FBF00348A
61823+:107430008FBE00308FB7002C8FB600288FB5002488
61824+:107440008FB400208FB3001C8FB200188FB10014CE
61825+:107450008FB0001003E0000827BD00383C0E080084
61826+:1074600025CE5DA0028E102B0A000A0DAE92000000
61827+:1074700027BDFFD8AFB10014AFB00010AFBF0020E0
61828+:10748000AFB3001CAFB2001800A0882110A0001FED
61829+:10749000000480403C13080026735AA40A000A5ACC
61830+:1074A0002412000112200019261000010E0009F517
61831+:1074B00002002021000231422444FFA0000618806F
61832+:1074C0003045001F2C8217A1007318212631FFFFC1
61833+:1074D0001040FFF400B230048C690000020020214B
61834+:1074E00024053FFF012640241500FFEE0126382524
61835+:1074F0000E0009D5AC6700008F8A009426100001A9
61836+:10750000254700011620FFE9AF8700948FBF0020B8
61837+:107510008FB3001C8FB200188FB100148FB0001011
61838+:1075200003E0000827BD00288F85009C00805821BB
61839+:107530000000402100004821240A001F3C0C0800E4
61840+:10754000258C5E1C3C0D080025AD5DA48CA60000BA
61841+:1075500050C000140000402100AD1023000238C0CC
61842+:10756000240300010A000A930000202115000003F3
61843+:1075700000E410212448202400004821252900018E
61844+:10758000512B00132506DFDC106000062484000167
61845+:1075900000C3702415C0FFF5000318400A000A91CB
61846+:1075A0000000402110AC002624A300040060282124
61847+:1075B000254AFFFF1540FFE5AF85009C512B0004D5
61848+:1075C0002506DFDC0000402103E000080100102157
61849+:1075D0000006614230C5001F000C50803C070800C7
61850+:1075E00024E75DA424040001014730211120000F8D
61851+:1075F00000A420043C05080024A55E20148000059A
61852+:107600002529FFFF24C6000410C50011000000005A
61853+:10761000240400018CCF00000004C0270004204097
61854+:1076200001F868241520FFF5ACCD00008F99007893
61855+:1076300001001021032B482303E00008AF890078E4
61856+:107640003C05080024A55DA40A000A9B0000402117
61857+:107650003C06080024C65DA40A000AB42404000104
61858+:10766000308800FF240200021102000A24030003F4
61859+:107670001103005C8F8900A4240400041104005F3E
61860+:1076800024050005110500670000182103E000082B
61861+:10769000006010218F8900483C0C0800258C5EE0BA
61862+:1076A0003C04080024845F60240300201060000F65
61863+:1076B00000005821240D0002240E00033C0F080096
61864+:1076C00025EF5EE08D27000014E0000B30F9FFFF8E
61865+:1076D000252900040124C02B53000001018048210A
61866+:1076E0002463FFFF5460FFF88D270000016018211C
61867+:1076F00003E0000800601021132000323C0500FF69
61868+:1077000030E200FF004030211040004200005021D4
61869+:1077100024050001000020210005C84000A6C02467
61870+:1077200017000003332500FF14A0FFFB2484000191
61871+:10773000012CC023001828C000AA6021008C502111
61872+:107740003144001F240C0001008C18040003102792
61873+:1077500000E23024110D0041AD260000110E004C56
61874+:10776000000A1840110D00368F87006C510E00562C
61875+:107770008F8C0060240D0004110D005A8F8E008440
61876+:10778000240E0005150EFFDA01601821240B1430B9
61877+:1077900011400006000018218F8400A0246300011E
61878+:1077A000006A402B1500FFFD016458218F8A00807C
61879+:1077B000AF89008C016018212549FFFF0A000AEB00
61880+:1077C000AF89008000E52024000736021080FFD03A
61881+:1077D000240A001800075402314600FF0A000AF389
61882+:1077E000240A00103C0C0800258C5EA03C04080014
61883+:1077F00024845EE00A000ADA240300103C0C08002E
61884+:10780000258C5E203C04080024845EA00A000AD96E
61885+:107810008F89009000071A02306600FF0A000AF301
61886+:10782000240A00088F89008C3C0C0800258C5F60BE
61887+:107830003C04080024845F700A000ADA2403000470
61888+:10784000000A4080250B003024E6FFFF016018216C
61889+:10785000AF8900480A000AEBAF86006C000AC982B3
61890+:10786000001978803C07080024E75EA001E720218A
61891+:10787000000A18428C8F00003079001F032C380456
61892+:107880000007C02701F860240A000B08AC8C000038
61893+:10789000000331420006288000AF28213062001F1B
61894+:1078A0008CB8000024630001004CC804000321428E
61895+:1078B000001938270004108003073024004F2021CE
61896+:1078C0000A000B4CACA60000000A68C025AB0032D1
61897+:1078D000258AFFFF01601821AF8900A40A000AEB86
61898+:1078E000AF8A0060254B1030AF89009001601821ED
61899+:1078F00025C9FFFF0A000AEBAF8900843086000724
61900+:107900002CC2000610400014000000000006408059
61901+:107910003C030800246357BC010338218CE40000B9
61902+:1079200000800008000000002409000310A9000ED8
61903+:1079300000000000240A000510AA000B000000004F
61904+:10794000240B000110AB0008000000008F8C00A089
61905+:1079500010AC00050000000003E00008000010214A
61906+:107960000A000A7900A020210A000AC700C02021CD
61907+:1079700027BDFFE8308400FF240300021083000BC2
61908+:10798000AFBF0010240600031086003A240800044C
61909+:1079900010880068240E0005108E007F2CAF143074
61910+:1079A0008FBF001003E0000827BD00182CA2003094
61911+:1079B0001440FFFC8FBF001024A5FFD0000531C28A
61912+:1079C000000668803C07080024E75EE001A730213C
61913+:1079D0008CC900000005288230AC001F240B000178
61914+:1079E000018B50048F840048012A4025ACC8000058
61915+:1079F0008C83000050600001AF8600488F98006CB7
61916+:107A000030AE000124A6FFFF270F000115C00002C1
61917+:107A1000AF8F006C24A600010006414200082080C0
61918+:107A2000008718218C79000030C2001F2406000155
61919+:107A30000046F804033F382410E0FFDA8FBF00103F
61920+:107A40000005C182001870803C0F080025EF5EA081
61921+:107A500001CF48218D2B00000005684231A5001F91
61922+:107A600000A66004016C502527BD001803E0000843
61923+:107A7000AD2A00002CA7003014E0FFCA8FBF001011
61924+:107A800030B900071723FFC724A8FFCE00086A02F9
61925+:107A9000000D60803C0B0800256B5EA0018B30213F
61926+:107AA0008CC40000000828C230AA001F240800016E
61927+:107AB000014848048F8200A400891825ACC3000047
61928+:107AC0008C5F000053E00001AF8600A40005704009
61929+:107AD000000E7942000F28803C04080024845EE0F8
61930+:107AE00000A418218C6B000025DF000131CD001FA0
61931+:107AF000001F514201A86004016C4825000A108053
61932+:107B0000AC690000004428218CA600008F9800601A
61933+:107B100033F9001F8FBF00100328380400C77825F1
61934+:107B2000270E000127BD0018ACAF000003E00008DD
61935+:107B3000AF8E006024A5EFD02CB804001300FF998D
61936+:107B40008FBF001000053142000658803C0A080033
61937+:107B5000254A5E20016A30218CC4000030A3001F3A
61938+:107B600024090001006910048F9900900082F82513
61939+:107B7000ACDF00008F27000050E00001AF860090CE
61940+:107B80008F8D00848FBF001027BD001825AC000129
61941+:107B900003E00008AF8C008415E0FF828FBF001067
61942+:107BA0008F8600A0000610400046F821001F21002B
61943+:107BB00003E4C8210019384024F8143000B8402BE1
61944+:107BC0001100FF788FBF001024A4EBD00E00021329
61945+:107BD00000C0282100027942000F70803C0D08008F
61946+:107BE00025AD5F6001CD20218C8B0000304C001F43
61947+:107BF00024060001018618048F89008C016350253A
61948+:107C0000AC8A00008D25000050A00001AF84008CDC
61949+:107C10008F9800808FBF001027BD00182708000133
61950+:107C200003E00008AF88008030A5000724030003AC
61951+:107C300010A3001028A2000414400008240700022A
61952+:107C40002403000410A300152408000510A8000F49
61953+:107C50008F8500A003E000080000000014A7FFFDCE
61954+:107C60000080282114C3FFFB240400020A000B8BB0
61955+:107C700000000000240900050080282110C9FFFB36
61956+:107C80002404000303E000080000000014C5FFF115
61957+:107C9000008028210A000B8B24040005240A00011F
61958+:107CA0000080282110CAFFF12404000403E000082A
61959+:107CB0000000000027BDFFE0AFB00010000581C24A
61960+:107CC0002603FFD024C5003F2C6223D024C6007FAA
61961+:107CD000AFB20018AFB10014AFBF001C309100FF6D
61962+:107CE000000691C2000529820200202110400008F0
61963+:107CF0002403FFFF0E000A4B0000000002002021B9
61964+:107D0000022028210E000C390240302100001821E9
61965+:107D10008FBF001C8FB200188FB100148FB00010FD
61966+:107D20000060102103E0000827BD002027BDFFD818
61967+:107D300024A2007FAFB3001CAFB20018000299C2AA
61968+:107D4000309200FF24A3003F02402021026028213E
61969+:107D5000AFB10014AFB00010AFBF00200E000B6E2B
61970+:107D60000003898200408021004020210220282138
61971+:107D700014400009000018218FBF00208FB3001CA1
61972+:107D80008FB200188FB100148FB000100060102166
61973+:107D900003E0000827BD00280E0009FC00000000D9
61974+:107DA00000402821020020211051FFF3001019C0CB
61975+:107DB0000E000A4B00000000020020210240282192
61976+:107DC0000E000C39026030218FBF00208FB3001CE1
61977+:107DD0008FB200188FB100148FB00010000018216E
61978+:107DE0000060102103E0000827BD00283084FFFF59
61979+:107DF00030A5FFFF1080000700001821308200012D
61980+:107E00001040000200042042006518211480FFFB8E
61981+:107E10000005284003E000080060102110C00007A2
61982+:107E2000000000008CA2000024C6FFFF24A500046F
61983+:107E3000AC82000014C0FFFB2484000403E00008AF
61984+:107E40000000000010A0000824A3FFFFAC86000083
61985+:107E500000000000000000002402FFFF2463FFFF79
61986+:107E60001462FFFA2484000403E00008000000000C
61987+:107E700030A5FFFF8F4201B80440FFFE3C076015AC
61988+:107E800000A730253C031000AF440180AF400184BF
61989+:107E9000AF46018803E00008AF4301B88F8500D0EA
61990+:107EA0002C864000008018218CA700840087102BAE
61991+:107EB00014400010000000008CA800842D06400033
61992+:107EC00050C0000F240340008CAA0084008A482B75
61993+:107ED000512000018CA3008400035A42000B208033
61994+:107EE0003C05080024A558200085182103E000085F
61995+:107EF0008C62000014C0FFF4000000002403400066
61996+:107F000000035A42000B20803C05080024A558209D
61997+:107F10000085182103E000088C6200008F8300D0E8
61998+:107F2000906600D024C50001A06500D08F8500D0E8
61999+:107F3000906400D090A200D210440017000000000E
62000+:107F4000936C00788F8B00BC318A00FFA16A000C13
62001+:107F500025490001938700C4312200FF3048007F8B
62002+:107F60001107000B00026827A36200788F4E01788A
62003+:107F700005C0FFFE8F9900B0241800023C0F1000CE
62004+:107F8000AF590140A358014403E00008AF4F017806
62005+:107F90000A000D0931A20080A0A000D00A000CFF49
62006+:107FA000000000008F8700D027BDFFC8AFBF0030A2
62007+:107FB000AFB7002CAFB60028AFB50024AFB4002097
62008+:107FC000AFB3001CAFB20018AFB10014AFB00010D7
62009+:107FD00094E300E094E200E2104300D72405FFFFA1
62010+:107FE0003C047FFF3497FFFF2415FF800A000DF04B
62011+:107FF0003C16000E108A00D18FBF00308F9100B068
62012+:108000003C1808008F18005C001230C0001291402C
62013+:108010000311702101D57824AF4F002C94EC00E2BD
62014+:1080200031CD007F01BA5821318A7FFF0176482186
62015+:10803000000A804002091021945300003C08080007
62016+:108040008D0800580246C02132733FFF001319808B
62017+:10805000010320210224282130BF007F03FAC82118
62018+:1080600000B5A024AF54002C0336A0218E87001049
62019+:108070008E8F003003785821256D008800EF702323
62020+:10808000240C0002AE8E0010AF8D00ACA16C0088F5
62021+:10809000976A003C8E8400308F9100AC0E000CD6A5
62022+:1080A0003150FFFF00024B80020940253C02420094
62023+:1080B00001022025AE2400048E8300048F8D00ACC5
62024+:1080C0008E860000240E0008ADA3001CADA600188B
62025+:1080D000ADA0000CADA00010929F000A33F900FF84
62026+:1080E000A5B90014968500083C1F000CA5A5001634
62027+:1080F0009298000A331100FFA5B100209690000865
62028+:1081000024180005A5B00022ADA00024928F000B1A
62029+:108110002410C00031E700FFA5A70002A1AE0001B6
62030+:108120008E8C00308F8B00AC8F8400B0AD6C00085B
62031+:108130003C0A08008D4A005401444821013540247E
62032+:10814000AF4800283C0208008C4200540044302113
62033+:1081500030C3007F007AC821033F282102458821CF
62034+:10816000AF9100BCAF8500C0A23800008F8A00BC70
62035+:108170002403FFBF2418FFDF954F000201F03824CD
62036+:1081800000F37025A54E0002914D000231AC003F76
62037+:10819000358B0040A14B00028F8600BC8F8900D038
62038+:1081A000ACC000048D28007C3C098000ACC80008ED
62039+:1081B00090C4000D3082007FA0C2000D8F8500BCEE
62040+:1081C00090BF000D03E3C824A0B9000D8F9100BC3F
62041+:1081D0009233000D02789024A232000D8E9000346C
62042+:1081E0008F8B00BCAD7000108E87002C8E8F0030FE
62043+:1081F00000EF7023AD6E0014916D001831AC007F5C
62044+:10820000A16C00188F9F00BC8E8A00308FE8001888
62045+:10821000015720240109302400C41025AFE20018C2
62046+:108220009283000AA3E3001C969900088F8500BC86
62047+:108230008F9800D0A4B9001E8E9000308E8400303C
62048+:108240000E0002138F0500848F8500D0000291403C
62049+:108250000002990090AF00BC0253882100403021F9
62050+:1082600031E7000210E0000302118021000290803B
62051+:108270000212802190B900BC3327000410E00002F4
62052+:108280000006F880021F80218E9800308F8B00BC82
62053+:1082900024068000330F0003000F702331CD00034C
62054+:1082A000020D6021AD6C000494A400E294AA00E2E7
62055+:1082B00094B000E231497FFF2522000130537FFF57
62056+:1082C0000206182400734025A4A800E294A400E24A
62057+:1082D0003C1408008E94006030917FFF123400221D
62058+:1082E000000000000E000CF6000000008F8700D098
62059+:1082F0000000282194F300E094F000E21213000F34
62060+:108300008FBF003090E900D090E800D1313200FFFB
62061+:10831000310400FF0244302B14C0FF36264A00010E
62062+:1083200090EE00D2264B000131CD00FF008D602180
62063+:10833000158BFF338F9100B08FBF00308FB7002CAB
62064+:108340008FB600288FB500248FB400208FB3001C97
62065+:108350008FB200188FB100148FB0001000A0102150
62066+:1083600003E0000827BD003894A300E20066402423
62067+:10837000A4A800E290A400E290B900E2309100FFCE
62068+:108380000011A1C20014F827001F39C03332007F4A
62069+:10839000024730250A000DE8A0A600E23084FFFF66
62070+:1083A00030A5FFFFAF440018AF45001C03E00008F4
62071+:1083B0008F42001427BDFFB8AFB000208F9000D0CF
62072+:1083C0003084FFFFAFA40010AFBF0044AFBE004039
62073+:1083D000AFB7003CAFB60038AFB50034AFB4003033
62074+:1083E000AFB3002CAFB20028AFB10024A7A0001893
62075+:1083F000920600D1920500D030C400FF30A300FFE8
62076+:108400000064102B10400122AFA00014920900D08C
62077+:108410008FB50010312800FF0088382324F4FFFFB7
62078+:108420000014882B0015982B02339024524001260B
62079+:108430008FB40014961E0012961F00108FB7001004
62080+:1084400003DFC823001714000019C400000224032E
62081+:108450000018140302E2B02A52C00001004020219B
62082+:108460000284282B10A0000200801821028018210D
62083+:1084700000033C0000071C033064FFFF2C8600094A
62084+:1084800014C000020060B821241700088E0A0008FA
62085+:10849000001769808E09000C31ABFFFF3C0C001007
62086+:1084A000016C402527520400AF4A0038AF9200B853
62087+:1084B000AF49003CAF480030000000000000000061
62088+:1084C00000000000000000000000000000000000AC
62089+:1084D00000000000000000008F4F000031EE00207F
62090+:1084E00011C0FFFD0017982A027110240A000E83A4
62091+:1084F0000000B02155E001019258000131130080C5
62092+:10850000126001CF012020219655001232A5FFFFF5
62093+:108510000E000CCBA7B500188F9000D00291A023BD
62094+:1085200026CD00018F9100B8000DB4000016B403F1
62095+:108530002638004002D7582A0014882B2405000151
62096+:108540000300902101711024AF9800B8AFA500146A
62097+:10855000104001BC8F8900B03C0C08008D8C005489
62098+:10856000240BFF80921E00D001895021014B28244A
62099+:10857000921900D0AF4500288E4700103C08080033
62100+:108580008D0800583C1808008F18005430E33FFF56
62101+:108590000003218001043021012658212402FF809C
62102+:1085A0000162F824920C00D0AF5F002C92480000CA
62103+:1085B00033D100FF333500FF0309982100117140CA
62104+:1085C000001578C0326D007F01CF382101BA282113
62105+:1085D000318300FF3164007F3C0A000C00AA88212F
62106+:1085E0000367F02100033140009A10213108003F59
62107+:1085F0003C1F000E00D1C021005F982127D90088C0
62108+:108600002D150008AF9100C0AF9900ACAF9800BC29
62109+:10861000AF9300B412A0018A00008821240E00014B
62110+:10862000010E4004310D005D11A0FFB2310F0002B8
62111+:108630008E4A00283C0300803C04FFEFAE6A000035
62112+:108640008E450024A260000A3488FFFFAE65000456
62113+:108650009247002C3C1FFF9F37FEFFFFA267000CD4
62114+:108660008E62000C3C180040A267000B00433025CE
62115+:1086700000C8C824033E88240238A825AE75000C23
62116+:108680008E490004AE6000183C0F00FFAE69001474
62117+:108690008E4D002C35EEFFFF8F8B00B001AE6024B5
62118+:1086A000AE6C00108E470008A660000896450012C8
62119+:1086B000AE6700208E42000C30B03FFF00105180AA
62120+:1086C000AE6200248E5E0014014B182130A400011C
62121+:1086D000AE7E00288E590018000331C2000443808A
62122+:1086E000AE79002C8E51001C00C8F821A67F001C1A
62123+:1086F000AE710030965800028E550020A678001EFC
62124+:10870000AE75003492490033313000045600000544
62125+:10871000925000008F8C00D08D8B007CAE6B0030AF
62126+:10872000925000008F8F00BCA1F00000924E0033E9
62127+:1087300031CD000251A00007925E00018F8900BC7C
62128+:108740002418FF80913100000311A825A1350000F5
62129+:10875000925E00018F9900BC2409FFBF240BFFDF4C
62130+:10876000A33E00018F9500BC92B8000D3311007F2D
62131+:10877000A2B1000D8F8E00BC91D0000D02097824AB
62132+:10878000A1CF000D8F8800BC8E6D0014910A000DE2
62133+:108790002DAC0001000C2940014B382400E51825C0
62134+:1087A000A103000D964200128F8800BC8F8700D075
62135+:1087B000A50200028E45000490FF00BC30A4000317
62136+:1087C0000004302330DE000300BE102133F9000224
62137+:1087D00017200002244400342444003090E200BCFE
62138+:1087E00000A2302430DF000417E0000224830004DC
62139+:1087F000008018218F8F00AC24090002AD03000413
62140+:10880000A1E90000924E003F8F8D00ACA1AE0001A7
62141+:108810008F9500AC924C003F8E440004A6AC000241
62142+:10882000976B003C0E000CD63170FFFF00025380A6
62143+:10883000020A38253C05420000E51825AEA30004D5
62144+:108840008F8600AC8E480038ACC800188E440034C7
62145+:10885000ACC4001CACC0000CACC00010A4C0001420
62146+:10886000A4C00016A4C00020A4C00022ACC00024F4
62147+:108870008E6400145080000124040001ACC4000880
62148+:108880000E000CF6241100010A000E768F9000D025
62149+:10889000920F00D2920E00D08FB5001031EB00FF86
62150+:1088A00031CD00FF008D6023016C50212554FFFF66
62151+:1088B0000014882B0015982B023390241640FEDDFF
62152+:1088C000000000008FB400148FBF00448FBE004032
62153+:1088D0003A8200018FB7003C8FB600388FB5003464
62154+:1088E0008FB400308FB3002C8FB200288FB10024DA
62155+:1088F0008FB0002003E0000827BD0048331100209E
62156+:10890000122000EF24150001921E00BC241F00015C
62157+:108910000000A82133D900011320000DAFBF001CB7
62158+:108920008E4400148E0800840088102B144000022E
62159+:10893000008030218E0600848E03006400C3A82BC3
62160+:1089400016A0000200C020218E0400640080A8212F
62161+:108950008E4700148E05006400E5302B14C0000221
62162+:1089600000E020218E0400640095F02313C0000471
62163+:108970008FAC001C240A0002AFAA001C8FAC001CA4
62164+:10898000028C582B156000A8000018218E4F00386B
62165+:108990008E6D000C3C0E0080AE6F00008E4A0034DD
62166+:1089A0003C10FF9F01AE5825AE6A00049246003F7E
62167+:1089B000360CFFFF016C38243C0500203C03FFEF20
62168+:1089C000A266000B00E510253468FFFF8F8700B812
62169+:1089D0000048F8243C04000803E4C825AE79000CE4
62170+:1089E0008CF80014AE60001802BE7821AE78001436
62171+:1089F0008CF10018AE71001C8CE90008AE690024EF
62172+:108A00008CEE000CAE6F002CAE600028AE6E002025
62173+:108A1000A6600038A660003A8CED001401B58023F2
62174+:108A2000021E902312400011AE72001090EA003D29
62175+:108A30008E6500048E640000000A310000A6C82183
62176+:108A4000000010210326402B0082F82103E8C021FA
62177+:108A5000AE790004AE78000090F1003DA271000AEA
62178+:108A60008F8900B895320006A67200088F9800AC76
62179+:108A70002419000202A02021A31900009769003CDC
62180+:108A80008F9200AC0E000CD63131FFFF00027B80CC
62181+:108A90008F8500B8022F68253C0E420001AE80256C
62182+:108AA000AE5000048F8400AC8CAC0038AC8C001845
62183+:108AB0008CAB0034AC8B001CAC80000CAC80001084
62184+:108AC000A4800014A4800016A4800020A4800022AA
62185+:108AD000AC80002490A7003FA487000212A00135BB
62186+:108AE0002403000153C0000290A2003D90A2003E6A
62187+:108AF00024480001A08800018F9F00ACAFF500085A
62188+:108B00008F8300D024070034906600BC30C500027B
62189+:108B100050A00001240700308F9200B88F8A00BC5B
62190+:108B2000906D00BC924B00002412C00032A50003DF
62191+:108B3000A14B00008F8600B88F8800BC240200047F
62192+:108B400090C400010045182330790003A1040001FE
62193+:108B50008F8A00BC8F9F00B800F53821955800021D
62194+:108B600097E9001200F9382103128824312F3FFFC2
62195+:108B7000022F7025A54E00029150000231A800047A
62196+:108B8000320C003F358B0040A14B000212A00002C6
62197+:108B90008F8500BC00E838218F8E00D0ACA7000480
62198+:108BA000240BFFBF8DCD007C2EA400012403FFDF2A
62199+:108BB000ACAD000890B0000D00044140320C007FC5
62200+:108BC000A0AC000D8F8600BC90CA000D014B102494
62201+:108BD000A0C2000D8F8700BC90E5000D00A3F82413
62202+:108BE00003E8C825A0F9000D8F9100B88F8D00BC57
62203+:108BF0008E380020ADB800108E290024ADA90014D5
62204+:108C00008E2F0028ADAF00188E2E002C0E000CF613
62205+:108C1000ADAE001C8FB0001C240C0002120C00EE44
62206+:108C20008F9000D08FA3001C006088211460000288
62207+:108C30000060A8210000A02156A0FE390291A023C7
62208+:108C40000014882B8FA90010960700103C1E0020EE
62209+:108C50000136402302C750213112FFFFA60A00103F
62210+:108C6000AFB20010AF5E0030000000009617001099
62211+:108C7000961300121277008F000000008E05000C82
62212+:108C80008E0B00080016698000AD7021000DC7C36F
62213+:108C900001CDA82B0178782101F56021AE0E000CE2
62214+:108CA000AE0C00088FB300100013B82B02378024DD
62215+:108CB0001200FF048F9000D00A000E3C000000005C
62216+:108CC0008E4D0038A6600008240B0003AE6D000036
62217+:108CD0008E500034A260000A8F9800B8AE70000475
62218+:108CE0003C0500809311003FA26B000C8E6F000CBE
62219+:108CF0003C0EFF9FA271000B01E5102535CCFFFF54
62220+:108D00003C03FFEF8F9200B8004C30243464FFFF27
62221+:108D100000C4F824AE7F000C8E590014964800124F
62222+:108D20008F8A00B0AE7900108E490014AE60001832
62223+:108D3000AE600020AE690014AE6000248E470018BB
62224+:108D400031093FFF0009F180AE6700288E4D000811
62225+:108D500003CA802131180001AE6D00308E4F000C27
62226+:108D60008F8C00AC001089C200185B80022B282178
62227+:108D7000240E0002A665001CA6600036AE6F002C13
62228+:108D8000A18E00009763003C8F8A00AC3C04420037
62229+:108D90003062FFFF00443025AD4600048F9F00B8CD
62230+:108DA000240700012411C0008FF30038240600348A
62231+:108DB000AD5300188FF90034AD59001CAD40000CC4
62232+:108DC000AD400010A5400014A5400016A5400020AD
62233+:108DD000A5400022AD400024A5550002A147000196
62234+:108DE0008F9E00AC8F8800B88F9200BCAFD5000872
62235+:108DF000910D0000A24D00008F9000B88F8B00BC39
62236+:108E000092180001A17800018F8400BC94850002B3
62237+:108E100000B1782401E97025A48E0002908C000234
62238+:108E20003183003FA08300028F8300D08F8400BC79
62239+:108E3000906200BC305300025260000124060030F2
62240+:108E4000AC8600048C6F007C2403FFBF02A0882145
62241+:108E5000AC8F0008908E000D31CC007FA08C000DEF
62242+:108E60008F8600BC90C2000D00432024A0C4000DDA
62243+:108E70008F8900BC913F000D37F90020A139000D0A
62244+:108E80008F8800B88F9300BC8D070020AE6700105C
62245+:108E90008D0A0024AE6A00148D1E0028AE7E0018D4
62246+:108EA0008D12002C0E000CF6AE72001C0A00103D54
62247+:108EB0008F9000D0960E00148E03000431CCFFFF7B
62248+:108EC000000C10C000622021AF44003C8E1F000443
62249+:108ED0008F46003C03E6C8231B20003C0000000036
62250+:108EE0008E0F000025E200013C05001034B500089B
62251+:108EF000AF420038AF550030000000000000000015
62252+:108F00000000000000000000000000000000000061
62253+:108F100000000000000000008F580000330B00200C
62254+:108F20001160FFFD000000008F5304003C0D002085
62255+:108F3000AE1300088F570404AE17000CAF4D00307D
62256+:108F4000000000003C0608008CC600442416000106
62257+:108F500010D600BD00000000961F00123C0508005E
62258+:108F60008CA5004000BFC821A61900129609001464
62259+:108F700025270001A6070014960A00143144FFFFBC
62260+:108F80005486FF498FB30010A60000140E000E1681
62261+:108F900030A5FFFF3C0408008C84002496030012D7
62262+:108FA0000044102300623023A60600120A00105964
62263+:108FB0008FB30010A08300018F8200AC2404000155
62264+:108FC000AC4400080A000FF08F8300D08E0200002E
62265+:108FD0000A0010EA3C0500108F8200C08FA7001C19
62266+:108FE000921800D0920B00D0920E00D0331100FFE7
62267+:108FF000316900FF00117940000928C001E56021B6
62268+:1090000031C300FF036C50210003314000C2C8216E
62269+:10901000255F0088AF9F00ACAF9900BCA1470088D6
62270+:109020009768003C03C020218F9100AC0E000CD645
62271+:109030003110FFFF00026B80020DC0253C0442008E
62272+:109040008F8D00B803045825AE2B00048DA900387D
62273+:109050008F8B00AC0000882100118100AD690018E1
62274+:109060008DAF00343C087FFF3504FFFFAD6F001C5F
62275+:1090700091AC003E8D65001C8D660018000C190037
62276+:10908000000C770200A33821020E102500E3F82B14
62277+:1090900000C2C821033F5021AD67001CAD6A001813
62278+:1090A000AD60000CAD60001091B8003E24050005D5
62279+:1090B00003C45024A578001495A9000403C02021FE
62280+:1090C000A569001691AF003EA56F002095B1000480
62281+:1090D000A5710022AD60002491AE003FA56E000294
62282+:1090E00091B0003E91AC003D01901023244300015B
62283+:1090F000A16300018F8600AC8F9F00BCACDE00082E
62284+:10910000A3E500008F9000BC8F9900B82405FFBF35
62285+:1091100096070002973800120247782433093FFF70
62286+:1091200001E98825A6110002921200022418FFDF2F
62287+:10913000324E003F35CD0040A20D00028F8600BCAC
62288+:109140008F8C00D02412FFFFACC000048D8B007CFC
62289+:109150003C0C8000ACCB000890C2000D3043007F77
62290+:10916000A0C3000D8F8700BC90FF000D03E5C8244D
62291+:10917000A0F9000D8F9100BC9229000D01387824D0
62292+:10918000A22F000D8F9000BCAE120010AE1500147F
62293+:10919000920E00182415FF8002AE6825A20D00185B
62294+:1091A0008F8500BC8F8300B88CAB0018016C102435
62295+:1091B000004A3025ACA600189068003EA0A8001C0C
62296+:1091C0008F9F00B88F8700BC8F9800D097F900045C
62297+:1091D000A4F9001E0E0002138F0500848F8600D0B4
62298+:1091E000000279400002490090D200BC01E98821C8
62299+:1091F000004028213255000212A0000303D1202193
62300+:109200000002A8800095202190CD00BC31B200045E
62301+:109210001240000333DF0003000540800088202156
62302+:10922000240600048F9E00BC00DFC8233327000300
62303+:1092300000875021AFCA00040E000CF6A665003866
62304+:109240000A0010388F9000D0961E00123C080800CB
62305+:109250008D080024011E9021A61200120A00105948
62306+:109260008FB3001027BDFFE03C1808008F18005096
62307+:10927000AFB00010AFBF0018AFB10014AF8400B0A2
62308+:1092800093710074030478212410FF8031EE007F75
62309+:109290003225007F01F0582401DA68213C0C000AD5
62310+:1092A000A38500C401AC2821AF4B002494A9001071
62311+:1092B0009768000690A600620080382124020030E2
62312+:1092C0000109202330C300F0AF8500D010620019DF
62313+:1092D0003090FFFF90AE0062240DFFF0240A005092
62314+:1092E00001AE6024318B00FF116A002F00000000E6
62315+:1092F00016000007241F0C00AF5F00248FB100147C
62316+:109300008FBF00188FB0001003E0000827BD0020B9
62317+:109310000E000E1C02002021241F0C00AF5F002451
62318+:109320008FB100148FBF00188FB0001003E0000849
62319+:1093300027BD002094A200E094A400E290BF011396
62320+:10934000008218263079FFFF33E700C014E00009DF
62321+:109350002F31000116000038000000005620FFE603
62322+:10936000241F0C000E000D18000000000A0011ED73
62323+:10937000241F0C001620FFDE000000000E000D1858
62324+:10938000000000001440FFDC241F0C001600002227
62325+:109390008F8300D0906901133122003FA062011336
62326+:1093A0000A0011ED241F0C0094AF00D48F8600D466
62327+:1093B00000E02821240400050E000C5C31F0FFFFC2
62328+:1093C0001440000524030003979100E600001821D3
62329+:1093D0002625FFFFA78500E68F5801B80700FFFE8E
62330+:1093E0003C196013AF400180241F0C00AF50018472
62331+:1093F000007938253C101000AF4701888FB1001468
62332+:10940000AF5001B8AF5F00248FB000108FBF0018BD
62333+:1094100003E0000827BD00200E000E1C02002021E2
62334+:109420005040FFB5241F0C008F8300D090690113BA
62335+:109430000A0012163122003F0E000E1C02002021ED
62336+:109440001440FFAD241F0C00122000078F8300D0B2
62337+:10945000906801133106003F34C20040A06201133E
62338+:109460000A0011ED241F0C000E000D180000000072
62339+:109470005040FFA1241F0C008F8300D0906801137F
62340+:109480003106003F0A00124634C20040AF9B00C8BC
62341+:1094900003E00008AF8000EC3089FFFF0009404284
62342+:1094A0002D020041000921801440000200095040B3
62343+:1094B00024080040000830C0000811400046582130
62344+:1094C000256701A800E2C821272F007F2418FF800C
62345+:1094D00001F818240064302100CA702125CC00FF57
62346+:1094E000240DFF00018D202425650088240A0088B2
62347+:1094F0003C010800AC2A004C3C010800AC2500509F
62348+:10950000AF8400D43C010800AC2900603C01080095
62349+:10951000AC2800643C010800AC2700543C01080062
62350+:10952000AC2300583C010800AC26005C03E00008B6
62351+:1095300000000000308300FF30C6FFFF30E400FF72
62352+:109540008F4201B80440FFFE00034C00012438257F
62353+:109550003C08600000E820253C031000AF45018076
62354+:10956000AF460184AF44018803E00008AF4301B86F
62355+:109570008F86001C3C096012352700108CCB00043C
62356+:109580003C0C600E35850010316A00062D48000144
62357+:10959000ACE800C48CC40004ACA431808CC20008C8
62358+:1095A00094C30002ACA2318403E00008A78300E466
62359+:1095B0003C0308008C6300508F8400E88F86001CF9
62360+:1095C0002402FF800064C0210302C824AF59002890
62361+:1095D0008CCD00043305007F00BA78213C0E000CCE
62362+:1095E00001EE2821ACAD00588CC80008AF8500D032
62363+:1095F0003C076012ACA8005C8CCC001034E8001072
62364+:10960000ACAC000C8CCB000CACAB000894AA0014E2
62365+:109610003C0208008C42004425490001A4A9001422
62366+:1096200094A400143083FFFF106200178F8400D0D1
62367+:109630003C0A08008D4A0040A4AA00128CCE0018F3
62368+:10964000AC8E00248CCD0014AC8D00208CC700188B
62369+:10965000AC87002C8CCC001424060001AC8C0028B4
62370+:109660008D0B00BC5166001A8D0200B48D0200B84B
62371+:10967000A482003A948F003AA48F003C948800D4CE
62372+:1096800003E000083102FFFF3C0908008D29002497
62373+:10969000A4A000148F8400D0A4A900128CCE0018BE
62374+:1096A000AC8E00248CCD0014AC8D00208CC700182B
62375+:1096B000AC87002C8CCC001424060001AC8C002854
62376+:1096C0008D0B00BC5566FFEA8D0200B88D0200B418
62377+:1096D000A482003A948F003AA48F003C948800D46E
62378+:1096E00003E000083102FFFF8F86001C3C0C0800DD
62379+:1096F0008D8C0050240BFF808CCD00083C03000CA7
62380+:10970000000D51C0018A4021010B4824AF8A00E8B6
62381+:10971000AF49002890C700073105007F00BA10212B
62382+:109720000043282130E4000410800039AF8500D0C8
62383+:1097300090CF000731EE000811C000380000000093
62384+:109740008CD9000C8CC400140324C02B13000030EF
62385+:10975000000000008CC2000CACA200648CCD00188C
62386+:109760002402FFF8ACAD00688CCC0010ACAC0080DB
62387+:109770008CCB000CACAB00848CCA001CACAA007C67
62388+:1097800090A900BC01224024A0A800BC90C30007FF
62389+:109790003067000810E000048F8500D090AF00BC57
62390+:1097A00035EE0001A0AE00BC90D9000733380001AF
62391+:1097B000130000088F8300D08F8700D0240400346A
62392+:1097C00090E800BC35030002A0E300BC8F8300D00A
62393+:1097D000AC6400C090C900073126000210C000052B
62394+:1097E00000000000906A00BC35420004A06200BC8A
62395+:1097F0008F8300D09065011330AD003FA06D011341
62396+:109800008F8C00D0958B00D403E000083162FFFFFD
62397+:109810008CC200140A001305000000000A001306A1
62398+:10982000ACA0006427BDFFD8AFB000108F90001C23
62399+:10983000AFBF0024AFB40020AFB20018AFB1001426
62400+:10984000AFB3001C9613000E3C07600A3C14600680
62401+:109850003264FFFF369300100E00125534F40410EA
62402+:109860008F8400D43C11600E0E00099B363100102D
62403+:10987000920E00153C0708008CE700603C12601255
62404+:1098800031CD000FA38D00F08E0E00048E0D000868
62405+:1098900096080012961F00109619001A9618001EBE
62406+:1098A000960F001C310CFFFF33EBFFFF332AFFFF45
62407+:1098B0003309FFFF31E6FFFF3C010800AC2B0040FD
62408+:1098C0003C010800AC2C00243C010800AC2A0044F8
62409+:1098D000AE293178AE26317C92020015960300162F
62410+:1098E00036520010304400FF3065FFFF3C06080090
62411+:1098F0008CC60064AE243188AE4500B492080014D2
62412+:1099000096190018241F0001011FC004332FFFFF08
62413+:109910003C0508008CA50058AE5800B8AE4F00BCFE
62414+:10992000920C0014AF8E00D8AF8D00DC318B00FF9D
62415+:10993000AE4B00C0920A0015AE670048AE66004C00
62416+:10994000314900FFAE4900C8AE65007C3C03080009
62417+:109950008C6300503C0408008C84004C3C080800D8
62418+:109960008D0800543C0208008C42005C8FBF00242C
62419+:10997000AE6300808FB00010AE8300748FB3001C04
62420+:10998000AE22319CAE4200DCAE2731A0AE2631A41F
62421+:10999000AE24318CAE233190AE283194AE2531986F
62422+:1099A000AE870050AE860054AE8500708FB10014B3
62423+:1099B000AE4700E0AE4600E4AE4400CCAE4300D07B
62424+:1099C000AE4800D4AE4500D88FB400208FB2001846
62425+:1099D00003E0000827BD002827BDFFE0AFB1001459
62426+:1099E000AFBF0018241100010E000845AFB00010F1
62427+:1099F00010510005978400E6978300CC0083102B5C
62428+:109A0000144000088F8500D4240700028FBF00187F
62429+:109A10008FB100148FB0001000E0102103E00008A7
62430+:109A200027BD00200E000C7A24040005AF8200E858
62431+:109A30001040FFF6240700020E0008498F90001C1A
62432+:109A4000979F00E68F9900E88F8D00C827EF0001EF
62433+:109A5000240E0050AF590020A78F00E6A1AE0000F1
62434+:109A60003C0C08008D8C00648F8600C8240A80009E
62435+:109A7000000C5E00ACCB0074A4C0000694C9000AC0
62436+:109A8000241FFF803C0D000C012AC024A4D8000A2A
62437+:109A900090C8000A24182000011F1825A0C3000A3E
62438+:109AA0008F8700C8A0E000788F8500C800003821AB
62439+:109AB000A0A000833C0208008C4200508F8400E884
62440+:109AC0000044782101FFC824AF590028960B0002FA
62441+:109AD00031EE007F01DA6021018D3021A4CB00D46A
62442+:109AE000960A0002AF8600D03C0E000425492401EE
62443+:109AF000A4C900E68E080004ACC800048E03000868
62444+:109B0000ACC30000A4C00010A4C00014A0C000D0CA
62445+:109B10008F8500D02403FFBFA0A000D13C04080023
62446+:109B20008C8400648F8200D0A04400D28E1F000C71
62447+:109B30008F8A00D0978F00E4AD5F001C8E19001053
62448+:109B400024100030AD590018A5400030A551005434
62449+:109B5000A5510056A54F0016AD4E0068AD580080C7
62450+:109B6000AD580084914D006231AC000F358B001070
62451+:109B7000A14B00628F8600D090C900633128007F1E
62452+:109B8000A0C800638F8400D02406FFFF9085006387
62453+:109B900000A31024A08200638F9100D000E0102168
62454+:109BA000923F00BC37F90001A23900BC8F8A00D077
62455+:109BB000938F00F0AD580064AD5000C0914E00D3BB
62456+:109BC000000F690031CC000F018D5825A14B00D347
62457+:109BD0008F8500D08F8900DCACA900E88F8800D881
62458+:109BE0008FBF00188FB100148FB0001027BD002068
62459+:109BF000ACA800ECA4A600D6A4A000E0A4A000E2BB
62460+:109C000003E000080000000027BDFFE0AFB0001037
62461+:109C10008F90001CAFB10014AFBF00188E19000464
62462+:109C20003C1808008F180050240FFF80001989C0CD
62463+:109C30000238702131CD007F01CF602401BA50215C
62464+:109C40003C0B000CAF4C0028014B4021950900D47F
62465+:109C5000950400D68E0700043131FFFFAF8800D095
62466+:109C60000E000913000721C08E0600048F8300C870
62467+:109C7000000629C0AF4500209064003E30820040BD
62468+:109C8000144000068F8400D0341FFFFF948300D659
62469+:109C90003062FFFF145F000400000000948400D6CF
62470+:109CA0000E0008A83084FFFF8E050004022030213A
62471+:109CB0008FBF00188FB100148FB000102404002251
62472+:109CC00000003821000529C00A00127C27BD0020B1
62473+:109CD00027BDFFE0AFB100143091FFFFAFB000101F
62474+:109CE000AFBF00181220001D000080218F86001CCD
62475+:109CF0008CC500002403000600053F020005140285
62476+:109D000030E4000714830015304500FF2CA800063E
62477+:109D10001100004D000558803C0C0800258C57D4DC
62478+:109D2000016C50218D490000012000080000000056
62479+:109D30008F8E00EC240D000111CD005900000000B1
62480+:109D4000260B00013170FFFF24CA00200211202BD6
62481+:109D5000014030211480FFE6AF8A001C0200102170
62482+:109D60008FBF00188FB100148FB0001003E00008FF
62483+:109D700027BD0020938700CE14E00038240400148F
62484+:109D80000E001338000000008F86001C2402000122
62485+:109D90000A00147FAF8200EC8F8900EC24080002D7
62486+:109DA0001128003B2404001300002821000030216A
62487+:109DB000240700010E00127C000000000A00147F3E
62488+:109DC0008F86001C8F8700EC2405000214E5FFF647
62489+:109DD000240400120E0012E9000000008F8500E844
62490+:109DE00000403021240400120E00127C00003821B3
62491+:109DF0000A00147F8F86001C8F8300EC241F000351
62492+:109E0000147FFFD0260B00010E00129B0000000003
62493+:109E10008F8500E800403021240200022404001055
62494+:109E200000003821AF8200EC0E00127C0000000020
62495+:109E30000A00147F8F86001C8F8F00EC240600021E
62496+:109E400011E6000B0000000024040010000028218F
62497+:109E5000000030210A00149C240700010000282182
62498+:109E60000E00127C000030210A00147F8F86001C37
62499+:109E70000E0013A500000000144000128F99001C72
62500+:109E80008F86001C240200030A00147FAF8200ECBE
62501+:109E90000E001431000000000A00147F8F86001CA1
62502+:109EA0000E00128B000000002402000224040014A3
62503+:109EB0000000282100003021000038210A0014B9D8
62504+:109EC000AF8200EC004038212404001097380002D3
62505+:109ED000000028210E00127C3306FFFF0A00147FC9
62506+:109EE0008F86001C8F8400C83C077FFF34E6FFFF8D
62507+:109EF0008C8500742402000100A61824AC83007431
62508+:109F000003E00008A082000510A000362CA200800B
62509+:109F1000274A04003C0B000524090080104000077C
62510+:109F20002408008030A6000F00C540212D030081C9
62511+:109F30001460000200A0482124080080AF4B0030CC
62512+:109F400000000000000000000000000011000009F7
62513+:109F500000003821014030218C8D000024E70004EE
62514+:109F600000E8602BACCD0000248400041580FFFACB
62515+:109F700024C60004000000000000000000000000F3
62516+:109F80003C0E0006010E3825AF47003000000000EF
62517+:109F900000000000000000008F4F000031E80010BA
62518+:109FA0001100FFFD000000008F42003C8F43003C89
62519+:109FB0000049C8210323C02B130000040000000047
62520+:109FC0008F4C003825860001AF4600388F47003C93
62521+:109FD00000A9282300E96821AF4D003C14A0FFCE62
62522+:109FE0002CA2008003E000080000000027BDFFD085
62523+:109FF0003C020002AFB100143C11000CAF45003828
62524+:10A00000AFB3001CAF46003C00809821AF42003047
62525+:10A0100024050088AF44002803512021AFBF002849
62526+:10A02000AFB50024AFB40020AFB200180E0014F199
62527+:10A03000AFB000103C1F08008FFF004C3C18080018
62528+:10A040008F1800642410FF8003F3A82132B9007F29
62529+:10A0500002B078240018A0C0033A70210018914083
62530+:10A0600001D12021AF4F00280E0014F10254282105
62531+:10A070003C0D08008DAD00502405012001B358218E
62532+:10A08000316C007F01705024019A48210131202158
62533+:10A090000E0014F1AF4A00283C0808008D08005457
62534+:10A0A0003C0508008CA500640113382130E6007FD0
62535+:10A0B00000F0182400DA202100912021AF4300286D
62536+:10A0C0000E0014F1000529403C0208008C420058A3
62537+:10A0D0003C1008008E1000601200001C0053882104
62538+:10A0E0002415FF800A0015743C14000C3226007FF2
62539+:10A0F0000235182400DA202102402821AF4300282D
62540+:10A10000009420210E0014F12610FFC01200000F51
62541+:10A11000023288212E05004110A0FFF42412100005
62542+:10A120003226007F001091800235182400DA2021A9
62543+:10A1300002402821AF430028009420210E0014F192
62544+:10A14000000080211600FFF3023288213C0B08003A
62545+:10A150008D6B005C240AFF802405000201734021FE
62546+:10A16000010A4824AF4900283C0408009484006296
62547+:10A170003110007F021A88213C07000C0E000CAA47
62548+:10A180000227982100402821026020218FBF00284B
62549+:10A190008FB500248FB400208FB3001C8FB200183D
62550+:10A1A0008FB100148FB000100A0014F127BD0030E9
62551+:10A1B0008F83001C8C62000410400003000000002C
62552+:10A1C00003E00008000000008C6400108C650008AB
62553+:10A1D0000A00152A8C66000C000000000000001B1D
62554+:10A1E0000000000F0000000A000000080000000648
62555+:10A1F000000000050000000500000004000000044D
62556+:10A200000000000300000003000000030000000342
62557+:10A210000000000300000002000000020000000235
62558+:10A220000000000200000002000000020000000226
62559+:10A230000000000200000002000000020000000216
62560+:10A240000000000200000002000000020000000206
62561+:10A2500000000001000000010000000108000F24C0
62562+:10A2600008000D6C08000FB80800106008000F4CC3
62563+:10A2700008000F8C0800119408000D88080011B820
62564+:10A2800008000DD8080015540800151C08000D889A
62565+:10A2900008000D8808000D880800124008001240D0
62566+:10A2A00008000D8808000D88080014E008000D88DB
62567+:10A2B00008000D8808000D8808000D88080013B4F8
62568+:10A2C00008000D8808000D8808000D8808000D881A
62569+:10A2D00008000D8808000D8808000D8808000D880A
62570+:10A2E00008000D8808000D8808000D8808000D88FA
62571+:10A2F00008000D8808000D8808000FAC08000D88C4
62572+:10A3000008000D880800167808000D8808000D88E0
62573+:10A3100008000D8808000D8808000D8808000D88C9
62574+:10A3200008000D8808000D8808000D8808000D88B9
62575+:10A3300008000D8808000D8808000D8808000D88A9
62576+:10A3400008000D8808000D8808000D88080014100A
62577+:10A3500008000D8808000D8808001334080012A4B6
62578+:10A3600008001E2C08001EFC08001F1408001F28EF
62579+:10A3700008001F3808001E2C08001E2C08001E2C88
62580+:10A3800008001ED808002E1408002E1C08002DE41A
62581+:10A3900008002DF008002DFC08002E08080052F4DB
62582+:10A3A000080052B40800528008005254080052308D
62583+:10A3B000080051EC0A000C840000000000000000BE
62584+:10A3C0000000000D727870362E322E33000000002F
62585+:10A3D000060203030000000000000001000000006E
62586+:10A3E000000000000000000000000000000000006D
62587+:10A3F000000000000000000000000000000000005D
62588+:10A40000000000000000000000000000000000004C
62589+:10A41000000000000000000000000000000000003C
62590+:10A42000000000000000000000000000000000002C
62591+:10A43000000000000000000000000000000000001C
62592+:10A44000000000000000000000000000000000000C
62593+:10A4500000000000000000000000000000000000FC
62594+:10A4600000000000000000000000000000000000EC
62595+:10A4700000000000000000000000000000000000DC
62596+:10A4800000000000000000000000000000000000CC
62597+:10A4900000000000000000000000000000000000BC
62598+:10A4A00000000000000000000000000000000000AC
62599+:10A4B000000000000000000000000000000000009C
62600+:10A4C000000000000000000000000000000000008C
62601+:10A4D000000000000000000000000000000000007C
62602+:10A4E000000000000000000000000000000000006C
62603+:10A4F000000000000000000000000000000000005C
62604+:10A50000000000000000000000000000000000004B
62605+:10A51000000000000000000000000000000000003B
62606+:10A52000000000000000000000000000000000002B
62607+:10A53000000000000000000000000000000000001B
62608+:10A54000000000000000000000000000000000000B
62609+:10A5500000000000000000000000000000000000FB
62610+:10A5600000000000000000000000000000000000EB
62611+:10A5700000000000000000000000000000000000DB
62612+:10A5800000000000000000000000000000000000CB
62613+:10A5900000000000000000000000000000000000BB
62614+:10A5A00000000000000000000000000000000000AB
62615+:10A5B000000000000000000000000000000000009B
62616+:10A5C000000000000000000000000000000000008B
62617+:10A5D000000000000000000000000000000000007B
62618+:10A5E000000000000000000000000000000000006B
62619+:10A5F000000000000000000000000000000000005B
62620+:10A60000000000000000000000000000000000004A
62621+:10A61000000000000000000000000000000000003A
62622+:10A62000000000000000000000000000000000002A
62623+:10A63000000000000000000000000000000000001A
62624+:10A64000000000000000000000000000000000000A
62625+:10A6500000000000000000000000000000000000FA
62626+:10A6600000000000000000000000000000000000EA
62627+:10A6700000000000000000000000000000000000DA
62628+:10A6800000000000000000000000000000000000CA
62629+:10A6900000000000000000000000000000000000BA
62630+:10A6A00000000000000000000000000000000000AA
62631+:10A6B000000000000000000000000000000000009A
62632+:10A6C000000000000000000000000000000000008A
62633+:10A6D000000000000000000000000000000000007A
62634+:10A6E000000000000000000000000000000000006A
62635+:10A6F000000000000000000000000000000000005A
62636+:10A700000000000000000000000000000000000049
62637+:10A710000000000000000000000000000000000039
62638+:10A720000000000000000000000000000000000029
62639+:10A730000000000000000000000000000000000019
62640+:10A740000000000000000000000000000000000009
62641+:10A7500000000000000000000000000000000000F9
62642+:10A7600000000000000000000000000000000000E9
62643+:10A7700000000000000000000000000000000000D9
62644+:10A7800000000000000000000000000000000000C9
62645+:10A7900000000000000000000000000000000000B9
62646+:10A7A00000000000000000000000000000000000A9
62647+:10A7B0000000000000000000000000000000000099
62648+:10A7C0000000000000000000000000000000000089
62649+:10A7D0000000000000000000000000000000000079
62650+:10A7E0000000000000000000000000000000000069
62651+:10A7F0000000000000000000000000000000000059
62652+:10A800000000000000000000000000000000000048
62653+:10A810000000000000000000000000000000000038
62654+:10A820000000000000000000000000000000000028
62655+:10A830000000000000000000000000000000000018
62656+:10A840000000000000000000000000000000000008
62657+:10A8500000000000000000000000000000000000F8
62658+:10A8600000000000000000000000000000000000E8
62659+:10A8700000000000000000000000000000000000D8
62660+:10A8800000000000000000000000000000000000C8
62661+:10A8900000000000000000000000000000000000B8
62662+:10A8A00000000000000000000000000000000000A8
62663+:10A8B0000000000000000000000000000000000098
62664+:10A8C0000000000000000000000000000000000088
62665+:10A8D0000000000000000000000000000000000078
62666+:10A8E0000000000000000000000000000000000068
62667+:10A8F0000000000000000000000000000000000058
62668+:10A900000000000000000000000000000000000047
62669+:10A910000000000000000000000000000000000037
62670+:10A920000000000000000000000000000000000027
62671+:10A930000000000000000000000000000000000017
62672+:10A940000000000000000000000000000000000007
62673+:10A9500000000000000000000000000000000000F7
62674+:10A9600000000000000000000000000000000000E7
62675+:10A9700000000000000000000000000000000000D7
62676+:10A9800000000000000000000000000000000000C7
62677+:10A9900000000000000000000000000000000000B7
62678+:10A9A00000000000000000000000000000000000A7
62679+:10A9B0000000000000000000000000000000000097
62680+:10A9C0000000000000000000000000000000000087
62681+:10A9D0000000000000000000000000000000000077
62682+:10A9E0000000000000000000000000000000000067
62683+:10A9F0000000000000000000000000000000000057
62684+:10AA00000000000000000000000000000000000046
62685+:10AA10000000000000000000000000000000000036
62686+:10AA20000000000000000000000000000000000026
62687+:10AA30000000000000000000000000000000000016
62688+:10AA40000000000000000000000000000000000006
62689+:10AA500000000000000000000000000000000000F6
62690+:10AA600000000000000000000000000000000000E6
62691+:10AA700000000000000000000000000000000000D6
62692+:10AA800000000000000000000000000000000000C6
62693+:10AA900000000000000000000000000000000000B6
62694+:10AAA00000000000000000000000000000000000A6
62695+:10AAB0000000000000000000000000000000000096
62696+:10AAC0000000000000000000000000000000000086
62697+:10AAD0000000000000000000000000000000000076
62698+:10AAE0000000000000000000000000000000000066
62699+:10AAF0000000000000000000000000000000000056
62700+:10AB00000000000000000000000000000000000045
62701+:10AB10000000000000000000000000000000000035
62702+:10AB20000000000000000000000000000000000025
62703+:10AB30000000000000000000000000000000000015
62704+:10AB40000000000000000000000000000000000005
62705+:10AB500000000000000000000000000000000000F5
62706+:10AB600000000000000000000000000000000000E5
62707+:10AB700000000000000000000000000000000000D5
62708+:10AB800000000000000000000000000000000000C5
62709+:10AB900000000000000000000000000000000000B5
62710+:10ABA00000000000000000000000000000000000A5
62711+:10ABB0000000000000000000000000000000000095
62712+:10ABC0000000000000000000000000000000000085
62713+:10ABD0000000000000000000000000000000000075
62714+:10ABE0000000000000000000000000000000000065
62715+:10ABF0000000000000000000000000000000000055
62716+:10AC00000000000000000000000000000000000044
62717+:10AC10000000000000000000000000000000000034
62718+:10AC20000000000000000000000000000000000024
62719+:10AC30000000000000000000000000000000000014
62720+:10AC40000000000000000000000000000000000004
62721+:10AC500000000000000000000000000000000000F4
62722+:10AC600000000000000000000000000000000000E4
62723+:10AC700000000000000000000000000000000000D4
62724+:10AC800000000000000000000000000000000000C4
62725+:10AC900000000000000000000000000000000000B4
62726+:10ACA00000000000000000000000000000000000A4
62727+:10ACB0000000000000000000000000000000000094
62728+:10ACC0000000000000000000000000000000000084
62729+:10ACD0000000000000000000000000000000000074
62730+:10ACE0000000000000000000000000000000000064
62731+:10ACF0000000000000000000000000000000000054
62732+:10AD00000000000000000000000000000000000043
62733+:10AD10000000000000000000000000000000000033
62734+:10AD20000000000000000000000000000000000023
62735+:10AD30000000000000000000000000000000000013
62736+:10AD40000000000000000000000000000000000003
62737+:10AD500000000000000000000000000000000000F3
62738+:10AD600000000000000000000000000000000000E3
62739+:10AD700000000000000000000000000000000000D3
62740+:10AD800000000000000000000000000000000000C3
62741+:10AD900000000000000000000000000000000000B3
62742+:10ADA00000000000000000000000000000000000A3
62743+:10ADB0000000000000000000000000000000000093
62744+:10ADC0000000000000000000000000000000000083
62745+:10ADD0000000000000000000000000000000000073
62746+:10ADE0000000000000000000000000000000000063
62747+:10ADF0000000000000000000000000000000000053
62748+:10AE00000000000000000000000000000000000042
62749+:10AE10000000000000000000000000000000000032
62750+:10AE20000000000000000000000000000000000022
62751+:10AE30000000000000000000000000000000000012
62752+:10AE40000000000000000000000000000000000002
62753+:10AE500000000000000000000000000000000000F2
62754+:10AE600000000000000000000000000000000000E2
62755+:10AE700000000000000000000000000000000000D2
62756+:10AE800000000000000000000000000000000000C2
62757+:10AE900000000000000000000000000000000000B2
62758+:10AEA00000000000000000000000000000000000A2
62759+:10AEB0000000000000000000000000000000000092
62760+:10AEC0000000000000000000000000000000000082
62761+:10AED0000000000000000000000000000000000072
62762+:10AEE0000000000000000000000000000000000062
62763+:10AEF0000000000000000000000000000000000052
62764+:10AF00000000000000000000000000000000000041
62765+:10AF10000000000000000000000000000000000031
62766+:10AF20000000000000000000000000000000000021
62767+:10AF30000000000000000000000000000000000011
62768+:10AF40000000000000000000000000000000000001
62769+:10AF500000000000000000000000000000000000F1
62770+:10AF600000000000000000000000000000000000E1
62771+:10AF700000000000000000000000000000000000D1
62772+:10AF800000000000000000000000000000000000C1
62773+:10AF900000000000000000000000000000000000B1
62774+:10AFA00000000000000000000000000000000000A1
62775+:10AFB0000000000000000000000000000000000091
62776+:10AFC0000000000000000000000000000000000081
62777+:10AFD0000000000000000000000000000000000071
62778+:10AFE0000000000000000000000000000000000061
62779+:10AFF0000000000000000000000000000000000051
62780+:10B000000000000000000000000000000000000040
62781+:10B010000000000000000000000000000000000030
62782+:10B020000000000000000000000000000000000020
62783+:10B030000000000000000000000000000000000010
62784+:10B040000000000000000000000000000000000000
62785+:10B0500000000000000000000000000000000000F0
62786+:10B0600000000000000000000000000000000000E0
62787+:10B0700000000000000000000000000000000000D0
62788+:10B0800000000000000000000000000000000000C0
62789+:10B0900000000000000000000000000000000000B0
62790+:10B0A00000000000000000000000000000000000A0
62791+:10B0B0000000000000000000000000000000000090
62792+:10B0C0000000000000000000000000000000000080
62793+:10B0D0000000000000000000000000000000000070
62794+:10B0E0000000000000000000000000000000000060
62795+:10B0F0000000000000000000000000000000000050
62796+:10B10000000000000000000000000000000000003F
62797+:10B11000000000000000000000000000000000002F
62798+:10B12000000000000000000000000000000000001F
62799+:10B13000000000000000000000000000000000000F
62800+:10B1400000000000000000000000000000000000FF
62801+:10B1500000000000000000000000000000000000EF
62802+:10B1600000000000000000000000000000000000DF
62803+:10B1700000000000000000000000000000000000CF
62804+:10B1800000000000000000000000000000000000BF
62805+:10B1900000000000000000000000000000000000AF
62806+:10B1A000000000000000000000000000000000009F
62807+:10B1B000000000000000000000000000000000008F
62808+:10B1C000000000000000000000000000000000007F
62809+:10B1D000000000000000000000000000000000006F
62810+:10B1E000000000000000000000000000000000005F
62811+:10B1F000000000000000000000000000000000004F
62812+:10B20000000000000000000000000000000000003E
62813+:10B21000000000000000000000000000000000002E
62814+:10B22000000000000000000000000000000000001E
62815+:10B23000000000000000000000000000000000000E
62816+:10B2400000000000000000000000000000000000FE
62817+:10B2500000000000000000000000000000000000EE
62818+:10B2600000000000000000000000000000000000DE
62819+:10B2700000000000000000000000000000000000CE
62820+:10B2800000000000000000000000000000000000BE
62821+:10B2900000000000000000000000000000000000AE
62822+:10B2A000000000000000000000000000000000009E
62823+:10B2B000000000000000000000000000000000008E
62824+:10B2C000000000000000000000000000000000007E
62825+:10B2D000000000000000000000000000000000006E
62826+:10B2E000000000000000000000000000000000005E
62827+:10B2F000000000000000000000000000000000004E
62828+:10B30000000000000000000000000000000000003D
62829+:10B31000000000000000000000000000000000002D
62830+:10B32000000000000000000000000000000000001D
62831+:10B33000000000000000000000000000000000000D
62832+:10B3400000000000000000000000000000000000FD
62833+:10B3500000000000000000000000000000000000ED
62834+:10B3600000000000000000000000000000000000DD
62835+:10B3700000000000000000000000000000000000CD
62836+:10B3800000000000000000000000000000000000BD
62837+:10B3900000000000000000000000000000000000AD
62838+:10B3A000000000000000000000000000000000009D
62839+:10B3B000000000000000000000000000000000008D
62840+:10B3C000000000000000000000000000000000007D
62841+:10B3D000000000000000000000000000000000006D
62842+:10B3E000000000000000000000000000000000005D
62843+:10B3F000000000000000000000000000000000004D
62844+:10B40000000000000000000000000000000000003C
62845+:10B41000000000000000000000000000000000002C
62846+:10B42000000000000000000000000000000000001C
62847+:10B43000000000000000000000000000000000000C
62848+:10B4400000000000000000000000000000000000FC
62849+:10B4500000000000000000000000000000000000EC
62850+:10B4600000000000000000000000000000000000DC
62851+:10B4700000000000000000000000000000000000CC
62852+:10B4800000000000000000000000000000000000BC
62853+:10B4900000000000000000000000000000000000AC
62854+:10B4A000000000000000000000000000000000009C
62855+:10B4B000000000000000000000000000000000008C
62856+:10B4C000000000000000000000000000000000007C
62857+:10B4D000000000000000000000000000000000006C
62858+:10B4E000000000000000000000000000000000005C
62859+:10B4F000000000000000000000000000000000004C
62860+:10B50000000000000000000000000000000000003B
62861+:10B51000000000000000000000000000000000002B
62862+:10B52000000000000000000000000000000000001B
62863+:10B53000000000000000000000000000000000000B
62864+:10B5400000000000000000000000000000000000FB
62865+:10B5500000000000000000000000000000000000EB
62866+:10B5600000000000000000000000000000000000DB
62867+:10B5700000000000000000000000000000000000CB
62868+:10B5800000000000000000000000000000000000BB
62869+:10B5900000000000000000000000000000000000AB
62870+:10B5A000000000000000000000000000000000009B
62871+:10B5B000000000000000000000000000000000008B
62872+:10B5C000000000000000000000000000000000007B
62873+:10B5D000000000000000000000000000000000006B
62874+:10B5E000000000000000000000000000000000005B
62875+:10B5F000000000000000000000000000000000004B
62876+:10B60000000000000000000000000000000000003A
62877+:10B61000000000000000000000000000000000002A
62878+:10B62000000000000000000000000000000000001A
62879+:10B63000000000000000000000000000000000000A
62880+:10B6400000000000000000000000000000000000FA
62881+:10B6500000000000000000000000000000000000EA
62882+:10B6600000000000000000000000000000000000DA
62883+:10B6700000000000000000000000000000000000CA
62884+:10B6800000000000000000000000000000000000BA
62885+:10B6900000000000000000000000000000000000AA
62886+:10B6A000000000000000000000000000000000009A
62887+:10B6B000000000000000000000000000000000008A
62888+:10B6C000000000000000000000000000000000007A
62889+:10B6D000000000000000000000000000000000006A
62890+:10B6E000000000000000000000000000000000005A
62891+:10B6F000000000000000000000000000000000004A
62892+:10B700000000000000000000000000000000000039
62893+:10B710000000000000000000000000000000000029
62894+:10B720000000000000000000000000000000000019
62895+:10B730000000000000000000000000000000000009
62896+:10B7400000000000000000000000000000000000F9
62897+:10B7500000000000000000000000000000000000E9
62898+:10B7600000000000000000000000000000000000D9
62899+:10B7700000000000000000000000000000000000C9
62900+:10B7800000000000000000000000000000000000B9
62901+:10B7900000000000000000000000000000000000A9
62902+:10B7A0000000000000000000000000000000000099
62903+:10B7B0000000000000000000000000000000000089
62904+:10B7C0000000000000000000000000000000000079
62905+:10B7D0000000000000000000000000000000000069
62906+:10B7E0000000000000000000000000000000000059
62907+:10B7F0000000000000000000000000000000000049
62908+:10B800000000000000000000000000000000000038
62909+:10B810000000000000000000000000000000000028
62910+:10B820000000000000000000000000000000000018
62911+:10B830000000000000000000000000000000000008
62912+:10B8400000000000000000000000000000000000F8
62913+:10B8500000000000000000000000000000000000E8
62914+:10B8600000000000000000000000000000000000D8
62915+:10B8700000000000000000000000000000000000C8
62916+:10B8800000000000000000000000000000000000B8
62917+:10B8900000000000000000000000000000000000A8
62918+:10B8A0000000000000000000000000000000000098
62919+:10B8B0000000000000000000000000000000000088
62920+:10B8C0000000000000000000000000000000000078
62921+:10B8D0000000000000000000000000000000000068
62922+:10B8E0000000000000000000000000000000000058
62923+:10B8F0000000000000000000000000000000000048
62924+:10B900000000000000000000000000000000000037
62925+:10B910000000000000000000000000000000000027
62926+:10B920000000000000000000000000000000000017
62927+:10B930000000000000000000000000000000000007
62928+:10B9400000000000000000000000000000000000F7
62929+:10B9500000000000000000000000000000000000E7
62930+:10B9600000000000000000000000000000000000D7
62931+:10B9700000000000000000000000000000000000C7
62932+:10B9800000000000000000000000000000000000B7
62933+:10B9900000000000000000000000000000000000A7
62934+:10B9A0000000000000000000000000000000000097
62935+:10B9B0000000000000000000000000000000000087
62936+:10B9C0000000000000000000000000000000000077
62937+:10B9D0000000000000000000000000000000000067
62938+:10B9E0000000000000000000000000000000000057
62939+:10B9F0000000000000000000000000000000000047
62940+:10BA00000000000000000000000000000000000036
62941+:10BA10000000000000000000000000000000000026
62942+:10BA20000000000000000000000000000000000016
62943+:10BA30000000000000000000000000000000000006
62944+:10BA400000000000000000000000000000000000F6
62945+:10BA500000000000000000000000000000000000E6
62946+:10BA600000000000000000000000000000000000D6
62947+:10BA700000000000000000000000000000000000C6
62948+:10BA800000000000000000000000000000000000B6
62949+:10BA900000000000000000000000000000000000A6
62950+:10BAA0000000000000000000000000000000000096
62951+:10BAB0000000000000000000000000000000000086
62952+:10BAC0000000000000000000000000000000000076
62953+:10BAD0000000000000000000000000000000000066
62954+:10BAE0000000000000000000000000000000000056
62955+:10BAF0000000000000000000000000000000000046
62956+:10BB00000000000000000000000000000000000035
62957+:10BB10000000000000000000000000000000000025
62958+:10BB20000000000000000000000000000000000015
62959+:10BB30000000000000000000000000000000000005
62960+:10BB400000000000000000000000000000000000F5
62961+:10BB500000000000000000000000000000000000E5
62962+:10BB600000000000000000000000000000000000D5
62963+:10BB700000000000000000000000000000000000C5
62964+:10BB800000000000000000000000000000000000B5
62965+:10BB900000000000000000000000000000000000A5
62966+:10BBA0000000000000000000000000000000000095
62967+:10BBB0000000000000000000000000000000000085
62968+:10BBC0000000000000000000000000000000000075
62969+:10BBD0000000000000000000000000000000000065
62970+:10BBE0000000000000000000000000000000000055
62971+:10BBF0000000000000000000000000000000000045
62972+:10BC00000000000000000000000000000000000034
62973+:10BC10000000000000000000000000000000000024
62974+:10BC20000000000000000000000000000000000014
62975+:10BC30000000000000000000000000000000000004
62976+:10BC400000000000000000000000000000000000F4
62977+:10BC500000000000000000000000000000000000E4
62978+:10BC600000000000000000000000000000000000D4
62979+:10BC700000000000000000000000000000000000C4
62980+:10BC800000000000000000000000000000000000B4
62981+:10BC900000000000000000000000000000000000A4
62982+:10BCA0000000000000000000000000000000000094
62983+:10BCB0000000000000000000000000000000000084
62984+:10BCC0000000000000000000000000000000000074
62985+:10BCD0000000000000000000000000000000000064
62986+:10BCE0000000000000000000000000000000000054
62987+:10BCF0000000000000000000000000000000000044
62988+:10BD00000000000000000000000000000000000033
62989+:10BD10000000000000000000000000000000000023
62990+:10BD20000000000000000000000000000000000013
62991+:10BD30000000000000000000000000000000000003
62992+:10BD400000000000000000000000000000000000F3
62993+:10BD500000000000000000000000000000000000E3
62994+:10BD600000000000000000000000000000000000D3
62995+:10BD700000000000000000000000000000000000C3
62996+:10BD800000000000000000000000000000000000B3
62997+:10BD900000000000000000000000000000000000A3
62998+:10BDA0000000000000000000000000000000000093
62999+:10BDB0000000000000000000000000000000000083
63000+:10BDC0000000000000000000000000000000000073
63001+:10BDD0000000000000000000000000000000000063
63002+:10BDE0000000000000000000000000000000000053
63003+:10BDF0000000000000000000000000000000000043
63004+:10BE00000000000000000000000000000000000032
63005+:10BE10000000000000000000000000000000000022
63006+:10BE20000000000000000000000000000000000012
63007+:10BE30000000000000000000000000000000000002
63008+:10BE400000000000000000000000000000000000F2
63009+:10BE500000000000000000000000000000000000E2
63010+:10BE600000000000000000000000000000000000D2
63011+:10BE700000000000000000000000000000000000C2
63012+:10BE800000000000000000000000000000000000B2
63013+:10BE900000000000000000000000000000000000A2
63014+:10BEA0000000000000000000000000000000000092
63015+:10BEB0000000000000000000000000000000000082
63016+:10BEC0000000000000000000000000000000000072
63017+:10BED0000000000000000000000000000000000062
63018+:10BEE0000000000000000000000000000000000052
63019+:10BEF0000000000000000000000000000000000042
63020+:10BF00000000000000000000000000000000000031
63021+:10BF10000000000000000000000000000000000021
63022+:10BF20000000000000000000000000000000000011
63023+:10BF30000000000000000000000000000000000001
63024+:10BF400000000000000000000000000000000000F1
63025+:10BF500000000000000000000000000000000000E1
63026+:10BF600000000000000000000000000000000000D1
63027+:10BF700000000000000000000000000000000000C1
63028+:10BF800000000000000000000000000000000000B1
63029+:10BF900000000000000000000000000000000000A1
63030+:10BFA0000000000000000000000000000000000091
63031+:10BFB0000000000000000000000000000000000081
63032+:10BFC0000000000000000000000000000000000071
63033+:10BFD0000000000000000000000000000000000061
63034+:10BFE0000000000000000000000000000000000051
63035+:10BFF0000000000000000000000000000000000041
63036+:10C000000000000000000000000000000000000030
63037+:10C010000000000000000000000000000000000020
63038+:10C020000000000000000000000000000000000010
63039+:10C030000000000000000000000000000000000000
63040+:10C0400000000000000000000000000000000000F0
63041+:10C0500000000000000000000000000000000000E0
63042+:10C0600000000000000000000000000000000000D0
63043+:10C0700000000000000000000000000000000000C0
63044+:10C0800000000000000000000000000000000000B0
63045+:10C0900000000000000000000000000000000000A0
63046+:10C0A0000000000000000000000000000000000090
63047+:10C0B0000000000000000000000000000000000080
63048+:10C0C0000000000000000000000000000000000070
63049+:10C0D0000000000000000000000000000000000060
63050+:10C0E0000000000000000000000000000000000050
63051+:10C0F0000000000000000000000000000000000040
63052+:10C10000000000000000000000000000000000002F
63053+:10C11000000000000000000000000000000000001F
63054+:10C12000000000000000000000000000000000000F
63055+:10C1300000000000000000000000000000000000FF
63056+:10C1400000000000000000000000000000000000EF
63057+:10C1500000000000000000000000000000000000DF
63058+:10C1600000000000000000000000000000000000CF
63059+:10C1700000000000000000000000000000000000BF
63060+:10C1800000000000000000000000000000000000AF
63061+:10C19000000000000000000000000000000000009F
63062+:10C1A000000000000000000000000000000000008F
63063+:10C1B000000000000000000000000000000000007F
63064+:10C1C000000000000000000000000000000000006F
63065+:10C1D000000000000000000000000000000000005F
63066+:10C1E000000000000000000000000000000000004F
63067+:10C1F000000000000000000000000000000000003F
63068+:10C20000000000000000000000000000000000002E
63069+:10C21000000000000000000000000000000000001E
63070+:10C22000000000000000000000000000000000000E
63071+:10C2300000000000000000000000000000000000FE
63072+:10C2400000000000000000000000000000000000EE
63073+:10C2500000000000000000000000000000000000DE
63074+:10C2600000000000000000000000000000000000CE
63075+:10C2700000000000000000000000000000000000BE
63076+:10C2800000000000000000000000000000000000AE
63077+:10C29000000000000000000000000000000000009E
63078+:10C2A000000000000000000000000000000000008E
63079+:10C2B000000000000000000000000000000000007E
63080+:10C2C000000000000000000000000000000000006E
63081+:10C2D000000000000000000000000000000000005E
63082+:10C2E000000000000000000000000000000000004E
63083+:10C2F000000000000000000000000000000000003E
63084+:10C30000000000000000000000000000000000002D
63085+:10C31000000000000000000000000000000000001D
63086+:10C32000000000000000000000000000000000000D
63087+:10C3300000000000000000000000000000000000FD
63088+:10C3400000000000000000000000000000000000ED
63089+:10C3500000000000000000000000000000000000DD
63090+:10C3600000000000000000000000000000000000CD
63091+:10C3700000000000000000000000000000000000BD
63092+:10C3800000000000000000000000000000000000AD
63093+:10C39000000000000000000000000000000000009D
63094+:10C3A000000000000000000000000000000000008D
63095+:10C3B000000000000000000000000000000000007D
63096+:10C3C000000000000000000000000000000000006D
63097+:10C3D000000000000000000000000000000000005D
63098+:10C3E000000000000000000000000000000000004D
63099+:10C3F000000000000000000000000000000000003D
63100+:10C40000000000000000000000000000000000002C
63101+:10C41000000000000000000000000000000000001C
63102+:10C42000000000000000000000000000000000000C
63103+:10C4300000000000000000000000000000000000FC
63104+:10C4400000000000000000000000000000000000EC
63105+:10C4500000000000000000000000000000000000DC
63106+:10C4600000000000000000000000000000000000CC
63107+:10C4700000000000000000000000000000000000BC
63108+:10C4800000000000000000000000000000000000AC
63109+:10C49000000000000000000000000000000000009C
63110+:10C4A000000000000000000000000000000000008C
63111+:10C4B000000000000000000000000000000000007C
63112+:10C4C000000000000000000000000000000000006C
63113+:10C4D000000000000000000000000000000000005C
63114+:10C4E000000000000000000000000000000000004C
63115+:10C4F000000000000000000000000000000000003C
63116+:10C50000000000000000000000000000000000002B
63117+:10C51000000000000000000000000000000000001B
63118+:10C52000000000000000000000000000000000000B
63119+:10C5300000000000000000000000000000000000FB
63120+:10C5400000000000000000000000000000000000EB
63121+:10C5500000000000000000000000000000000000DB
63122+:10C5600000000000000000000000000000000000CB
63123+:10C5700000000000000000000000000000000000BB
63124+:10C5800000000000000000000000000000000000AB
63125+:10C59000000000000000000000000000000000009B
63126+:10C5A000000000000000000000000000000000008B
63127+:10C5B000000000000000000000000000000000007B
63128+:10C5C000000000000000000000000000000000006B
63129+:10C5D000000000000000000000000000000000005B
63130+:10C5E000000000000000000000000000000000004B
63131+:10C5F000000000000000000000000000000000003B
63132+:10C60000000000000000000000000000000000002A
63133+:10C61000000000000000000000000000000000001A
63134+:10C62000000000000000000000000000000000000A
63135+:10C6300000000000000000000000000000000000FA
63136+:10C6400000000000000000000000000000000000EA
63137+:10C6500000000000000000000000000000000000DA
63138+:10C6600000000000000000000000000000000000CA
63139+:10C6700000000000000000000000000000000000BA
63140+:10C6800000000000000000000000000000000000AA
63141+:10C69000000000000000000000000000000000009A
63142+:10C6A000000000000000000000000000000000008A
63143+:10C6B000000000000000000000000000000000007A
63144+:10C6C000000000000000000000000000000000006A
63145+:10C6D000000000000000000000000000000000005A
63146+:10C6E000000000000000000000000000000000004A
63147+:10C6F000000000000000000000000000000000003A
63148+:10C700000000000000000000000000000000000029
63149+:10C710000000000000000000000000000000000019
63150+:10C720000000000000000000000000000000000009
63151+:10C7300000000000000000000000000000000000F9
63152+:10C7400000000000000000000000000000000000E9
63153+:10C7500000000000000000000000000000000000D9
63154+:10C7600000000000000000000000000000000000C9
63155+:10C7700000000000000000000000000000000000B9
63156+:10C7800000000000000000000000000000000000A9
63157+:10C790000000000000000000000000000000000099
63158+:10C7A0000000000000000000000000000000000089
63159+:10C7B0000000000000000000000000000000000079
63160+:10C7C0000000000000000000000000000000000069
63161+:10C7D0000000000000000000000000000000000059
63162+:10C7E0000000000000000000000000000000000049
63163+:10C7F0000000000000000000000000000000000039
63164+:10C800000000000000000000000000000000000028
63165+:10C810000000000000000000000000000000000018
63166+:10C820000000000000000000000000000000000008
63167+:10C8300000000000000000000000000000000000F8
63168+:10C8400000000000000000000000000000000000E8
63169+:10C8500000000000000000000000000000000000D8
63170+:10C8600000000000000000000000000000000000C8
63171+:10C8700000000000000000000000000000000000B8
63172+:10C8800000000000000000000000000000000000A8
63173+:10C890000000000000000000000000000000000098
63174+:10C8A0000000000000000000000000000000000088
63175+:10C8B0000000000000000000000000000000000078
63176+:10C8C0000000000000000000000000000000000068
63177+:10C8D0000000000000000000000000000000000058
63178+:10C8E0000000000000000000000000000000000048
63179+:10C8F0000000000000000000000000000000000038
63180+:10C900000000000000000000000000000000000027
63181+:10C910000000000000000000000000000000000017
63182+:10C920000000000000000000000000000000000007
63183+:10C9300000000000000000000000000000000000F7
63184+:10C9400000000000000000000000000000000000E7
63185+:10C9500000000000000000000000000000000000D7
63186+:10C9600000000000000000000000000000000000C7
63187+:10C9700000000000000000000000000000000000B7
63188+:10C9800000000000000000000000000000000000A7
63189+:10C990000000000000000000000000000000000097
63190+:10C9A0000000000000000000000000000000000087
63191+:10C9B0000000000000000000000000000000000077
63192+:10C9C0000000000000000000000000000000000067
63193+:10C9D0000000000000000000000000000000000057
63194+:10C9E0000000000000000000000000000000000047
63195+:10C9F0000000000000000000000000000000000037
63196+:10CA00000000000000000000000000000000000026
63197+:10CA10000000000000000000000000000000000016
63198+:10CA20000000000000000000000000000000000006
63199+:10CA300000000000000000000000000000000000F6
63200+:10CA400000000000000000000000000000000000E6
63201+:10CA500000000000000000000000000000000000D6
63202+:10CA600000000000000000000000000000000000C6
63203+:10CA700000000000000000000000000000000000B6
63204+:10CA800000000000000000000000000000000000A6
63205+:10CA90000000000000000000000000000000000096
63206+:10CAA0000000000000000000000000000000000086
63207+:10CAB0000000000000000000000000000000000076
63208+:10CAC0000000000000000000000000000000000066
63209+:10CAD0000000000000000000000000000000000056
63210+:10CAE0000000000000000000000000000000000046
63211+:10CAF0000000000000000000000000000000000036
63212+:10CB00000000000000000000000000000000000025
63213+:10CB10000000000000000000000000000000000015
63214+:10CB20000000000000000000000000000000000005
63215+:10CB300000000000000000000000000000000000F5
63216+:10CB400000000000000000000000000000000000E5
63217+:10CB500000000000000000000000000000000000D5
63218+:10CB600000000000000000000000000000000000C5
63219+:10CB700000000000000000000000000000000000B5
63220+:10CB800000000000000000000000000000000000A5
63221+:10CB90000000000000000000000000000000000095
63222+:10CBA0000000000000000000000000000000000085
63223+:10CBB0000000000000000000000000000000000075
63224+:10CBC0000000000000000000000000000000000065
63225+:10CBD0000000000000000000000000000000000055
63226+:10CBE0000000000000000000000000000000000045
63227+:10CBF0000000000000000000000000000000000035
63228+:10CC00000000000000000000000000000000000024
63229+:10CC10000000000000000000000000000000000014
63230+:10CC20000000000000000000000000000000000004
63231+:10CC300000000000000000000000000000000000F4
63232+:10CC400000000000000000000000000000000000E4
63233+:10CC500000000000000000000000000000000000D4
63234+:10CC600000000000000000000000000000000000C4
63235+:10CC700000000000000000000000000000000000B4
63236+:10CC800000000000000000000000000000000000A4
63237+:10CC90000000000000000000000000000000000094
63238+:10CCA0000000000000000000000000000000000084
63239+:10CCB0000000000000000000000000000000000074
63240+:10CCC0000000000000000000000000000000000064
63241+:10CCD0000000000000000000000000000000000054
63242+:10CCE0000000000000000000000000000000000044
63243+:10CCF0000000000000000000000000000000000034
63244+:10CD00000000000000000000000000000000000023
63245+:10CD10000000000000000000000000000000000013
63246+:10CD20000000000000000000000000000000000003
63247+:10CD300000000000000000000000000000000000F3
63248+:10CD400000000000000000000000000000000000E3
63249+:10CD500000000000000000000000000000000000D3
63250+:10CD600000000000000000000000000000000000C3
63251+:10CD700000000000000000000000000000000000B3
63252+:10CD800000000000000000000000000000000000A3
63253+:10CD90000000000000000000000000000000000093
63254+:10CDA0000000000000000000000000000000000083
63255+:10CDB0000000000000000000000000000000000073
63256+:10CDC0000000000000000000000000000000000063
63257+:10CDD0000000000000000000000000000000000053
63258+:10CDE0000000000000000000000000000000000043
63259+:10CDF0000000000000000000000000000000000033
63260+:10CE00000000000000000000000000000000000022
63261+:10CE10000000000000000000000000000000000012
63262+:10CE20000000000000000000000000000000000002
63263+:10CE300000000000000000000000000000000000F2
63264+:10CE400000000000000000000000000000000000E2
63265+:10CE500000000000000000000000000000000000D2
63266+:10CE600000000000000000000000000000000000C2
63267+:10CE700000000000000000000000000000000000B2
63268+:10CE800000000000000000000000000000000000A2
63269+:10CE90000000000000000000000000000000000092
63270+:10CEA0000000000000000000000000000000000082
63271+:10CEB0000000000000000000000000000000000072
63272+:10CEC0000000000000000000000000000000000062
63273+:10CED0000000000000000000000000000000000052
63274+:10CEE0000000000000000000000000000000000042
63275+:10CEF0000000000000000000000000000000000032
63276+:10CF00000000000000000000000000000000000021
63277+:10CF10000000000000000000000000000000000011
63278+:10CF20000000000000000000000000000000000001
63279+:10CF300000000000000000000000000000000000F1
63280+:10CF400000000000000000000000000000000000E1
63281+:10CF500000000000000000000000000000000000D1
63282+:10CF600000000000000000000000000000000000C1
63283+:10CF700000000000000000000000000000000000B1
63284+:10CF800000000000000000000000000000000000A1
63285+:10CF90000000000000000000000000000000000091
63286+:10CFA0000000000000000000000000000000000081
63287+:10CFB0000000000000000000000000000000000071
63288+:10CFC0000000000000000000000000000000000061
63289+:10CFD0000000000000000000000000000000000051
63290+:10CFE0000000000000000000000000000000000041
63291+:10CFF0000000000000000000000000000000000031
63292+:10D000000000000000000000000000000000000020
63293+:10D010000000000000000000000000000000000010
63294+:10D020000000000000000000000000000000000000
63295+:10D0300000000000000000000000000000000000F0
63296+:10D0400000000000000000000000000000000000E0
63297+:10D0500000000000000000000000000000000000D0
63298+:10D0600000000000000000000000000000000000C0
63299+:10D0700000000000000000000000000000000000B0
63300+:10D0800000000000000000000000000000000000A0
63301+:10D090000000000000000000000000000000000090
63302+:10D0A0000000000000000000000000000000000080
63303+:10D0B0000000000000000000000000000000000070
63304+:10D0C0000000000000000000000000000000000060
63305+:10D0D0000000000000000000000000000000000050
63306+:10D0E0000000000000000000000000000000000040
63307+:10D0F0000000000000000000000000000000000030
63308+:10D10000000000000000000000000000000000001F
63309+:10D11000000000000000000000000000000000000F
63310+:10D1200000000000000000000000000000000000FF
63311+:10D1300000000000000000000000000000000000EF
63312+:10D1400000000000000000000000000000000000DF
63313+:10D1500000000000000000000000000000000000CF
63314+:10D1600000000000000000000000000000000000BF
63315+:10D1700000000000000000000000000000000000AF
63316+:10D18000000000000000000000000000000000009F
63317+:10D19000000000000000000000000000000000008F
63318+:10D1A000000000000000000000000000000000007F
63319+:10D1B000000000000000000000000000000000006F
63320+:10D1C000000000000000000000000000000000005F
63321+:10D1D000000000000000000000000000000000004F
63322+:10D1E000000000000000000000000000000000003F
63323+:10D1F000000000000000000000000000000000002F
63324+:10D20000000000000000000000000000000000001E
63325+:10D21000000000000000000000000000000000000E
63326+:10D2200000000000000000000000000000000000FE
63327+:10D2300000000000000000000000000000000000EE
63328+:10D2400000000000000000000000000000000000DE
63329+:10D2500000000000000000000000000000000000CE
63330+:10D2600000000000000000000000000000000000BE
63331+:10D2700000000000000000000000000000000000AE
63332+:10D28000000000000000000000000000000000009E
63333+:10D29000000000000000000000000000000000008E
63334+:10D2A000000000000000000000000000000000007E
63335+:10D2B000000000000000000000000000000000006E
63336+:10D2C000000000000000000000000000000000005E
63337+:10D2D000000000000000000000000000000000004E
63338+:10D2E000000000000000000000000000000000003E
63339+:10D2F000000000000000000000000000000000002E
63340+:10D30000000000000000000000000000000000001D
63341+:10D31000000000000000000000000000000000000D
63342+:10D3200000000000000000000000000000000000FD
63343+:10D3300000000000000000000000000000000000ED
63344+:10D3400000000000000000000000000000000000DD
63345+:10D3500000000000000000000000000000000000CD
63346+:10D3600000000000000000000000000000000000BD
63347+:10D3700000000000000000000000000000000000AD
63348+:10D38000000000000000000000000000000000009D
63349+:10D39000000000000000000000000000000000008D
63350+:10D3A000000000000000000000000000000000007D
63351+:10D3B000000000000000000000000000000000006D
63352+:10D3C000000000000000000000000000000000005D
63353+:10D3D000000000000000000000000000000000004D
63354+:10D3E000000000000000000000000000000000003D
63355+:10D3F000000000000000000000000000000000002D
63356+:10D40000000000000000000000000000000000001C
63357+:10D41000000000000000000000000000000000000C
63358+:10D4200000000000000000000000000000000000FC
63359+:10D4300000000000000000000000000000000000EC
63360+:10D4400000000000000000000000000000000000DC
63361+:10D4500000000000000000000000000000000000CC
63362+:10D4600000000000000000000000000000000000BC
63363+:10D4700000000000000000000000000000000000AC
63364+:10D48000000000000000000000000000000000009C
63365+:10D49000000000000000000000000000000000008C
63366+:10D4A000000000000000000000000000000000007C
63367+:10D4B000000000000000000000000000000000006C
63368+:10D4C000000000000000000000000000000000005C
63369+:10D4D000000000000000000000000000000000004C
63370+:10D4E000000000000000000000000000000000003C
63371+:10D4F000000000000000000000000000000000002C
63372+:10D50000000000000000000000000000000000001B
63373+:10D51000000000000000000000000000000000000B
63374+:10D5200000000000000000000000000000000000FB
63375+:10D5300000000000000000000000000000000000EB
63376+:10D5400000000000000000000000000000000000DB
63377+:10D5500000000000000000000000000000000000CB
63378+:10D5600000000000000000000000000000000000BB
63379+:10D5700000000000000000000000000000000000AB
63380+:10D58000000000000000000000000000000000009B
63381+:10D59000000000000000008000000000000000000B
63382+:10D5A000000000000000000000000000000000007B
63383+:10D5B00000000000000000000000000A0000000061
63384+:10D5C0000000000000000000100000030000000048
63385+:10D5D0000000000D0000000D3C02080024427340D2
63386+:10D5E0003C030800246377CCAC4000000043202BB0
63387+:10D5F0001480FFFD244200043C1D080037BD7FFC61
63388+:10D6000003A0F0213C100800261032103C1C08003A
63389+:10D61000279C73400E0010FE000000000000000D6B
63390+:10D6200030A5FFFF30C600FF274301808F4201B8BD
63391+:10D630000440FFFE24020002AC640000A465000860
63392+:10D64000A066000AA062000B3C021000AC67001844
63393+:10D6500003E00008AF4201B83C0360008C624FF861
63394+:10D660000440FFFE3C020200AC644FC0AC624FC4F9
63395+:10D670003C02100003E00008AC624FF89482000CFA
63396+:10D680002486001400A0382100021302000210803A
63397+:10D690000082402100C8102B1040005700000000FD
63398+:10D6A00090C300002C6200095040005190C200015C
63399+:10D6B000000310803C030800246372F00043102133
63400+:10D6C0008C420000004000080000000090C30001F0
63401+:10D6D0002402000A1462003A000000000106102330
63402+:10D6E0002C42000A1440003624C600028CE20000DE
63403+:10D6F00034420100ACE2000090C2000090C300017F
63404+:10D7000090C4000290C5000300031C000002160034
63405+:10D710000043102500042200004410250045102578
63406+:10D7200024C60004ACE2000490C2000090C30001D3
63407+:10D7300090C4000290C500030002160000031C0004
63408+:10D740000043102500042200004410250045102548
63409+:10D7500024C600040A000CB8ACE2000890C3000123
63410+:10D76000240200041462001624C6000290C20000C5
63411+:10D7700090C400018CE30000000212000044102558
63412+:10D780003463000424C60002ACE2000C0A000CB8AA
63413+:10D79000ACE3000090C300012402000314620008FF
63414+:10D7A00024C600028CE2000090C3000024C60001E1
63415+:10D7B00034420008A0E300100A000CB8ACE20000FC
63416+:10D7C00003E000082402000190C3000124020002CB
63417+:10D7D0001062000224C40002010020210A000CB8DB
63418+:10D7E000008030210A000CB824C6000190C200015C
63419+:10D7F0000A000CB800C2302103E00008000010212C
63420+:10D8000027BDFFE8AFBF0014AFB000100E00130239
63421+:10D8100000808021936200052403FFFE0200202186
63422+:10D82000004310248FBF00148FB00010A3620005C6
63423+:10D830000A00130B27BD001827BDFFE8AFB000108A
63424+:10D84000AFBF00140E000F3C0080802193620000E7
63425+:10D8500024030050304200FF14430004240201005E
63426+:10D86000AF4201800A000D3002002021AF4001804C
63427+:10D87000020020218FBF00148FB000100A000FE7B4
63428+:10D8800027BD001827BDFF80AFBE0078AFB700747A
63429+:10D89000AFB20060AFBF007CAFB60070AFB5006C38
63430+:10D8A000AFB40068AFB30064AFB1005CAFB0005874
63431+:10D8B0008F5001283C0208008C4231A02403FF80D5
63432+:10D8C0009365003F0202102100431024AF42002460
63433+:10D8D0003C0208008C4231A09364000530B200FF86
63434+:10D8E000020210213042007F034218210004202749
63435+:10D8F0003C02000A0062182130840001AF8300144A
63436+:10D900000000F0210000B82114800053AFA00050A7
63437+:10D9100093430116934401128F450104306300FFC5
63438+:10D920003C020001308400FF00A2282403431021A0
63439+:10D9300003441821245640002467400014A001CD60
63440+:10D940002402000193620000304300FF2402002003
63441+:10D950001062000524020050106200060000000062
63442+:10D960000A000D74000000000000000D0A000D7D8B
63443+:10D97000AFA000303C1E080027DE738C0A000D7D2E
63444+:10D98000AFA000303C0208008C4200DC24420001C1
63445+:10D990003C010800AC2200DC0E00139F00000000D8
63446+:10D9A0000A000F318FBF007C8F4201043C0300202E
63447+:10D9B00092D3000D004310240002202B00042140CC
63448+:10D9C000AFA400308F4301043C02004000621824E1
63449+:10D9D000146000023485004000802821326200205B
63450+:10D9E000AFA500301440000234A6008000A0302112
63451+:10D9F00010C0000BAFA6003093C500088F67004C25
63452+:10DA00000200202100052B0034A5008130A5F08103
63453+:10DA10000E000C9B30C600FF0A000F2E0000000015
63454+:10DA20009362003E304200401040000F2402000488
63455+:10DA300056420007240200120200202100E02821A3
63456+:10DA40000E0013F702C030210A000F318FBF007C97
63457+:10DA500016420005000000000E000D2100002021EC
63458+:10DA60000A000F318FBF007C9743011A96C4000E45
63459+:10DA700093620035326500043075FFFF00442004D6
63460+:10DA8000AFA400548ED1000410A000158ED400085D
63461+:10DA90009362003E3042004010400007000000004A
63462+:10DAA0000E0013E0022020211040000D00000000B5
63463+:10DAB0000A000F2E000000008F6200440222102393
63464+:10DAC0000440016A000000008F6200480222102317
63465+:10DAD00004410166240400160A000E218FC20004CE
63466+:10DAE0008F6200480222102304400008000000005A
63467+:10DAF0003C0208008C423100244200013C01080035
63468+:10DB0000AC2231000A000F23000000008F620040A9
63469+:10DB100002221023184000128F8400143C020800D7
63470+:10DB20008C423100327300FC0000A8212442000125
63471+:10DB30003C010800AC2231008F6300409482011C3C
63472+:10DB4000022318233042FFFF0043102A50400010E8
63473+:10DB50002402000C8F6200400A000DF20222102302
63474+:10DB60009483011C9762003C0043102B1040000678
63475+:10DB7000000000009482011C00551023A482011CA7
63476+:10DB80000A000DF72402000CA480011C2402000CE2
63477+:10DB9000AFA200308F620040005120231880000D9A
63478+:10DBA00002A4102A1440012600000000149500066B
63479+:10DBB00002A410233A620001304200011440012007
63480+:10DBC0000000000002A41023022488210A000E098C
63481+:10DBD0003055FFFF00002021326200021040001A81
63482+:10DBE000326200109362003E30420040504000110B
63483+:10DBF0008FC200040E00130202002021240200182C
63484+:10DC0000A362003F936200052403FFFE020020216F
63485+:10DC1000004310240E00130BA362000524040039F6
63486+:10DC2000000028210E0013C9240600180A000F3036
63487+:10DC300024020001240400170040F809000000003D
63488+:10DC40000A000F302402000110400108000000000B
63489+:10DC50008F63004C8F620054028210231C4001032A
63490+:10DC600002831023044200010060A021AFA4001829
63491+:10DC7000AFB10010AFB50014934201208F65004092
63492+:10DC80009763003C304200FF034210210044102102
63493+:10DC90008FA400543063FFFF244240000083182B00
63494+:10DCA0008FA40030AFA20020AFA50028008320255C
63495+:10DCB000AFA40030AFA50024AFA0002CAFB4003457
63496+:10DCC0009362003E30420008504000118FC20000B5
63497+:10DCD00002C0202127A500380E000CB2AFA00038EA
63498+:10DCE0005440000B8FC200008FA200383042010068
63499+:10DCF000504000078FC200008FA3003C8F6200607D
63500+:10DD00000062102304430001AF6300608FC2000073
63501+:10DD10000040F80927A400108FA200303042000212
63502+:10DD200054400001327300FE9362003E30420040D6
63503+:10DD3000104000378FA200248F6200541682001A10
63504+:10DD40003262000124020014124200102A4200151F
63505+:10DD500010400006240200162402000C12420007A4
63506+:10DD6000326200010A000E7D000000001242000530
63507+:10DD7000326200010A000E7D000000000A000E78E9
63508+:10DD80002417000E0A000E78241700100A000E7CDB
63509+:10DD900024170012936200232403FFBD00431024C4
63510+:10DDA000A362002332620001104000198FA20024F8
63511+:10DDB0002402000C1242000E2A42000D1040000600
63512+:10DDC0002402000E2402000A124200078FA200243F
63513+:10DDD0000A000E9524420001124200088FA200247E
63514+:10DDE0000A000E95244200010A000E932417000831
63515+:10DDF0002402000E16E20002241700162417001059
63516+:10DE00008FA2002424420001AFA200248FA200248C
63517+:10DE10008FA300148F76004000431021AF620040B2
63518+:10DE20008F8200149442011C104000090000000081
63519+:10DE30008F6200488F6400409763003C00441023C9
63520+:10DE40003063FFFF0043102A104000088FA20054E7
63521+:10DE5000936400368F6300403402FFFC008210049C
63522+:10DE600000621821AF6300488FA200548FA60030D3
63523+:10DE70000282902130C200081040000E0000000015
63524+:10DE80008F6200581642000430C600FF9742011A04
63525+:10DE90005040000134C6001093C500088FA700341D
63526+:10DEA0000200202100052B0034A500800E000C9BF1
63527+:10DEB00030A5F0808F620040005610231840001BF0
63528+:10DEC0008FA200183C0208008C42319830420010AA
63529+:10DED0001040000D24020001976200681440000AFF
63530+:10DEE000240200018F8200149442011C1440000699
63531+:10DEF00024020001A76200689742007A244200646D
63532+:10DF00000A000EE9A7620012A76200120E001302B7
63533+:10DF1000020020219362007D2403000102002021E1
63534+:10DF2000344200010A000EE7AFA300501840000A77
63535+:10DF3000000000000E001302020020219362007D09
63536+:10DF40002403000102002021AFA30050344200044A
63537+:10DF50000E00130BA362007D9362003E304200402E
63538+:10DF60001440000C326200011040000A0000000062
63539+:10DF70008F6300408FC20004240400182463000152
63540+:10DF80000040F809AF6300408FA200300A000F3054
63541+:10DF9000304200048F620058105200100000000050
63542+:10DFA0008F620018022210231C4000082404000184
63543+:10DFB0008F62001816220009000000008F62001C0A
63544+:10DFC000028210230440000500000000AF720058D8
63545+:10DFD000AFA40050AF710018AF74001C12E0000B2A
63546+:10DFE0008FA200500E00130202002021A377003FF1
63547+:10DFF0000E00130B0200202102E030212404003720
63548+:10E000000E0013C9000028218FA200501040000309
63549+:10E01000000000000E000CA90200202112A0000543
63550+:10E02000000018218FA2003030420004504000113F
63551+:10E0300000601021240300010A000F30006010214D
63552+:10E040000E001302020020219362007D02002021B5
63553+:10E05000344200040E00130BA362007D0E000CA9D5
63554+:10E06000020020210A000F3024020001AF400044CA
63555+:10E07000240200018FBF007C8FBE00788FB7007430
63556+:10E080008FB600708FB5006C8FB400688FB30064DA
63557+:10E090008FB200608FB1005C8FB0005803E00008C1
63558+:10E0A00027BD00808F4201B80440FFFE2402080013
63559+:10E0B000AF4201B803E00008000000003C02000885
63560+:10E0C00003421021944200483084FFFF2484001250
63561+:10E0D0003045FFFF10A0001700A4102B10400016C1
63562+:10E0E00024020003934201202403001AA343018B5E
63563+:10E0F000304200FF2446FFFE8F82000000A6182B4E
63564+:10E100003863000100021382004310241040000510
63565+:10E110008F84000434820001A746019403E00008C4
63566+:10E12000AF8200042402FFFE0082102403E00008F6
63567+:10E13000AF8200042402000303E00008A342018B25
63568+:10E1400027BDFFE0AFB10014AFB00010AFBF0018A3
63569+:10E1500030B0FFFF30D1FFFF8F4201B80440FFFE17
63570+:10E1600000000000AF440180AF4400200E000F42C9
63571+:10E17000020020218F8300008F840004A750019AA1
63572+:10E18000A750018EA74301908F8300083082800042
63573+:10E19000AF4301A8A75101881040000E8F820004F0
63574+:10E1A00093420116304200FC24420004005A102120
63575+:10E1B0008C4240003042FFFF144000068F82000472
63576+:10E1C0003C02FFFF34427FFF00821024AF82000434
63577+:10E1D0008F8200042403BFFF00431024A74201A63E
63578+:10E1E0009743010C8F42010400031C003042FFFFE3
63579+:10E1F00000621825AF4301AC3C021000AF4201B8E9
63580+:10E200008FBF00188FB100148FB0001003E000081A
63581+:10E2100027BD00208F470070934201128F830000BA
63582+:10E2200027BDFFF0304200FF00022882306201006B
63583+:10E23000000030211040004324A40003306240005D
63584+:10E24000104000103062200000041080005A10219D
63585+:10E250008C43400024A4000400041080AFA30000FD
63586+:10E26000005A10218C424000AFA2000493420116D4
63587+:10E27000304200FC005A10218C4240000A000FC0BE
63588+:10E28000AFA200081040002F0000302100041080D1
63589+:10E29000005A10218C43400024A400040004108084
63590+:10E2A000AFA30000005A10218C424000AFA000082C
63591+:10E2B000AFA200048FA80008000030210000202138
63592+:10E2C000240A00083C0908002529010003A41021A4
63593+:10E2D000148A000300042A001100000A0000000054
63594+:10E2E00090420000248400012C83000C00A2102125
63595+:10E2F00000021080004910218C4200001460FFF3DE
63596+:10E3000000C230263C0408008C8431048F42007027
63597+:10E310002C83002010600009004738233C030800CC
63598+:10E32000246331080004108000431021248300017D
63599+:10E33000AC4700003C010800AC233104AF86000864
63600+:10E340002406000100C0102103E0000827BD0010D2
63601+:10E350003C0208008C42003827BDFFD0AFB5002436
63602+:10E36000AFB40020AFB10014AFBF0028AFB3001CA2
63603+:10E37000AFB20018AFB00010000088213C150800B3
63604+:10E3800026B50038144000022454FFFF0000A021ED
63605+:10E390009742010E8F8400003042FFFF308340001F
63606+:10E3A0001060000A245200043C0200200082102465
63607+:10E3B00050400007308280008F8200042403BFFF9A
63608+:10E3C000008318240A0010103442100030828000AC
63609+:10E3D0001040000A3C020020008210241040000778
63610+:10E3E0008F8200043C03FFFF34637FFF0083182407
63611+:10E3F00034428000AF820004AF8300000E000F980B
63612+:10E400000000000014400007000000009743011EB8
63613+:10E410009742011C3063FFFF0002140000621825C0
63614+:10E42000AF8300089742010C8F4340003045FFFF47
63615+:10E430003402FFFF14620003000000000A001028ED
63616+:10E44000241100208F42400030420100544000015E
63617+:10E45000241100108F8400003082100050400014FE
63618+:10E4600036310001308200201440000B3C021000C5
63619+:10E47000008210245040000E363100013C030E0093
63620+:10E480003C020DFF008318243442FFFF0043102B91
63621+:10E4900050400007363100013C0208008C42002C3D
63622+:10E4A000244200013C010800AC22002C363100055A
63623+:10E4B0003C0608008CC6003454C000238F85000041
63624+:10E4C0008F820004304240005440001F8F850000BE
63625+:10E4D0003C021F01008210243C0310005443001A28
63626+:10E4E0008F85000030A20200144000178F850000C5
63627+:10E4F0003250FFFF363100028F4201B80440FFFE68
63628+:10E5000000000000AF400180020020210E000F42F9
63629+:10E51000AF4000208F8300042402BFFFA750019A60
63630+:10E52000006218248F820000A750018EA751018835
63631+:10E53000A74301A6A74201903C021000AF4201B8D8
63632+:10E540000A0010F5000010213C02100000A2102467
63633+:10E550001040003A0000000010C0000F0000000052
63634+:10E5600030A201001040000C3C0302003C020F00EE
63635+:10E5700000A2102410430008000000008F82000851
63636+:10E58000005410240055102190420004244200043D
63637+:10E590000A00109F000221C00000000000051602C2
63638+:10E5A0003050000F3A0300022E4203EF38420001C0
63639+:10E5B0002C6300010062182414600073240200011F
63640+:10E5C0003C0308008C6300D02E06000C386200016A
63641+:10E5D0002C4200010046102414400015001021C0F8
63642+:10E5E0002602FFFC2C4200045440001100002021B0
63643+:10E5F000386200022C420001004610241040000343
63644+:10E60000000512420A00109F000020210010182B64
63645+:10E610000043102450400006001021C000002021BB
63646+:10E620003245FFFF0E000F633226FFFB001021C0B2
63647+:10E630003245FFFF0A0010F2362600028F424000EA
63648+:10E640003C0308008C630024304201001040004667
63649+:10E6500030620001322200043070000D14400002CC
63650+:10E660002413000424130002000512C238420001E2
63651+:10E670002E4303EF304200013863000100431025B0
63652+:10E68000104000033231FFFB2402FFFB0202802412
63653+:10E6900010C000183202000130A201001040001525
63654+:10E6A000320200013C020F0000A210243C030200D1
63655+:10E6B0001043000F8F8200082403FFFE0203802412
63656+:10E6C00000541024005510219042000402333025DC
63657+:10E6D0002442000412000002000221C03226FFFF83
63658+:10E6E0000E000F633245FFFF1200002700001021CB
63659+:10E6F000320200011040000D320200042402000129
63660+:10E7000012020002023330253226FFFF00002021D2
63661+:10E710000E000F633245FFFF2402FFFE0202802439
63662+:10E7200012000019000010213202000410400016EF
63663+:10E7300024020001240200041202000202333025E8
63664+:10E740003226FFFF3245FFFF0E000F632404010055
63665+:10E750002402FFFB020280241200000B00001021A3
63666+:10E760000A0010F5240200011040000700001021EB
63667+:10E770003245FFFF36260002000020210E000F6305
63668+:10E7800000000000000010218FBF00288FB500247A
63669+:10E790008FB400208FB3001C8FB200188FB100140B
63670+:10E7A0008FB0001003E0000827BD003027BDFFD068
63671+:10E7B000AFB000103C04600CAFBF002CAFB6002817
63672+:10E7C000AFB50024AFB40020AFB3001CAFB2001847
63673+:10E7D000AFB100148C8250002403FF7F3C1A8000EC
63674+:10E7E000004310243442380CAC8250002402000351
63675+:10E7F0003C106000AF4200088E0208083C1B8008F5
63676+:10E800003C010800AC2000203042FFF038420010EC
63677+:10E810002C4200010E001B8DAF8200183C04FFFF4C
63678+:10E820003C020400348308063442000CAE0219484E
63679+:10E83000AE03194C3C0560168E0219808CA30000B3
63680+:10E840003442020000641824AE0219803C02535383
63681+:10E850001462000334A47C008CA200040050202128
63682+:10E860008C82007C8C830078AF820010AF83000C18
63683+:10E870008F55000032A200031040FFFD32A20001BC
63684+:10E880001040013D32A200028F420128AF42002019
63685+:10E890008F4201048F430100AF8200000E000F3C45
63686+:10E8A000AF8300043C0208008C4200C01040000806
63687+:10E8B0008F8400003C0208008C4200C42442000106
63688+:10E8C0003C010800AC2200C40A00126900000000EC
63689+:10E8D0003C020010008210241440010C8F830004BD
63690+:10E8E0003C0208008C4200203C0308008C63003886
63691+:10E8F00000008821244200013C010800AC220020D5
63692+:10E900003C16080026D60038146000022474FFFF6D
63693+:10E910000000A0219742010E308340003042FFFFEB
63694+:10E920001060000A245200043C02002000821024DF
63695+:10E9300050400007308280008F8200042403BFFF14
63696+:10E94000008318240A0011703442100030828000C5
63697+:10E950001040000A3C0200200082102410400007F2
63698+:10E960008F8200043C03FFFF34637FFF0083182481
63699+:10E9700034428000AF820004AF8300000E000F9885
63700+:10E980000000000014400007000000009743011E33
63701+:10E990009742011C3063FFFF00021400006218253B
63702+:10E9A000AF8300089742010C8F4340003045FFFFC2
63703+:10E9B0003402FFFF14620003000000000A00118807
63704+:10E9C000241100208F4240003042010054400001D9
63705+:10E9D000241100108F840000308210005040001479
63706+:10E9E00036310001308200201440000B3C02100040
63707+:10E9F000008210245040000E363100013C030E000E
63708+:10EA00003C020DFF008318243442FFFF0043102B0B
63709+:10EA100050400007363100013C0208008C42002CB7
63710+:10EA2000244200013C010800AC22002C36310005D4
63711+:10EA30003C0608008CC6003454C000238F850000BB
63712+:10EA40008F820004304240005440001F8F85000038
63713+:10EA50003C021F01008210243C0310005443001AA2
63714+:10EA60008F85000030A20200144000178F8500003F
63715+:10EA70003250FFFF363100028F4201B80440FFFEE2
63716+:10EA800000000000AF400180020020210E000F4274
63717+:10EA9000AF4000208F8300042402BFFFA750019ADB
63718+:10EAA000006218248F820000A750018EA7510188B0
63719+:10EAB000A74301A6A74201903C021000AF4201B853
63720+:10EAC0000A001267000010213C02100000A210246E
63721+:10EAD0001040003A0000000010C0000F00000000CD
63722+:10EAE00030A201001040000C3C0302003C020F0069
63723+:10EAF00000A2102410430008000000008F820008CC
63724+:10EB000000541024005610219042000424420004B6
63725+:10EB10000A0011FF000221C00000000000051602DB
63726+:10EB20003050000F3A0300022E4203EF384200013A
63727+:10EB30002C63000100621824146000852402000187
63728+:10EB40003C0308008C6300D02E06000C38620001E4
63729+:10EB50002C4200010046102414400015001021C072
63730+:10EB60002602FFFC2C42000454400011000020212A
63731+:10EB7000386200022C42000100461024504000037D
63732+:10EB8000000512420A0011FF000020210010182B7E
63733+:10EB90000043102450400006001021C00000202136
63734+:10EBA0003245FFFF0E000F633226FFFB001021C02D
63735+:10EBB0003245FFFF0A001252362600028F42400003
63736+:10EBC0003C0308008C6300243042010010400046E2
63737+:10EBD00030620001322200043070000D1440000247
63738+:10EBE0002413000424130002000512C2384200015D
63739+:10EBF0002E4303EF3042000138630001004310252B
63740+:10EC0000104000033231FFFB2402FFFB020280248C
63741+:10EC100010C000183202000130A20100104000159F
63742+:10EC2000320200013C020F0000A210243C0302004B
63743+:10EC30001043000F8F8200082403FFFE020380248C
63744+:10EC40000054102400561021904200040233302555
63745+:10EC50002442000412000002000221C03226FFFFFD
63746+:10EC60000E000F633245FFFF120000390000102133
63747+:10EC7000320200011040000D3202000424020001A3
63748+:10EC800012020002023330253226FFFF000020214D
63749+:10EC90000E000F633245FFFF2402FFFE02028024B4
63750+:10ECA0001200002B00001021320200041040002846
63751+:10ECB0002402000124020004120200020233302563
63752+:10ECC0003226FFFF3245FFFF0E000F6324040100D0
63753+:10ECD0002402FFFB020280241200001D000010210C
63754+:10ECE0000A001267240200015040001900001021A0
63755+:10ECF0003245FFFF36260002000020210E000F6380
63756+:10ED0000000000000A001267000010212402BFFF6B
63757+:10ED1000006210241040000800000000240287FF59
63758+:10ED200000621024144000083C020060008210249D
63759+:10ED300010400005000000000E000D34000000002F
63760+:10ED40000A001267000000000E0012C70000000059
63761+:10ED5000104000063C0240008F4301243C0260202A
63762+:10ED6000AC430014000000003C024000AF420138F8
63763+:10ED70000000000032A200021040FEBD00000000B2
63764+:10ED80008F4201403C044000AF4200208F430148C5
63765+:10ED90003C02700000621824106400420000000071
63766+:10EDA0000083102B144000063C0260003C0220004F
63767+:10EDB000106200073C0240000A0012C3000000007D
63768+:10EDC0001062003C3C0240000A0012C30000000038
63769+:10EDD0008F4501408F4601448F42014800021402D2
63770+:10EDE000304300FF240200041462000A274401801B
63771+:10EDF0008F4201B80440FFFE2402001CAC850000D5
63772+:10EE0000A082000B3C021000AF4201B80A0012C3FE
63773+:10EE10003C0240002402000914620012000616029F
63774+:10EE2000000229C0AF4500208F4201B80440FFFE18
63775+:10EE30002402000124030003AF450180A343018B9A
63776+:10EE4000A740018EA740019AA7400190AF4001A8BA
63777+:10EE5000A7420188A74201A6AF4001AC3C021000C6
63778+:10EE6000AF4201B88F4201B80440FFFE000000002D
63779+:10EE7000AC8500008F42014800021402A482000801
63780+:10EE800024020002A082000B8F420148A4820010DD
63781+:10EE90003C021000AC860024AF4201B80A0012C345
63782+:10EEA0003C0240000E001310000000000A0012C3D4
63783+:10EEB0003C0240000E001BC2000000003C0240006B
63784+:10EEC000AF420178000000000A00112F000000008E
63785+:10EED0008F4201003042003E144000112402000124
63786+:10EEE000AF4000488F420100304207C0104000058B
63787+:10EEF00000000000AF40004CAF40005003E00008AD
63788+:10EF000024020001AF400054AF4000408F42010096
63789+:10EF10003042380054400001AF4000442402000158
63790+:10EF200003E00008000000008F4201B80440FFFE2B
63791+:10EF300024020001AF440180AF400184A74501884D
63792+:10EF4000A342018A24020002A342018B9742014A94
63793+:10EF500014C00004A7420190AF4001A40A0012EFC0
63794+:10EF60003C0210008F420144AF4201A43C02100059
63795+:10EF7000AF4001A803E00008AF4201B88F4201B8DA
63796+:10EF80000440FFFE24020002AF440180AF4401842C
63797+:10EF9000A7450188A342018AA342018B9742014AF7
63798+:10EFA000A7420190AF4001A48F420144AF4201A8A3
63799+:10EFB0003C02100003E00008AF4201B83C029000A0
63800+:10EFC0003442000100822025AF4400208F420020FF
63801+:10EFD0000440FFFE0000000003E000080000000005
63802+:10EFE0003C028000344200010082202503E000083A
63803+:10EFF000AF44002027BDFFE8AFBF0014AFB0001042
63804+:10F000008F50014093430149934201489344014882
63805+:10F01000306300FF304200FF00021200006228252A
63806+:10F020002402001910620076308400802862001AE1
63807+:10F030001040001C24020020240200081062007707
63808+:10F04000286200091040000E2402000B2402000177
63809+:10F0500010620034286200025040000524020006BD
63810+:10F0600050600034020020210A00139A00000000C2
63811+:10F0700010620030020020210A00139A00000000F4
63812+:10F080001062003B2862000C504000022402000E77
63813+:10F090002402000910620056020020210A00139A7F
63814+:10F0A0000000000010620056286200211040000F8E
63815+:10F0B000240200382402001C106200582862001D3F
63816+:10F0C000104000062402001F2402001B1062004CA6
63817+:10F0D000000000000A00139A000000001062004ABD
63818+:10F0E000020020210A00139A00000000106200456F
63819+:10F0F0002862003910400007240200802462FFCB00
63820+:10F100002C42000210400045020020210A00139604
63821+:10F110000000302110620009000000000A00139A6C
63822+:10F12000000000001480003D020020210A0013901E
63823+:10F130008FBF00140A001396240600018F4201B805
63824+:10F140000440FFFE24020002A342018BA745018870
63825+:10F150009742014AA74201908F420144A74201927F
63826+:10F160003C021000AF4201B80A00139C8FBF00148C
63827+:10F170009742014A144000290000000093620005F4
63828+:10F180003042000414400025000000000E0013026D
63829+:10F190000200202193620005020020213442000475
63830+:10F1A0000E00130BA36200059362000530420004B9
63831+:10F1B00014400002000000000000000D93620000F7
63832+:10F1C00024030020304200FF14430014000000001C
63833+:10F1D0008F4201B80440FFFE24020005AF500180B9
63834+:10F1E000A342018B3C0210000A00139AAF4201B8FF
63835+:10F1F0008FBF00148FB000100A0012F227BD001854
63836+:10F200000000000D02002021000030218FBF0014FB
63837+:10F210008FB000100A0012DD27BD00180000000D9D
63838+:10F220008FBF00148FB0001003E0000827BD001846
63839+:10F2300027BDFFE8AFBF00100E000F3C000000002C
63840+:10F24000AF4001808FBF0010000020210A000FE7AF
63841+:10F2500027BD00183084FFFF30A5FFFF00001821F4
63842+:10F260001080000700000000308200011040000202
63843+:10F2700000042042006518210A0013AB0005284055
63844+:10F2800003E000080060102110C0000624C6FFFF44
63845+:10F290008CA2000024A50004AC8200000A0013B573
63846+:10F2A0002484000403E000080000000010A000080F
63847+:10F2B00024A3FFFFAC860000000000000000000057
63848+:10F2C0002402FFFF2463FFFF1462FFFA248400047A
63849+:10F2D00003E0000800000000308300FF30A500FFBD
63850+:10F2E00030C600FF274701808F4201B80440FFFE6F
63851+:10F2F000000000008F42012834634000ACE20000AF
63852+:10F3000024020001ACE00004A4E30008A0E2000A2B
63853+:10F3100024020002A0E2000B3C021000A4E5001051
63854+:10F32000ACE00024ACE00028A4E6001203E00008F2
63855+:10F33000AF4201B827BDFFE8AFBF00109362003FA6
63856+:10F3400024030012304200FF1043000D00803021E2
63857+:10F350008F620044008210230440000A8FBF001017
63858+:10F360008F620048240400390000282100C21023C5
63859+:10F3700004410004240600120E0013C9000000001E
63860+:10F380008FBF00102402000103E0000827BD001811
63861+:10F3900027BDFFC8AFB20030AFB1002CAFBF003403
63862+:10F3A000AFB0002890C5000D0080902130A400105F
63863+:10F3B0001080000B00C088218CC300088F620054AD
63864+:10F3C0001062000730A20005144000B524040001BB
63865+:10F3D0000E000D21000020210A0014BB0040202156
63866+:10F3E00030A200051040000930A30012108000ACCC
63867+:10F3F000240400018E2300088F620054146200A9C7
63868+:10F400008FBF00340A00142C240400382402001298
63869+:10F41000146200A3240400010220202127A500106B
63870+:10F420000E000CB2AFA000101040001102402021CD
63871+:10F430008E220008AF620084AF6000400E0013020D
63872+:10F44000000000009362007D024020213442002031
63873+:10F450000E00130BA362007D0E000CA902402021B8
63874+:10F46000240400382405008D0A0014B82406001274
63875+:10F470009362003E304200081040000F8FA200103F
63876+:10F4800030420100104000078FA300148F6200601B
63877+:10F490000062102304430008AF6300600A001441B7
63878+:10F4A00000000000AF6000609362003E2403FFF79D
63879+:10F4B00000431024A362003E9362003E30420008E5
63880+:10F4C000144000022406000300003021936200343F
63881+:10F4D000936300378F640084304200FF306300FF85
63882+:10F4E00000661821000318800043282100A4202B67
63883+:10F4F0001080000B000000009763003C8F620084C6
63884+:10F500003063FFFF004510230062182B14600004D5
63885+:10F51000000000008F6200840A00145D0045802313
63886+:10F520009762003C3050FFFF8FA300103062000450
63887+:10F5300010400004000628808FA2001C0A001465F9
63888+:10F540000202102B2E02021850400003240202185F
63889+:10F550000A00146E020510233063000410600003DB
63890+:10F56000004510238FA2001C00451023004080217D
63891+:10F570002C42008054400001241000800E00130231
63892+:10F580000240202124020001AF62000C9362003E81
63893+:10F59000001020403042007FA362003E8E22000413
63894+:10F5A00024420001AF620040A770003C8F6200500F
63895+:10F5B0009623000E00431021AF6200588F62005066
63896+:10F5C00000441021AF62005C8E220004AF6200187C
63897+:10F5D0008E220008AF62001C8FA20010304200088B
63898+:10F5E0005440000A93A20020A360003693620036C4
63899+:10F5F0002403FFDFA36200359362003E0043102422
63900+:10F60000A362003E0A0014988E220008A36200350F
63901+:10F610008E220008AF62004C8F6200248F6300408E
63902+:10F6200000431021AF6200489362000024030050A1
63903+:10F63000304200FF144300122403FF803C02080004
63904+:10F640008C4231A00242102100431024AF42002816
63905+:10F650003C0208008C4231A08E2400083C03000CC0
63906+:10F66000024210213042007F03421021004310214A
63907+:10F67000AC4400D88E230008AF820014AC4300DCF9
63908+:10F680000E00130B02402021240400380000282122
63909+:10F690002406000A0E0013C9000000002404000123
63910+:10F6A0008FBF00348FB200308FB1002C8FB0002894
63911+:10F6B0000080102103E0000827BD003827BDFFF8B7
63912+:10F6C00027420180AFA20000308A00FF8F4201B8BC
63913+:10F6D0000440FFFE000000008F4601283C020800A5
63914+:10F6E0008C4231A02403FF80AF86004800C2102165
63915+:10F6F00000431024AF4200243C0208008C4231A099
63916+:10F700008FA900008FA8000000C210213042007FA6
63917+:10F71000034218213C02000A00621821946400D4BC
63918+:10F720008FA700008FA5000024020002AF83001401
63919+:10F73000A0A2000B8FA30000354260003084FFFFC1
63920+:10F74000A4E200083C021000AD260000AD04000455
63921+:10F75000AC60002427BD0008AF4201B803E00008F8
63922+:10F76000240200018F88003C938200288F830014BC
63923+:10F770003C07080024E7779800481023304200FF38
63924+:10F78000304900FC246500888F860040304A000321
63925+:10F790001120000900002021248200048CA3000015
63926+:10F7A000304400FF0089102AACE3000024A50004C7
63927+:10F7B0001440FFF924E70004114000090000202153
63928+:10F7C0002482000190A30000304400FF008A102B27
63929+:10F7D000A0E3000024A500011440FFF924E7000184
63930+:10F7E00030C20003144000048F85003C3102000346
63931+:10F7F0001040000D0000000010A0000900002021B2
63932+:10F800002482000190C30000304400FF0085102BCB
63933+:10F81000A0E3000024C600011440FFF924E7000122
63934+:10F8200003E00008000000001100FFFD000020219F
63935+:10F83000248200048CC30000304400FF0088102B99
63936+:10F84000ACE3000024C600041440FFF924E70004E0
63937+:10F8500003E00008000000008F83003C9382002832
63938+:10F8600030C600FF30A500FF00431023304300FFE7
63939+:10F870008F820014008038210043102114C0000240
63940+:10F88000244800880083382130E20003144000053A
63941+:10F8900030A2000314400003306200031040000D4A
63942+:10F8A0000000000010A000090000202124820001B7
63943+:10F8B00090E30000304400FF0085102BA1030000FE
63944+:10F8C00024E700011440FFF92508000103E00008C7
63945+:10F8D0000000000010A0FFFD000020212482000491
63946+:10F8E0008CE30000304400FF0085102BAD030000C6
63947+:10F8F00024E700041440FFF92508000403E0000891
63948+:10F90000000000000080482130AAFFFF30C600FF41
63949+:10F9100030E7FFFF274801808F4201B80440FFFE17
63950+:10F920008F820048AD0200008F420124AD02000426
63951+:10F930008D220020A5070008A102000A240200165B
63952+:10F94000A102000B934301208D2200088D240004A6
63953+:10F95000306300FF004310219783003A00441021D8
63954+:10F960008D250024004310233C0308008C6331A044
63955+:10F970008F840014A502000C246300E82402FFFF1A
63956+:10F98000A50A000EA5030010A5060012AD0500187B
63957+:10F99000AD020024948201142403FFF73042FFFFDC
63958+:10F9A000AD0200288C820118AD02002C3C02100030
63959+:10F9B000AD000030AF4201B88D220020004310247A
63960+:10F9C00003E00008AD2200208F82001430E7FFFF23
63961+:10F9D00000804821904200D330A5FFFF30C600FFD1
63962+:10F9E0000002110030420F0000E238252748018054
63963+:10F9F0008F4201B80440FFFE8F820048AD02000034
63964+:10FA00008F420124AD0200048D220020A5070008CA
63965+:10FA1000A102000A24020017A102000B9343012057
63966+:10FA20008D2200088D240004306300FF0043102164
63967+:10FA30009783003A004410218F8400140043102360
63968+:10FA40003C0308008C6331A0A502000CA505000E44
63969+:10FA5000246300E8A5030010A5060012AD00001401
63970+:10FA60008D220024AD0200188C82005CAD02001CC7
63971+:10FA70008C820058AD0200202402FFFFAD0200245A
63972+:10FA8000948200E63042FFFFAD02002894820060BD
63973+:10FA9000948300BE30427FFF3063FFFF00021200FC
63974+:10FAA00000431021AD02002C3C021000AD000030DC
63975+:10FAB000AF4201B8948200BE2403FFF700A21021D8
63976+:10FAC000A48200BE8D2200200043102403E0000821
63977+:10FAD000AD220020274301808F4201B80440FFFE81
63978+:10FAE0008F8200249442001C3042FFFF000211C0AC
63979+:10FAF000AC62000024020019A062000B3C0210005E
63980+:10FB0000AC60003003E00008AF4201B88F87002CE2
63981+:10FB100030C300FF8F4201B80440FFFE8F820048CF
63982+:10FB200034636000ACA2000093820044A0A20005F0
63983+:10FB30008CE20010A4A20006A4A300088C8200207E
63984+:10FB40002403FFF7A0A2000A24020002A0A2000BD7
63985+:10FB50008CE20000ACA200108CE20004ACA2001405
63986+:10FB60008CE2001CACA200248CE20020ACA2002895
63987+:10FB70008CE2002CACA2002C8C820024ACA20018D9
63988+:10FB80003C021000AF4201B88C82002000431024D8
63989+:10FB900003E00008AC8200208F86001427BDFFE838
63990+:10FBA000AFBF0014AFB0001090C20063304200201D
63991+:10FBB0001040000830A500FF8CC2007C2403FFDF4A
63992+:10FBC00024420001ACC2007C90C2006300431024B8
63993+:10FBD000A0C2006310A000238F830014275001806F
63994+:10FBE000020028210E0015D6240600828F82001400
63995+:10FBF000904200633042004050400019A38000440E
63996+:10FC00008F83002C8F4201B80440FFFE8F82004892
63997+:10FC1000AE02000024026082A60200082402000254
63998+:10FC2000A202000B8C620008AE0200108C62000C75
63999+:10FC3000AE0200148C620014AE0200188C62001830
64000+:10FC4000AE0200248C620024AE0200288C620028E0
64001+:10FC5000AE02002C3C021000AF4201B8A380004469
64002+:10FC60008F8300148FBF00148FB000109062006368
64003+:10FC700027BD00183042007FA06200639782003ADF
64004+:10FC80008F86003C8F850014938300280046102344
64005+:10FC9000A782003AA4A000E490A400638F820040F1
64006+:10FCA000AF83003C2403FFBF0046102100832024C3
64007+:10FCB000AF820040A0A400638F820014A04000BD6A
64008+:10FCC0008F82001403E00008A44000BE8F8A001455
64009+:10FCD00027BDFFE0AFB10014AFB000108F88003C2B
64010+:10FCE000AFBF00189389001C954200E430D100FF9B
64011+:10FCF0000109182B0080802130AC00FF3047FFFF46
64012+:10FD00000000582114600003310600FF012030215B
64013+:10FD1000010958239783003A0068102B1440003CD7
64014+:10FD20000000000014680007240200018E02002079
64015+:10FD30002403FFFB34E7800000431024AE020020C0
64016+:10FD40002402000134E70880158200053165FFFFB9
64017+:10FD50000E001554020020210A00169102002021F5
64018+:10FD60000E001585020020218F8400482743018062
64019+:10FD70008F4201B80440FFFE24020018AC6400006A
64020+:10FD8000A062000B8F840014948200E6A46200102D
64021+:10FD90003C021000AC600030AF4201B894820060B9
64022+:10FDA00024420001A4820060948200603C030800A9
64023+:10FDB0008C63318830427FFF5443000F02002021C2
64024+:10FDC000948200602403800000431024A482006019
64025+:10FDD0009082006090830060304200FF000211C2F8
64026+:10FDE00000021027000211C03063007F0062182556
64027+:10FDF000A083006002002021022028218FBF00186C
64028+:10FE00008FB100148FB000100A0015F927BD002033
64029+:10FE1000914200632403FF8000431025A142006348
64030+:10FE20009782003A3048FFFF110000209383001CA6
64031+:10FE30008F840014004B1023304600FF948300E4AD
64032+:10FE40002402EFFF0168282B00621824A48300E439
64033+:10FE500014A000038E020020010058210000302170
64034+:10FE60002403FFFB34E7800000431024AE0200208F
64035+:10FE700024020001158200053165FFFF0E001554B4
64036+:10FE8000020020210A0016B99783003A0E0015855A
64037+:10FE9000020020219783003A8F82003CA780003A1D
64038+:10FEA00000431023AF82003C9383001C8F82001418
64039+:10FEB0008FBF00188FB100148FB0001027BD002035
64040+:10FEC00003E00008A04300BD938200442403000126
64041+:10FED00027BDFFE8004330042C420020AFB00010E3
64042+:10FEE000AFBF00142410FFFE10400005274501801D
64043+:10FEF0003C0208008C4231900A0016D600461024BD
64044+:10FF00003C0208008C423194004610241440000743
64045+:10FF1000240600848F8300142410FFFF9062006287
64046+:10FF20003042000F34420040A06200620E0015D63D
64047+:10FF300000000000020010218FBF00148FB00010DD
64048+:10FF400003E0000827BD00188F83002427BDFFE0D1
64049+:10FF5000AFB20018AFB10014AFB00010AFBF001CBB
64050+:10FF60009062000D00A0902130D100FF3042007F50
64051+:10FF7000A062000D8F8500148E4300180080802140
64052+:10FF80008CA2007C146200052402000E90A2006383
64053+:10FF9000344200200A0016FFA0A200630E0016C51E
64054+:10FFA000A38200442403FFFF104300472404FFFF03
64055+:10FFB00052200045000020218E4300003C0200102A
64056+:10FFC00000621024504000043C020008020020217E
64057+:10FFD0000A00170E24020015006210245040000988
64058+:10FFE0008E45000002002021240200140E0016C5D8
64059+:10FFF000A38200442403FFFF104300332404FFFFC7
64060+:020000021000EC
64061+:100000008E4500003C02000200A2102410400016A1
64062+:100010003C0200048F8600248CC200148CC30010A4
64063+:100020008CC40014004310230044102B50400005E2
64064+:10003000020020218E43002C8CC2001010620003AD
64065+:10004000020020210A00173F240200123C02000493
64066+:1000500000A210245040001C00002021020020219A
64067+:100060000A00173F2402001300A2102410400006CB
64068+:100070008F8300248C620010504000130000202168
64069+:100080000A001739020020218C6200105040000441
64070+:100090008E42002C020020210A00173F240200118A
64071+:1000A00050400009000020210200202124020017F6
64072+:1000B0000E0016C5A38200442403FFFF1043000274
64073+:1000C0002404FFFF000020218FBF001C8FB2001806
64074+:1000D0008FB100148FB000100080102103E00008E1
64075+:1000E00027BD00208F83001427BDFFD8AFB40020A8
64076+:1000F000AFB3001CAFB20018AFB10014AFB0001026
64077+:10010000AFBF0024906200638F91002C2412FFFF88
64078+:100110003442004092250000A06200638E2200104D
64079+:100120000080982130B0003F105200060360A021EB
64080+:100130002402000D0E0016C5A38200441052005484
64081+:100140002404FFFF8F8300148E2200188C63007C30
64082+:1001500010430007026020212402000E0E0016C585
64083+:10016000A38200442403FFFF104300492404FFFF3F
64084+:1001700024040020120400048F83001490620063A2
64085+:1001800034420020A06200638F85003410A000205C
64086+:1001900000000000560400048F8200140260202139
64087+:1001A0000A0017902402000A9683000A9442006015
64088+:1001B0003042FFFF144300048F8200202404FFFD1F
64089+:1001C0000A0017B7AF82003C3C0208008C42318C19
64090+:1001D0000045102B14400006026020210000282159
64091+:1001E0000E001646240600010A0017B70000202161
64092+:1001F0002402002D0E0016C5A38200442403FFFF35
64093+:10020000104300232404FFFF0A0017B70000202139
64094+:10021000160400058F8400148E2300142402FFFFAF
64095+:100220005062001802602021948200602442000184
64096+:10023000A4820060948200603C0308008C633188D3
64097+:1002400030427FFF5443000F0260202194820060FF
64098+:100250002403800000431024A48200609082006088
64099+:1002600090830060304200FF000211C2000210279C
64100+:10027000000211C03063007F00621825A083006077
64101+:10028000026020210E0015F9240500010000202144
64102+:100290008FBF00248FB400208FB3001C8FB20018D2
64103+:1002A0008FB100148FB000100080102103E000080F
64104+:1002B00027BD00288F83001427BDFFE8AFB00010D2
64105+:1002C000AFBF0014906200638F87002C00808021F4
64106+:1002D000344200408CE60010A06200633C0308003A
64107+:1002E0008C6331B030C23FFF0043102B1040004EF2
64108+:1002F0008F8500302402FF8090A3000D004310245E
64109+:10030000304200FF504000490200202100061382C5
64110+:10031000304800032402000255020044020020215C
64111+:1003200094A2001C8F85001424030023A4A20114AE
64112+:100330008CE60000000616023042003F1043001019
64113+:100340003C0300838CE300188CA2007C1062000642
64114+:100350002402000E0E0016C5A38200442403FFFFF2
64115+:10036000104300382404FFFF8F8300149062006361
64116+:1003700034420020A06200630A0017FC8F8300242F
64117+:1003800000C31024144300078F83002490A200624E
64118+:100390003042000F34420020A0A20062A38800383F
64119+:1003A0008F8300249062000D3042007FA062000D18
64120+:1003B0008F83003410600018020020218F840030E9
64121+:1003C0008C8200100043102B1040000924020018FA
64122+:1003D000020020210E0016C5A38200442403FFFF63
64123+:1003E000104300182404FFFF0A00182400002021F5
64124+:1003F0008C820010240500010200202100431023FC
64125+:100400008F830024240600010E001646AC62001003
64126+:100410000A001824000020210E0015F9240500010F
64127+:100420000A00182400002021020020212402000DCF
64128+:100430008FBF00148FB0001027BD00180A0016C52A
64129+:10044000A38200448FBF00148FB0001000801021E1
64130+:1004500003E0000827BD001827BDFFC8AFB2002089
64131+:10046000AFBF0034AFB60030AFB5002CAFB400283A
64132+:10047000AFB30024AFB1001CAFB000188F46012805
64133+:100480003C0308008C6331A02402FF80AF86004843
64134+:1004900000C318213065007F03452821006218241D
64135+:1004A0003C02000AAF43002400A2282190A200626F
64136+:1004B00000809021AF850014304200FF000211023D
64137+:1004C000A382003890A200BC304200021440000217
64138+:1004D00024030034240300308F820014A3830028F7
64139+:1004E000938300388C4200C0A3800044AF82003C5C
64140+:1004F000240200041062031C8F84003C8E4400041C
64141+:10050000508003198F84003C8E4200103083FFFF1F
64142+:10051000A784003A106002FFAF8200408F8400146D
64143+:100520002403FF809082006300621024304200FFA9
64144+:10053000144002CF9785003A9383003824020002CA
64145+:1005400030B6FFFF14620005000088219382002866
64146+:100550002403FFFD0A001B19AF82003C8F82003C80
64147+:1005600002C2102B144002A18F8400400E0014EC34
64148+:1005700000000000938300283C040800248477983E
64149+:10058000240200341462002EAF84002C3C0A0800C0
64150+:100590008D4A77C82402FFFFAFA2001000803821E7
64151+:1005A0002405002F3C09080025297398240800FF22
64152+:1005B0002406FFFF90E2000024A3FFFF00062202B2
64153+:1005C00000C21026304200FF0002108000491021B6
64154+:1005D0008C420000306500FF24E7000114A8FFF5FD
64155+:1005E0000082302600061027AFA20014AFA2001030
64156+:1005F0000000282127A7001027A6001400C51023FB
64157+:100600009044000324A2000100A71821304500FFF8
64158+:100610002CA200041440FFF9A06400008FA2001077
64159+:100620001142000724020005024020210E0016C5D9
64160+:10063000A38200442403FFFF104300642404FFFF4F
64161+:100640003C0208009042779C104000098F82001401
64162+:10065000024020212402000C0E0016C5A382004493
64163+:100660002403FFFF104300592404FFFF8F8200146E
64164+:10067000A380001C3C0308008C63779C8C440080A2
64165+:100680003C0200FF3442FFFF006218240083202B4D
64166+:1006900010800008AF83003402402021240200199A
64167+:1006A0000E0016C5A38200442403FFFF1043004739
64168+:1006B0002404FFFF8F87003C9782003A8F85003427
64169+:1006C000AF8700200047202310A0003BA784003AFA
64170+:1006D0008F86001430A200030002102390C300BCD8
64171+:1006E0003050000300B0282100031882307300014D
64172+:1006F0000013108000A228213C0308008C6331A065
64173+:100700008F8200483084FFFF0085202B004310219A
64174+:1007100010800011244200888F84002C1082000E6B
64175+:100720003C033F013C0208008C42779800431024B0
64176+:100730003C0325001443000630E500FF8C820000D6
64177+:10074000ACC200888C8200100A0018E9ACC2009884
64178+:100750000E001529000030219382001C8F850014A3
64179+:100760008F830040020238218F82003CA387001C47
64180+:1007700094A400E4006218218F82003434841000B5
64181+:10078000AF83004000503021A4A400E41260000EAA
64182+:10079000AF86003C24E20004A382001C94A200E483
64183+:1007A00024C30004AF83003C34422000A4A200E430
64184+:1007B0000A001906000020218F820040AF80003C13
64185+:1007C00000471021AF820040000020212414FFFFC9
64186+:1007D000109402112403FFFF3C0808008D0877A83D
64187+:1007E0003C0208008C4231B03C03080090637798CB
64188+:1007F00031043FFF0082102B1040001B3067003F88
64189+:100800003C0208008C4231A88F83004800042180FC
64190+:1008100000621821006418213062007F0342282101
64191+:100820003C02000C00A228213C020080344200015E
64192+:100830003066007800C230252402FF800062102458
64193+:10084000AF42002830640007AF4208048F820014D2
64194+:100850000344202124840940AF460814AF850024B6
64195+:10086000AF840030AC4301189383003824020003A6
64196+:10087000146201CF240200012402002610E201D1FB
64197+:1008800028E2002710400013240200322402002234
64198+:1008900010E201CC28E200231040000824020024CA
64199+:1008A0002402002010E201B82402002110E20147D6
64200+:1008B000024020210A001AFB2402000B10E201C1B1
64201+:1008C0002402002510E20010024020210A001AFB39
64202+:1008D0002402000B10E201AE28E2003310400006B3
64203+:1008E0002402003F2402003110E2009A024020213D
64204+:1008F0000A001AFB2402000B10E201A5024020218D
64205+:100900000A001AFB2402000B8F90002C3C03080005
64206+:100910008C6331B08F8500308E0400100000A82158
64207+:100920008CB3001430823FFF0043102B8CB10020A9
64208+:100930005040018F0240202190A3000D2402FF802F
64209+:1009400000431024304200FF504001890240202122
64210+:10095000000413823042000314400185024020212C
64211+:1009600094A3001C8F8200148E040028A443011459
64212+:100970008CA20010026218231064000302402021A0
64213+:100980000A00197C2402001F8F82003400621021AB
64214+:100990000262102B104000088F83002402402021A7
64215+:1009A000240200180E0016C5A382004410540174DE
64216+:1009B0002404FFFF8F8300248F8400348C62001096
64217+:1009C0000224882100441023AC6200108F8200149E
64218+:1009D000AC7100208C4200680051102B10400009BF
64219+:1009E0008F830030024020212402001D0E0016C516
64220+:1009F000A38200442403FFFF104301612404FFFF8E
64221+:100A00008F8300308E0200248C6300241043000783
64222+:100A1000024020212402001C0E0016C5A3820044BF
64223+:100A20002403FFFF104301562404FFFF8F8400249A
64224+:100A30008C82002424420001AC8200241233000482
64225+:100A40008F8200148C4200685622000E8E02000035
64226+:100A50008E0200003C030080004310241440000D6F
64227+:100A60002402001A024020210E0016C5A382004471
64228+:100A70002403FFFF104301422404FFFF0A0019BAB8
64229+:100A80008E0200143C0300800043102450400003F9
64230+:100A90008E020014AC8000208E0200142411FFFF8F
64231+:100AA0001051000E3C0308003C0208008C423190BB
64232+:100AB000004310242403001B14400007A3830044B8
64233+:100AC0000E0016C5024020211051012D2404FFFF05
64234+:100AD0000A0019CB8E030000A38000448E0300009F
64235+:100AE0003C02000100621024104000123C02008011
64236+:100AF0000062102414400008024020212402001A41
64237+:100B00000E0016C5A38200442403FFFF1043011CFE
64238+:100B10002404FFFF02402021020028210E0016E5D8
64239+:100B2000240600012403FFFF104301152404FFFFE6
64240+:100B3000241500018F83002402A0302102402021CF
64241+:100B40009462003624050001244200010A001ADFE5
64242+:100B5000A46200368F90002C3C0308008C6331B0F7
64243+:100B60008E13001032623FFF0043102B10400089AB
64244+:100B70008F8400302402FF809083000D00431024F6
64245+:100B8000304200FF104000842402000D0013138245
64246+:100B900030420003240300011443007F2402000DAF
64247+:100BA0009082000D30420008544000048F820034CF
64248+:100BB000024020210A001A102402002450400004A0
64249+:100BC0008E03000C024020210A001A102402002784
64250+:100BD0008C82002054620006024020218E0300080F
64251+:100BE0008C820024506200098E02001402402021F1
64252+:100BF000240200200E0016C5A38200441054007188
64253+:100C00002403FFFF0A001A458F8400242411FFFFEC
64254+:100C1000145100048F860014024020210A001A405B
64255+:100C2000240200258E0300188CC2007C1062000391
64256+:100C30002402000E0A001A40024020218E030024E4
64257+:100C40008C82002810620003240200210A001A404E
64258+:100C5000024020218E0500288C82002C10A2000367
64259+:100C60002402001F0A001A40024020218E03002C9B
64260+:100C700014600003240200230A001A4002402021CD
64261+:100C80008CC200680043102B104000032402002691
64262+:100C90000A001A40024020218C82001400651821AD
64263+:100CA0000043102B104000088F84002402402021B4
64264+:100CB000240200220E0016C5A382004410510041F8
64265+:100CC0002403FFFF8F8400242403FFF79082000D8C
64266+:100CD00000431024A082000D8F8600143C030800FE
64267+:100CE0008C6331AC8F82004894C400E08F8500246F
64268+:100CF0000043102130847FFF000420400044102175
64269+:100D00003043007F034320213C03000E0083202159
64270+:100D10002403FF8000431024AF42002CA493000062
64271+:100D20008CA2002824420001ACA200288CA2002C36
64272+:100D30008E03002C00431021ACA2002C8E02002C4C
64273+:100D4000ACA200308E020014ACA2003494A2003A8F
64274+:100D500024420001A4A2003A94C600E03C0208002C
64275+:100D60008C4231B024C4000130837FFF1462000F35
64276+:100D700000803021240280000082302430C2FFFF36
64277+:100D8000000213C2304200FF000210270A001A7E40
64278+:100D9000000233C02402000D024020210E0016C5BF
64279+:100DA000A38200440A001A84004018218F82001494
64280+:100DB00002402021240500010E0015F9A44600E0A0
64281+:100DC000000018210A001B16006088218F90002C5B
64282+:100DD0003C0308008C6331B08E05001030A23FFF49
64283+:100DE0000043102B104000612402FF808F840030EC
64284+:100DF0009083000D00431024304200FF5040005CFF
64285+:100E0000024020218F8200341040000B0005138225
64286+:100E10008F8200149763000A944200603042FFFF03
64287+:100E200014430005000513828F8200202404FFFD77
64288+:100E30000A001AF3AF82003C304200031440000E57
64289+:100E40000000000092020002104000058E03002402
64290+:100E500050600015920300030A001AAF02402021DF
64291+:100E60008C82002450620010920300030240202173
64292+:100E70000A001AB72402000F9082000D30420008C9
64293+:100E80005440000992030003024020212402001074
64294+:100E90000E0016C5A38200442403FFFF1043003850
64295+:100EA0002404FFFF92030003240200025462000C9A
64296+:100EB000920200038F820034544000099202000322
64297+:100EC000024020212402002C0E0016C5A3820044FB
64298+:100ED0002403FFFF1043002A2404FFFF92020003B3
64299+:100EE0000200282102402021384600102CC60001B3
64300+:100EF0002C4200010E0016E5004630252410FFFFAD
64301+:100F00001050001F2404FFFF8F8300341060001373
64302+:100F1000024020213C0208008C42318C0043102BFF
64303+:100F200014400007000000000000282124060001F2
64304+:100F30000E001646000000000A001AF300002021EF
64305+:100F40002402002D0E0016C5A38200441050000C90
64306+:100F50002404FFFF0A001AF3000020210E0015F9F7
64307+:100F6000240500010A001AF300002021024020217C
64308+:100F70002402000D0E0016C5A3820044004020216B
64309+:100F80000A001B16008088211514000E00000000C6
64310+:100F90000E00174C024020210A001B160040882139
64311+:100FA0000E0016C5A38200440A001B1600408821CB
64312+:100FB00014620017022018212402002314E2000505
64313+:100FC0002402000B0E0017C0024020210A001B164D
64314+:100FD0000040882102402021A38200440E0016C553
64315+:100FE0002411FFFF0A001B170220182130A500FF63
64316+:100FF0000E001529240600019783003A8F82003CD9
64317+:10100000A780003A00431023AF82003C0220182141
64318+:101010001220003E9782003A2402FFFD5462003EF7
64319+:101020008E4300208E4200048F830014005610234C
64320+:10103000AE420004906200633042007FA062006311
64321+:101040008E4200208F840014A780003A34420002B0
64322+:10105000AE420020A48000E4908200632403FFBF1E
64323+:1010600000431024A08200630A001B598E43002015
64324+:101070009082006300621024304200FF1040002381
64325+:101080009782003A90820088908300BD2485008872
64326+:101090003042003F2444FFE02C820020A383001C48
64327+:1010A00010400019AF85002C2402000100821804B2
64328+:1010B000306200191440000C3C02800034420002EF
64329+:1010C000006210241440000B306200201040000F1A
64330+:1010D0009782003A90A600010240202124050001D9
64331+:1010E0000A001B5330C60001024020210A001B5297
64332+:1010F00024050001024020210000282124060001CF
64333+:101100000E001646000000009782003A1440FD04CD
64334+:101110008F8400148E4300203062000410400012BF
64335+:101120008F84003C2402FFFB00621024AE420020AA
64336+:10113000274301808F4201B80440FFFE8F820048A0
64337+:10114000AC6200008F420124AC6200042402608380
64338+:10115000A462000824020002A062000B3C021000FE
64339+:10116000AF4201B88F84003C8F8300148FBF0034DE
64340+:101170008FB600308FB5002C8FB400288FB30024B9
64341+:101180008FB200208FB1001C8FB000182402000124
64342+:1011900027BD003803E00008AC6400C030A500FFA4
64343+:1011A0002403000124A900010069102B1040000C49
64344+:1011B00000004021240A000100A31023004A380443
64345+:1011C00024630001308200010069302B10400002CE
64346+:1011D000000420420107402554C0FFF800A310235B
64347+:1011E00003E00008010010213C020800244260A432
64348+:1011F0003C010800AC22738C3C02080024425308D6
64349+:101200003C010800AC2273902402000627BDFFE0D9
64350+:101210003C010800A02273943C021EDCAFB200180F
64351+:10122000AFB10014AFBF001CAFB0001034526F411B
64352+:1012300000008821240500080E001B7A02202021CE
64353+:10124000001180803C07080024E773980002160014
64354+:1012500002071821AC6200000000282124A200012E
64355+:101260003045FFFF8C6200002CA6000804410002FC
64356+:10127000000220400092202614C0FFF8AC64000059
64357+:10128000020780218E0400000E001B7A2405002036
64358+:10129000262300013071FFFF2E2301001460FFE5BB
64359+:1012A000AE0200008FBF001C8FB200188FB1001477
64360+:1012B0008FB0001003E0000827BD002027BDFFD835
64361+:1012C000AFB3001CAFB20018AFBF0020AFB1001425
64362+:1012D000AFB000108F5101408F48014800089402C0
64363+:1012E000324300FF311300FF8F4201B80440FFFE7C
64364+:1012F00027500180AE1100008F420144AE0200046D
64365+:1013000024020002A6120008A202000B240200140C
64366+:10131000AE1300241062002528620015104000085A
64367+:101320002402001524020010106200302402001272
64368+:10133000106200098FBF00200A001CB58FB3001C8B
64369+:101340001062007024020022106200378FBF00205C
64370+:101350000A001CB58FB3001C3C0208008C4231A06F
64371+:101360002403FF800222102100431024AF420024F6
64372+:101370003C0208008C4231A0022210213042007F42
64373+:10138000034218213C02000A00621821166000BCCA
64374+:10139000AF830014906200623042000F344200308C
64375+:1013A000A06200620A001CB48FBF00203C046000F1
64376+:1013B0008C832C083C02F0033442FFFF00621824A7
64377+:1013C000AC832C083C0208008C4231A08C832C0892
64378+:1013D000244200740002108200021480006218256A
64379+:1013E000AC832C080A001CB48FBF00203C0208000C
64380+:1013F0008C4231A02403FF800222102100431024DC
64381+:10140000AF4200243C0208008C4231A03C03000A99
64382+:10141000022210213042007F03421021004310219C
64383+:101420000A001CB3AF8200143C0208008C4231A0B9
64384+:101430002405FF800222102100451024AF42002421
64385+:101440003C0208008C4231A0022210213042007F71
64386+:10145000034218213C02000A0062182190620063D6
64387+:1014600000A21024304200FF10400085AF8300141A
64388+:1014700024620088944300123C0208008C4231A888
64389+:1014800030633FFF00031980022210210043102126
64390+:101490003043007F03432021004510243C03000C0F
64391+:1014A00000832021AF4200289082000D00A210246A
64392+:1014B000304200FF10400072AF8400249082000D83
64393+:1014C000304200101440006F8FBF00200E0015C87E
64394+:1014D000000000008F4201B80440FFFE0000000041
64395+:1014E000AE1100008F420144AE020004240200024B
64396+:1014F000A6120008A202000BAE1300240A001CB4BE
64397+:101500008FBF00202406FF8002261024AF42002057
64398+:101510003C0208008C4231A031043FFF00042180CE
64399+:101520000222102100461024AF4200243C03080090
64400+:101530008C6331A83C0208008C4231A03227007F26
64401+:101540000223182102221021006418213042007F5A
64402+:101550003064007F034228213C02000A0066182400
64403+:1015600000A22821034420213C02000C00822021FB
64404+:10157000AF4300283C020008034718210062902175
64405+:10158000AF850014AF8400240E0015C8010080212F
64406+:101590008F4201B80440FFFE8F8200248F84001424
64407+:1015A000274501809042000DACB10000A4B00006B8
64408+:1015B000000216000002160300021027000237C2C4
64409+:1015C00014C00016248200889442001232033FFFA8
64410+:1015D00030423FFF14430012240260829083006374
64411+:1015E0002402FF8000431024304200FF5040000CD2
64412+:1015F00024026082908200623042000F3442004038
64413+:10160000A082006224026084A4A200082402000DCB
64414+:10161000A0A200050A001C9E3C0227002402608252
64415+:10162000A4A20008A0A000053C02270000061C00A0
64416+:101630000062182524020002A0A2000BACA3001037
64417+:10164000ACA00014ACA00024ACA00028ACA0002CDE
64418+:101650008E42004C8F840024ACA200189083000DB1
64419+:101660002402FF8000431024304200FF1040000598
64420+:101670008FBF00209082000D3042007FA082000DBD
64421+:101680008FBF00208FB3001C8FB200188FB10014E1
64422+:101690008FB000103C02100027BD002803E00008B6
64423+:1016A000AF4201B80800343008003430080033A8D5
64424+:1016B000080033E0080034140800343808003438D7
64425+:1016C00008003438080033180A0001240000000024
64426+:1016D000000000000000000D747061362E322E33C1
64427+:1016E00000000000060203010000000000000000EE
64428+:1016F00000000000000000000000000000000000EA
64429+:1017000000000000000000000000000000000000D9
64430+:1017100000000000000000000000000000000000C9
64431+:1017200000000000000000000000000000000000B9
64432+:1017300000000000000000000000000000000000A9
64433+:101740000000000000000000000000000000000099
64434+:101750000000000000000000000000001000000376
64435+:10176000000000000000000D0000000D3C02080019
64436+:1017700024421C003C03080024632094AC40000079
64437+:101780000043202B1480FFFD244200043C1D080070
64438+:1017900037BD2FFC03A0F0213C1008002610049058
64439+:1017A0003C1C0800279C1C000E00015C000000008F
64440+:1017B0000000000D3084FFFF308200078F85001885
64441+:1017C00010400002248300073064FFF800853021B8
64442+:1017D00030C41FFF03441821247B4000AF85001C48
64443+:1017E000AF84001803E00008AF4400843084FFFF9A
64444+:1017F000308200078F8500208F860028104000026D
64445+:10180000248300073064FFF8008520210086182B10
64446+:1018100014600002AF8500240086202303442821A1
64447+:1018200034068000AF840020AF44008000A6202151
64448+:1018300003E00008AF84003827BDFFD8AFB3001C19
64449+:10184000AFB20018AFB00010AFBF0024AFB400209B
64450+:10185000AFB100143C0860088D1450002418FF7FBD
64451+:101860003C1A8000029898243672380CAD12500051
64452+:101870008F5100083C07601C3C08600036300001B6
64453+:10188000AF500008AF800018AF400080AF40008428
64454+:101890008CE600088D0F08083C0760168CEC0000F1
64455+:1018A00031EEFFF039CA00103C0DFFFF340B800011
64456+:1018B0003C030080034B48212D440001018D282466
64457+:1018C0003C0253533C010800AC230420AF8900388C
64458+:1018D000AF860028AF840010275B400014A20003ED
64459+:1018E00034E37C008CF90004032818218C7F007CF1
64460+:1018F0008C6500783C0280003C0B08008D6B048CEA
64461+:101900003C0A08008D4A048834520070AF85003CC0
64462+:10191000AF9F00403C13080026731C440240A021E6
64463+:101920008E4800008F46000038C30001306400017B
64464+:1019300010800017AF880034028048218D2F0000EE
64465+:101940003C0508008CA5045C3C1808008F1804585E
64466+:1019500001E8102300A280210000C8210202402BD0
64467+:1019600003198821022838213C010800AC30045CAE
64468+:101970003C010800AC2704588F4E000039CD00010F
64469+:1019800031AC00011580FFED01E04021AF8F003444
64470+:101990008E5100003C0708008CE7045C3C0D0800F9
64471+:1019A0008DAD04580228802300F0602100007021D2
64472+:1019B0000190302B01AE1821006620213C01080067
64473+:1019C000AC2C045C3C010800AC2404588F46010890
64474+:1019D0008F47010030C92000AF860000AF87000CA0
64475+:1019E0001120000A00C040213C1808008F18042C68
64476+:1019F000270800013C010800AC28042C3C184000DA
64477+:101A0000AF5801380A000196000000009749010410
64478+:101A100000002821014550213122FFFF0162582199
64479+:101A20000162F82B015F502130D902003C0108000F
64480+:101A3000AC2B048C3C010800AC2A0488172000154C
64481+:101A400024040F0010E400130000000024080D001F
64482+:101A500010E8023B30CD000611A0FFE93C18400021
64483+:101A6000936E00002409001031C400F01089027147
64484+:101A700024020070108202E58F880014250F0001F7
64485+:101A8000AF8F00143C184000AF5801380A0001968F
64486+:101A900000000000974C01041180FFD93C18400061
64487+:101AA00030C34000146000A1000000008F460178A0
64488+:101AB00004C0FFFE8F87003824100800240F0008A0
64489+:101AC0008CE30008AF500178A74F0140A7400142C6
64490+:101AD000974E01048F86000031C9FFFF30CD000111
64491+:101AE00011A002E1012040212531FFFE241800024F
64492+:101AF000A75801463228FFFFA75101483C190800AA
64493+:101B00008F39043C172002D08F8C000C30DF00206E
64494+:101B100017E00002240400092404000130C20C0074
64495+:101B2000240504005045000134840004A744014A00
64496+:101B30003C1108008E3104203C1800483C10000184
64497+:101B40000238182530CF00020070282511E000046B
64498+:101B5000000018213C19010000B9282524030001C8
64499+:101B600030DF000453E00005AF8300083C0600109E
64500+:101B700000A6282524030001AF830008AF4510000C
64501+:101B80000000000000000000000000000000000055
64502+:101B90008F83000810600023000000008F451000B4
64503+:101BA00004A1FFFE000000001060001E0000000005
64504+:101BB0008F4410003C0C0020008C102410400019B1
64505+:101BC0008F8E000031CD000211A000160000000031
64506+:101BD000974F101415E000130000000097591008EB
64507+:101BE0003338FFFF271100060011188200033080F0
64508+:101BF00000C7282132300001322300031200032CD9
64509+:101C00008CA200000000000D00C7F821AFE2000028
64510+:101C10003C0508008CA5043024A600013C01080006
64511+:101C2000AC2604308F6D00003402FFFFAF8D00043E
64512+:101C30008CEC0000118202A6000020218CED000037
64513+:101C400031AC01001180028A000000003C02080053
64514+:101C50008C4204743C0308008C63044C3C1F080055
64515+:101C60008FFF04703C1808008F1804480048382182
64516+:101C70000068802100E8282B03E430210208402B73
64517+:101C80000304882100C57021022878213C01080046
64518+:101C9000AC30044C3C010800AC2F04483C01080067
64519+:101CA000AC2704743C010800AC2E04708F8400182B
64520+:101CB0000120302131290007249F000833F91FFF3C
64521+:101CC00003594021AF84001CAF990018251B400028
64522+:101CD000AF590084112000038F83002024C2000725
64523+:101CE0003046FFF88F84002800C3282100A4302B41
64524+:101CF00014C00002AF83002400A428230345602100
64525+:101D0000340D8000018D10213C0F1000AF850020A4
64526+:101D1000AF820038AF450080AF4F01788F88001444
64527+:101D2000250F00010A0001EFAF8F00148F62000839
64528+:101D30008F670000240500300007760231C300F0F1
64529+:101D4000106500A7240F0040546FFF4C8F880014CB
64530+:101D50008F4B01780560FFFE0000000030CA0200D2
64531+:101D600015400003000612820000000D00061282DA
64532+:101D7000304D0003000D4900012D18210003808023
64533+:101D8000020D402100086080019380218E1F000019
64534+:101D900017E00002000000000000000D8F6E00043C
64535+:101DA00005C202BD92070006920E000592020004D1
64536+:101DB0003C090001000E18800070F8218FED00181A
64537+:101DC000277100082448000501A96021000830821D
64538+:101DD000AFEC0018022020210E00059E26050014FD
64539+:101DE000920A00068F7900043C0B7FFF000A2080D6
64540+:101DF000009178218DF800043566FFFF0326282422
64541+:101E000003053821ADE70004920E0005920D000491
64542+:101E1000960C0008000E10800051C8218F2300008E
64543+:101E2000974901043C07FFFF006758243128FFFF52
64544+:101E3000010DF82103EC50233144FFFF01643025EC
64545+:101E4000AF260000920300072418000110780275E5
64546+:101E5000240F0003106F0285000000008E050010A3
64547+:101E60002419000AA7590140A7450142921800040D
64548+:101E70008F860000240F0001A7580144A7400146A7
64549+:101E80009747010430D100023C050041A7470148B3
64550+:101E900000001821A74F014A1220000330CB000494
64551+:101EA0003C0501412403000151600005AF83000897
64552+:101EB0003C06001000A6282524030001AF8300087B
64553+:101EC000AF4510000000000000000000000000000E
64554+:101ED000000000008F8A000811400004000000008C
64555+:101EE0008F4410000481FFFE000000008F6B000093
64556+:101EF000920800043C1108008E310444AF8B0004AA
64557+:101F000097590104311800FF3C0E08008DCE0440A3
64558+:101F10003325FFFF0305382102276021000010212F
64559+:101F2000250F000A31E8FFFF0187482B01C2682115
64560+:101F300001A9F821311000073C010800AC2C044431
64561+:101F40003C010800AC3F0440120000038F8C0018D5
64562+:101F50002506000730C8FFF8010C682131BF1FFFBC
64563+:101F6000AF8C001CAF9F0018AF5F00849744010442
64564+:101F7000035F80213084FFFF308A00071140000397
64565+:101F8000261B4000248900073124FFF88F8200209F
64566+:101F90008F850028008220210085702B15C000024B
64567+:101FA000AF820024008520233C0B08008D6B048C3D
64568+:101FB0003C0A08008D4A04880344882134038000C9
64569+:101FC000022310213C0F1000AF840020AF820038A4
64570+:101FD000AF440080AF4F01780A0002968F8800144A
64571+:101FE0008F5001780600FFFE30D10200162000035A
64572+:101FF000000612820000000D00061282305F00030E
64573+:10200000001F1900007F302100062080009FC8219A
64574+:1020100000194880013380218E180000130000024F
64575+:10202000000000000000000D8F6C000C058001FB1B
64576+:102030008F870038240E0001AE0E00008CE30008EC
64577+:10204000A20000078F65000400055402314D00FF17
64578+:1020500025A80005000830822CCB00411560000245
64579+:10206000A20A00040000000D8F7800043C03FFFF6B
64580+:1020700000E02821330BFFFF256C000B000C1082C1
64581+:1020800000022080008748218D3F000026040014B4
64582+:10209000A618000803E3C8240E00059EAD39000011
64583+:1020A0008F4F01083C11100001F1382410E001AB02
64584+:1020B00000000000974D01049208000725AAFFECDC
64585+:1020C000350600023144FFFFA2060007960600080D
64586+:1020D0002CC7001354E0000592030007921100077B
64587+:1020E000362F0001A20F00079203000724180001F9
64588+:1020F000107801C224090003106901D58F880038C7
64589+:1021000030CBFFFF257100020011788331E400FF1E
64590+:1021100000042880A20F000500A848218D2D000092
64591+:10212000974A01043C0EFFFF01AEF8243143FFFF44
64592+:10213000006B1023244CFFFE03ECC825AD390000D2
64593+:10214000920600053C03FFF63462FFFF30D800FF23
64594+:102150000018388000F08821922F00143C04FF7F83
64595+:102160003487FFFF31EE000F01C65821316500FFB3
64596+:1021700000055080015068218DAC00200148F821F5
64597+:10218000A20B00060182C824AE0C000CAFF9000CB3
64598+:10219000920900068E11000C032778240009C080E4
64599+:1021A0000310702195C60026030828210227202449
64600+:1021B000AE04000CADCF0020ADC60024ACA60010CC
64601+:1021C0008F8800003C0B08008D6B048C3C0A0800D3
64602+:1021D0008D4A0488241F001024190002A75F0140C3
64603+:1021E000A7400142A7400144A7590146974901046D
64604+:1021F00024070001310600022538FFFEA7580148D8
64605+:102200003C050009A747014A10C00003000018213F
64606+:102210003C05010924030001310C00045180000534
64607+:10222000AF8300083C08001000A828252403000103
64608+:10223000AF830008AF451000000000000000000060
64609+:1022400000000000000000009205000424AE00021F
64610+:1022500031CD0007000D182330620007AE020010D8
64611+:102260008F90000812000004000000008F4F100043
64612+:1022700005E1FFFE000000008F7100008F8E001846
64613+:102280003C0308008C630444AF91000497450104AB
64614+:1022900025CF001031E61FFF30A2FFFFAF8E001CDC
64615+:1022A000AF860018AF4600842449FFFE3C0C0800AE
64616+:1022B0008D8C0440974D010401208021000947C303
64617+:1022C0000070C02131A9FFFF0310F82B0188C8213D
64618+:1022D000033F202103463821313100073C0108002B
64619+:1022E000AC3804443C010800AC2404401220000334
64620+:1022F00024FB40002527000730E9FFF88F860020E7
64621+:102300008F8400280126382100E4C02B170000022A
64622+:10231000AF86002400E438230347202134198000CD
64623+:10232000009910213C0F1000AF870020AF820038C9
64624+:10233000AF470080AF4F01780A0002968F880014E3
64625+:102340009747010410E0FDAE3C1840008F5801781B
64626+:102350000700FFFE30C5400010A000033C1F00082E
64627+:102360000000000D3C1F0008AF5F01402410080072
64628+:102370008F860000AF5001789744010430D90001E6
64629+:10238000132000ED3086FFFF24CCFFFE240D000259
64630+:10239000A74D0146A74C01488F9100182408000D55
64631+:1023A000A748014A8F630000262F000831E21FFF73
64632+:1023B0000342702130C90007AF830004AF91001CB5
64633+:1023C000AF82001800C03821AF4200841120000302
64634+:1023D00025DB400024D800073307FFF88F85002055
64635+:1023E0008F84002800E5302100C4382B14E000025F
64636+:1023F000AF85002400C430238F8400140346F821E5
64637+:10240000340C8000AF86002003EC8021AF460080B2
64638+:10241000249900013C0610003C184000AF460178AA
64639+:10242000AF900038AF990014AF5801380A000196F8
64640+:10243000000000008F630000975101043067FFFF28
64641+:102440003228FFFF8F4F017805E0FFFE30EC0007D8
64642+:10245000000CF82333F0000724F9FFFE2404000ADF
64643+:10246000A7440140A7500142A7590144A740014693
64644+:10247000A74801488F45010830B800201700000226
64645+:10248000240300092403000130CD0002A743014AC0
64646+:102490003C04004111A00003000018213C0401414C
64647+:1024A0002403000130C9000451200005AF83000857
64648+:1024B0003C0600100086202524030001AF8300089D
64649+:1024C000AF44100000000000000000000000000009
64650+:1024D000000000008F8E000811C000040000000002
64651+:1024E0008F4210000441FFFE000000008F7F0000BB
64652+:1024F000276400088F91003CAF9F0004948500087A
64653+:102500009490000A9499000C30AFFFFF0010C400B3
64654+:102510003323FFFF11F100A6030320253C0E080022
64655+:102520008DCE04443C0C08008D8C044000E88821CA
64656+:102530002626FFFE01C628210000682100A6F82BF0
64657+:10254000018D2021009F80213C010800AC2504441E
64658+:102550003C010800AC30044024E200083042FFFF98
64659+:102560003047000710E000038F830018244F000756
64660+:1025700031E2FFF83106FFFF30C800070043802139
64661+:1025800032191FFF0359C021AF83001CAF990018F7
64662+:10259000271B4000AF590084110000038F8C0020DE
64663+:1025A00024C5000730A6FFF88F84002800CC28211E
64664+:1025B00000A4F82B17E00002AF8C002400A428230D
64665+:1025C000AF850020AF4500803C0408008C840434B3
64666+:1025D00003454821340E8000012E6821108000053B
64667+:1025E000AF8D0038939100172406000E12260011BB
64668+:1025F0002407043F3C021000AF4201788F8800148A
64669+:10260000250F00010A0001EFAF8F00140E0005C472
64670+:1026100000E020218F8800143C0B08008D6B048C97
64671+:102620003C0A08008D4A0488250F00010A0001EFCA
64672+:10263000AF8F00143C021000A7470148AF42017859
64673+:102640000A0004CE8F88001424040F001184003D7A
64674+:1026500030CE002015C0000224030009240300012D
64675+:102660000A00021AA743014A0A00020DA7400146C8
64676+:1026700094EF000894F1000A94F0000C8F8C003C59
64677+:10268000001174003207FFFF31EDFFFF11AC00377E
64678+:1026900001C720253C1808008F1804443C0F08008F
64679+:1026A0008DEF0440000080210308682101A8382B29
64680+:1026B00001F0702101C760213C010800AC2D0444E9
64681+:1026C0003C010800AC2C04400A00027A8F840018F8
64682+:1026D0003C0208008C42047C3C0308008C630454D8
64683+:1026E0003C1F08008FFF04783C1808008F18045026
64684+:1026F000004838210068802100E8282B03E43021BD
64685+:102700000208402B0304882100C57021022878218B
64686+:102710003C010800AC3004543C010800AC2F0450CC
64687+:102720003C010800AC27047C3C010800AC2E047876
64688+:102730000A00027A8F840018A74001460A00043577
64689+:102740008F91001830CD002015A0FFC52403000D87
64690+:10275000240300050A00021AA743014A974E010408
64691+:1027600025C5FFF00A00038130A4FFFF8F980040C9
64692+:102770001498FFC8000010213C0508008CA5046CCB
64693+:102780003C1F08008FFF046800A8C8210328302BD5
64694+:1027900003E22021008640213C010800AC39046C92
64695+:1027A0003C010800AC2804680A00027A8F840018F3
64696+:1027B0008F8C0040148CFF5900E8C8213C18080099
64697+:1027C0008F18046C3C1108008E3104682723FFFE2B
64698+:1027D00003034821000010210123302B0222702125
64699+:1027E00001C668213C010800AC29046C3C010800CA
64700+:1027F000AC2D04680A0004A524E200088F88003884
64701+:102800003C03FFFF8D02000C0043F82403E4C825BD
64702+:10281000AD19000C0A00038F30CBFFFF0A0003C381
64703+:10282000AE000000974A0104920400048E26000CBA
64704+:10283000014458212579FFF200C7C0243325FFFF4A
64705+:1028400003053825AE27000C0A0002E68E050010AD
64706+:102850003C0DFFFF8D0A0010014D582401646025D6
64707+:10286000AD0C00100A00038F30CBFFFF974301042B
64708+:10287000920E00048E290010006E1021244DFFEEF0
64709+:102880000127602431A8FFFF0188F825AE3F001022
64710+:102890000A0002E68E0500108E0F000CAE0000004C
64711+:1028A00000078880023028210A0002B8ACAF00205F
64712+:1028B0001460000D3058FFFF3C04FFFF0044682403
64713+:1028C00001A47026000E602B000D102B004CF82484
64714+:1028D00013E00002000000000000000D8CAF0000BB
64715+:1028E0000A00025001E410253B03FFFF0003882B80
64716+:1028F0000018802B0211202410800002000000002C
64717+:102900000000000D8CB900000A0002503722FFFFC2
64718+:102910003084FFFF30A5FFFF108000070000182162
64719+:10292000308200011040000200042042006518219E
64720+:102930001480FFFB0005284003E000080060102120
64721+:1029400010C00007000000008CA2000024C6FFFF9A
64722+:1029500024A50004AC82000014C0FFFB2484000402
64723+:1029600003E000080000000010A0000824A3FFFFFF
64724+:10297000AC86000000000000000000002402FFFF01
64725+:102980002463FFFF1462FFFA2484000403E00008BC
64726+:1029900000000000308EFFFF30D8FFFF00057C00F4
64727+:1029A00001F8602539CDFFFF01AC5021014C582BB7
64728+:1029B000014B4821000944023127FFFF00E8302184
64729+:1029C0000006240230C5FFFF00A418213862FFFF73
64730+:1029D00003E000083042FFFF3C0C08008D8C0484AB
64731+:1029E000240BFF8027BDFFD001845021014B4824D8
64732+:1029F000AF4900203C0808008D080484AFB20020D5
64733+:102A0000AFB00018AFBF0028AFB30024AFB1001CB7
64734+:102A1000936600040104382130E4007F009A1021FD
64735+:102A20003C0300080043902130C500200360802152
64736+:102A30003C080111277B000814A000022646007004
64737+:102A40002646006C9213000497510104920F000473
64738+:102A50003267000F322EFFFF31ED004001C72823FF
64739+:102A600011A0000500004821925900BC3338000431
64740+:102A70001700009000000000924300BC307F00046B
64741+:102A800013E0000F0000000010A0000D0000000087
64742+:102A9000960E0002240AFF8000A7602125CDFFFECC
64743+:102AA000A74D1016920B0004014B2024308200FF2A
64744+:102AB00010400085010C40253C0F0400010F40250B
64745+:102AC0008F5301780660FFFE2404000AA7440140EA
64746+:102AD000960D00022404000931AC0007000C5823B5
64747+:102AE000316A0007A74A0142960200022443FFFE12
64748+:102AF000A7430144A7400146975F0104A75F01482F
64749+:102B00008F590108333800205300000124040001CC
64750+:102B1000920F000431EE001015C000023483001043
64751+:102B200000801821A743014A0000000000000000B7
64752+:102B30000000000000000000AF481000000000008E
64753+:102B40000000000000000000000000008F51100095
64754+:102B50000621FFFE3113FFFF12600003000000009A
64755+:102B60008F481018ACC8000096030006307FFFFFA6
64756+:102B700027F900020019988200138880023B302157
64757+:102B80008CD800001520005700183402920300046E
64758+:102B90002405FF8000A3F82433F100FF1220002C4D
64759+:102BA00000000000924700BC30F2000212400028F2
64760+:102BB00000000000974B100C2562FFFEA742101684
64761+:102BC000000000003C0A040035490030AF49100005
64762+:102BD00000000000000000000000000000000000F5
64763+:102BE0008F4C10000581FFFE000000009749100C7B
64764+:102BF0008F51101C00C020213127FFFF24F200302C
64765+:102C0000001218820003288000BBF8213226FFFF43
64766+:102C1000AFF100000E0005B300112C020013C880B4
64767+:102C2000033B98218E78000000027400AFB80010BA
64768+:102C30008FA80010310FFFFFAFAF00108FA400105E
64769+:102C400001C46825AFAD00108FA60010AE6600006D
64770+:102C500097730008976D000A9766000C8F8A003CF6
64771+:102C6000000D5C0030CCFFFF3262FFFF104A0036DF
64772+:102C7000016C2025960600023C10100024D30008A9
64773+:102C80000E00013B3264FFFF974C01040E00014926
64774+:102C90003184FFFFAF5001788FBF00288FB300242D
64775+:102CA0008FB200208FB1001C8FB0001803E0000825
64776+:102CB00027BD003010A0FF700000000024A5FFFC1D
64777+:102CC0000A0005EC240900048CD10000AF51101853
64778+:102CD0008F5301780660FF7A2404000A0A00060177
64779+:102CE0000000000000A7C8218F8800388F4E101CFC
64780+:102CF0000019C0820018788001E82021AC8E000005
64781+:102D0000000E2C0200C020210E0005B331C6FFFFCB
64782+:102D1000023B28218CAD000000025400004030210D
64783+:102D2000AFAD00108FAC0010318BFFFFAFAB0010C8
64784+:102D30008FA2001001424825AFA900108FA70010F4
64785+:102D40000A000631ACA700008F8F0040148FFFC926
64786+:102D50000000000097420104960B00023C050800A9
64787+:102D60008CA5046C3049FFFF316AFFFF3C1108005D
64788+:102D70008E310468012A382124F2FFFE00B240217E
64789+:102D80000012FFC30112C82B023FC02103192021EA
64790+:102D90003C010800AC28046C3C010800AC24046829
64791+:102DA0000A00066B0000000000A4102B1040000970
64792+:102DB000240300010005284000A4102B04A00003F8
64793+:102DC000000318405440FFFC000528401060000735
64794+:102DD000000000000085302B14C0000200031842E0
64795+:102DE000008520231460FFFB0005284203E0000853
64796+:102DF000008010218F85002C27BDFFE800053027BB
64797+:102E00002CC300012CA400020083102510400003F5
64798+:102E1000AFBF00102405007FAF85002C00052827D8
64799+:102E200030A5FFFF0E000592240426F58F830030A5
64800+:102E3000240402BD004030210083382B10E000093B
64801+:102E400024050001000420400083102B04800003AF
64802+:102E5000000528405440FFFC0004204010A000085A
64803+:102E600000C350210064402B1500000200052842D9
64804+:102E70000064182314A0FFFB0004204200C350216B
64805+:102E80008FBF0010000A4C02312200FF27BD00183E
64806+:102E9000AF8A002C03E00008AF8900300A00002A46
64807+:102EA00000000000000000000000000D7478703683
64808+:102EB0002E322E3300000000060203000000000046
64809+:102EC000000001360000EA60000000000000000081
64810+:102ED00000000000000000000000000000000000F2
64811+:102EE00000000000000000000000000000000000E2
64812+:102EF00000000000000000000000000000000016BC
64813+:102F000000000000000000000000000000000000C1
64814+:102F100000000000000000000000000000000000B1
64815+:102F200000000000000000000000000000000000A1
64816+:102F3000000000000000138800000000000005DC15
64817+:102F4000000000000000000010000003000000006E
64818+:102F50000000000D0000000D3C02080024423C204F
64819+:102F60003C03080024633DD4AC4000000043202B08
64820+:102F70001480FFFD244200043C1D080037BD7FFC87
64821+:102F800003A0F0213C100800261000A83C1C0800FB
64822+:102F9000279C3C200E0002BA000000000000000D3B
64823+:102FA0008F8300383C088000350700708CE50000F6
64824+:102FB000008330253C02900000C22025AF85003000
64825+:102FC000AF4400208F4900200520FFFE3C03800015
64826+:102FD000346200708C4500008F8600303C19080078
64827+:102FE0008F39007C3C0E08008DCE007800A620238F
64828+:102FF00003245821000078210164682B01CF60214F
64829+:10300000018D50213C010800AC2B007C3C010800E4
64830+:10301000AC2A007803E00008000000000A0000412C
64831+:10302000240400018F8400383C05800034A2000194
64832+:103030000082182503E00008AF43002003E00008E9
64833+:10304000000010213084FFFF30A5FFFF1080000733
64834+:1030500000001821308200011040000200042042CC
64835+:10306000006518211480FFFB0005284003E00008DC
64836+:103070000060102110C00007000000008CA20000BA
64837+:1030800024C6FFFF24A50004AC82000014C0FFFB8F
64838+:103090002484000403E000080000000010A00008E1
64839+:1030A00024A3FFFFAC860000000000000000000029
64840+:1030B0002402FFFF2463FFFF1462FFFA248400044C
64841+:1030C00003E0000800000000308AFFFF93A800130F
64842+:1030D000A74A014497490E1630C600FF3C02100073
64843+:1030E000A7490146AF450148A3460152A748015AE6
64844+:1030F000AF4701608FA400188FA30014A7440158A4
64845+:10310000AF43015403E00008AF42017803E0000838
64846+:10311000000000003C038000346200708C49000015
64847+:103120008F8800002484000727BDFFF83084FFF853
64848+:10313000AF890030974D008A31ACFFFFAFAC000083
64849+:103140008FAB0000016850232547FFFF30E61FFFCB
64850+:1031500000C4282B14A0FFF73C0C8000358B0070B6
64851+:103160008D6A00003C0708008CE700843C060800DC
64852+:103170008CC6008000081082014918230002788064
64853+:1031800000E370210000202101C3C82B00C4C0212E
64854+:1031900001FA4021031948212502400027BD0008FB
64855+:1031A0003C010800AC2E00843C010800AC290080E2
64856+:1031B00003E00008000000008F8200002486000762
64857+:1031C00030C5FFF800A2182130641FFF03E000089B
64858+:1031D000AF8400008F8700388F8A004027BDFFB87A
64859+:1031E0008F860044AFB60040AFBF0044AFB5003C8F
64860+:1031F000AFB40038AFB30034AFB20030AFB1002C81
64861+:10320000AFB000288F4501048D4900ACAF47008066
64862+:103210008CC8002000A938230000B021AF480E1050
64863+:103220008F440E1000004821AF440E148CC20024BD
64864+:10323000AF420E188F430E18AF430E1C10E001254D
64865+:103240002D230001936B0008116000D400000000E2
64866+:10325000976E001031CDFFFF00ED602B158000CF81
64867+:103260000000000097700010320FFFFFAF4F0E00FC
64868+:103270008F520000325100081220FFFD00000000B4
64869+:1032800097540E088F460E043285FFFF30B30001BD
64870+:1032900012600132000000000000000D30B8A040B4
64871+:1032A00024150040131500C030A9A0001120012DE5
64872+:1032B00000000000937F000813E0000800000000F9
64873+:1032C00097630010306BFFFF00CB402B1100000311
64874+:1032D00030AC00401180012300000000A785003CB5
64875+:1032E000AF8600349366000800E02821AFA70020D5
64876+:1032F00014C0012427B30020AF60000C9782003C6B
64877+:103300003047400014E00002240300162403000E9E
64878+:1033100024194007A363000AAF790014938A003E82
64879+:103320008F740014315800070018AA4002959025A8
64880+:10333000AF7200149784003C8F700014309100101D
64881+:1033400002117825AF6F0014978E003C31CD000834
64882+:1033500011A00147000028218F6700143C021000D3
64883+:103360003C0C810000E22825AF65001497460E0A48
64884+:103370002408000E3405FFFC30C3FFFF006C582505
64885+:10338000AF6B0004A3680002937F000A27E90004E2
64886+:10339000A369000A9786003C9363000A30CC1F00A3
64887+:1033A000000C598301634021251F0028A37F0009D9
64888+:1033B00097490E0CA769001093790009272A00028B
64889+:1033C000315800070018A82332B10007A371000B81
64890+:1033D00093740009976400108F910034978F003C1C
64891+:1033E000329200FF024480210205702131ED00403D
64892+:1033F00011A0000531C4FFFF0091282B3C12800072
64893+:1034000010A000140000A0210224382B14E0011B9E
64894+:103410008FA500208F4D0E14AF4D0E108F420E1C45
64895+:10342000AF420E18AF440E008F4F000031EE00087F
64896+:1034300011C0FFFD0000000097540E080080882195
64897+:1034400000009021A794003C8F500E04241400012A
64898+:10345000AF900034976400103095FFFF8E68000035
64899+:103460000111F82317E00009AE7F00008F650014FA
64900+:103470008F8B004434A60040AF6600148F4C0E10B2
64901+:10348000AD6C00208F430E18AD63002493670008D5
64902+:1034900014E000D2000000000E00009E2404001082
64903+:1034A0008F8900483C08320000402821312600FF67
64904+:1034B0000006FC0003E8502525390001AF990048BB
64905+:1034C000AC4A0000937800099370000A330400FFAF
64906+:1034D00000047400320F00FF01CF6825AC4D0004DA
64907+:1034E0008F820048064000EAACA20008ACA0000CA5
64908+:1034F0009783003C306B0008156000022628000608
64909+:1035000026280002974E0E148F450E1C8F6700046C
64910+:10351000936D000231C4FFFF31A200FFAFA2001083
64911+:103520008F6C0014AFA800180E00008BAFAC001415
64912+:10353000240400100E0000C7000000008E7200007E
64913+:1035400016400005000000008F6400142405FFBF32
64914+:1035500000859824AF7300148F79000C033538214F
64915+:10356000AF67000C9375000816A00008000000006B
64916+:1035700012800006000000008F7F00143C0BEFFF5C
64917+:103580003568FFFE03E84824AF690014A3740008FF
64918+:103590008FA500200A00024602202021AF470E001E
64919+:1035A0000A0000F5000000008F5901780720FFFE97
64920+:1035B000241F08008F840000AF5F0178974B008ABA
64921+:1035C000316AFFFF014448232528FFFF31021FFF16
64922+:1035D0002C4300081460FFF9000000008F8E0048A3
64923+:1035E0008F8D003800C048210344202125C60001EA
64924+:1035F000240C0F00AF86004800E9382324864000E1
64925+:1036000031CA00FF11AC0005240800019391003E6F
64926+:103610003230000700107A4035E80001000AAC00A3
64927+:103620003C18010002B8A025AC9440008F930048DC
64928+:1036300030B2003630A40008ACD3000410800097EC
64929+:1036400001123025974E0E0A8F8D00003C0281003A
64930+:1036500031CCFFFF25AB0008018240253C03100060
64931+:1036600031651FFF25390006241F000EAF48016099
64932+:1036700000C33025A75F015AAF850000A759015844
64933+:1036800014E0000A8F93003824120F0052720002D7
64934+:103690002416000134C600408F580E108F94004449
64935+:1036A000AE9800208F550E18AE9500248F450E144D
64936+:1036B000AF4501448F590E1CAF590148A34A01522E
64937+:1036C0003C0A1000AF460154AF4A017814E0FEDD19
64938+:1036D0002D2300010076A025128000178FBF004423
64939+:1036E0008F84003824160F0010960084000000001C
64940+:1036F0008F45017804A0FFFE24150F001095006E81
64941+:10370000000000008F470E14240202403C1F1000EE
64942+:10371000AF4701448F440E1CAF440148A3400152FF
64943+:10372000A740015AAF400160A7400158AF42015481
64944+:10373000AF5F01788FBF00448FB600408FB5003C6B
64945+:103740008FB400388FB300348FB200308FB1002CAB
64946+:103750008FB0002803E0000827BD004814C0FED049
64947+:1037600030B8A0408F420E148F84004400004821DE
64948+:10377000AC8200208F510E1CAC9100240A00020E76
64949+:103780002D2300018F910034978A003C3C12800069
64950+:103790000220A821315800401700FF300000A0216E
64951+:1037A000976900108F9200343139FFFF13320035D2
64952+:1037B00000002021008048211480FEA000A03821B4
64953+:1037C0008F420E148F840044AC8200208F510E1C57
64954+:1037D000AC9100240A00020E2D230001936A000917
64955+:1037E0009378000B315000FF330F00FF020F702160
64956+:1037F00025C2000A3050FFFF0E00009E020020216B
64957+:103800008F8600483C1F410024CD0001AF8D004849
64958+:10381000936C000930C600FF00064400318300FFAE
64959+:10382000246B0002010B4825013FC825AC5900005C
64960+:103830008F67000C97440E1400F22825AC45000455
64961+:103840008F450E1C8F670004936A00023084FFFFCF
64962+:10385000315800FFAFB800108F6F0014AFB10018DF
64963+:103860000E00008BAFAF00140A0001A60200202159
64964+:10387000AF6000040A00013EA36000020A00024695
64965+:1038800000002021000090210A0001702414000192
64966+:103890003C1280000A000195ACB2000C8F91000030
64967+:1038A00025240002A744015826300008320F1FFFCC
64968+:1038B0000A0001F9AF8F0000AF40014C1120002C2D
64969+:1038C000000000008F590E10AF5901448F430E18AD
64970+:1038D000240200403C1F1000AF430148A3400152A6
64971+:1038E000A740015AAF400160A7400158AF420154C0
64972+:1038F000AF5F01780A0002278FBF00441120000645
64973+:103900000000000097460E0830CC004015800002F1
64974+:10391000000000000000000D8F4D017805A0FFFEA3
64975+:103920000000000097530E103C120500240E2000EA
64976+:10393000326AFFFF0152C025AF58014C8F4F0E1461
64977+:103940003C021000AF4F01448F500E1CAF50014895
64978+:10395000A34001528F840038A740015AAF40016054
64979+:10396000A7400158AF4E01540A000215AF4201783A
64980+:103970008F490E14AF4901448F430E1C0A00028E7A
64981+:10398000240200403C0E20FF27BDFFE03C1A8000CF
64982+:103990003C0F800835CDFFFDAFBF001CAFB2001853
64983+:1039A000AFB10014AFB00010AF8F0040AF4D0E00AC
64984+:1039B0000000000000000000000000000000000007
64985+:1039C000000000003C0C00FF358BFFFDAF4B0E00EC
64986+:1039D0003C0660048CC95000240AFF7F3C11600043
64987+:1039E000012A40243507380CACC750008E24043817
64988+:1039F00024050009AF4500083083FFFF38622F71AE
64989+:103A00002450C0B3AF8000480E000068AF800000B3
64990+:103A100052000001AE20442C0E0004353C11800001
64991+:103A20000E000ED9363000708F8A00403C1208001C
64992+:103A300026523C88020088218E0800008F5F00001B
64993+:103A40003BF900013338000113000017AF88003044
64994+:103A5000022048218D2700003C0F08008DEF006CEC
64995+:103A60003C0C08008D8C006800E8C02301F8282178
64996+:103A70000000682100B8302B018D582101664021DB
64997+:103A80003C010800AC25006C3C010800AC28006833
64998+:103A90008F44000038830001306200011440FFEDC4
64999+:103AA00000E04021AF8700308E0C00003C0508008C
65000+:103AB0008CA5006C3C0408008C84006801883023CD
65001+:103AC00000A638210000102100E6402B00821821BA
65002+:103AD0000068F8213C010800AC27006C3C0108009C
65003+:103AE000AC3F00688F49010025590088AF99004418
65004+:103AF000AF890038AF4900208E070000AF87003043
65005+:103B00008F4D017805A0FFFE000000008E0600002A
65006+:103B10003C0B08008D6B00743C0408008C84007022
65007+:103B200000C728230165F8210000102103E5402B80
65008+:103B30000082382100E8C821240908003C0108005F
65009+:103B4000AC3F00743C010800AC390070AF4901780B
65010+:103B500093580108A398003E938F003E31EE000178
65011+:103B600015C000158F830038240E0D00106E00194B
65012+:103B7000240F0F00106F001D00000000915900007D
65013+:103B800024180050332900FF113800043C1F400066
65014+:103B9000AF5F01380A0002E7000000000E00090EC6
65015+:103BA000000000008F8A00403C1F4000AF5F0138DA
65016+:103BB0000A0002E700000000938D003E31AC0006D1
65017+:103BC000000C51000E0000CE0152D8210A00034320
65018+:103BD0008F8A00403C1B0800277B3D080E0000CE6A
65019+:103BE000000000000A0003438F8A00403C1B0800CD
65020+:103BF000277B3D280E0000CE000000000A00034392
65021+:103C00008F8A004090AA00018FAB00108CAC00108E
65022+:103C10003C0300FF8D680004AD6C00208CAD0014E7
65023+:103C200000E060213462FFFFAD6D00248CA7001816
65024+:103C30003C09FF000109C024AD6700288CAE001CC0
65025+:103C40000182C82403197825AD6F0004AD6E002CE5
65026+:103C50008CAD0008314A00FFAD6D001C94A9000234
65027+:103C60003128FFFFAD68001090A70000A56000029A
65028+:103C7000A1600004A167000090A30002306200FF71
65029+:103C80000002198210600005240500011065000E75
65030+:103C90000000000003E00008A16A00018CD80028A1
65031+:103CA000354A0080AD7800188CCF0014AD6F001439
65032+:103CB0008CCE0030AD6E00088CC4002CA16A0001CF
65033+:103CC00003E00008AD64000C8CCD001CAD6D001845
65034+:103CD0008CC90014AD6900148CC80024AD680008BC
65035+:103CE0008CC70020AD67000C8CC200148C8300646C
65036+:103CF0000043C82B13200007000000008CC20014F2
65037+:103D0000144CFFE400000000354A008003E0000886
65038+:103D1000A16A00018C8200640A000399000000007F
65039+:103D200090AA000027BDFFF88FA9001CA3AA0000DD
65040+:103D30008FAE00003C0FFF808FA8001835E2FFFF18
65041+:103D40008CCD002C01C26024AFAC0000A120000487
65042+:103D500000E06021A7A000028FB800008D270004BA
65043+:103D60000188182100A0582100C05021006D28268C
65044+:103D70003C06FF7F3C0F00FF2CAD000135EEFFFF3E
65045+:103D800034D9FFFF3C02FF0003193024000D1DC091
65046+:103D9000010EC82400E2C02400C370250319782551
65047+:103DA000AD2E0000AD2F00048D450024AFAE000005
65048+:103DB000AD2500088D4D00202405FFFFAD2D000C22
65049+:103DC000956800023107FFFFAD27001091660018CB
65050+:103DD00030C200FF000219C2506000018D4500345E
65051+:103DE000AD2500148D67000827BD0008AD27001C15
65052+:103DF0008C8B00CCAD2C0028AD20002CAD2B0024EA
65053+:103E0000AD20001803E00008AD20002027BDFFE032
65054+:103E1000AFB20018AFB10014AFB00010AFBF001CBC
65055+:103E20009098000000C088213C0D00FF330F007FF8
65056+:103E3000A0CF0000908E000135ACFFFF3C0AFF00D0
65057+:103E4000A0CE000194A6001EA22000048CAB00149A
65058+:103E50008E29000400A08021016C2824012A40241E
65059+:103E60000080902101052025A6260002AE24000432
65060+:103E700026050020262400080E00007624060002F5
65061+:103E800092470000260500282624001400071E0083
65062+:103E90000003160324060004044000032403FFFF6C
65063+:103EA000965900023323FFFF0E000076AE23001068
65064+:103EB000262400248FBF001C8FB200188FB100147D
65065+:103EC0008FB0001024050003000030210A0000809C
65066+:103ED00027BD002027BDFFD8AFB1001CAFB0001830
65067+:103EE000AFBF002090A80000240200018FB0003C6A
65068+:103EF0003103003F00808821106200148FAA00382F
65069+:103F0000240B0005506B0016AFAA001000A0202162
65070+:103F100000C028210E0003DC02003021922400BCE6
65071+:103F2000308300021060000326060030ACC00000A1
65072+:103F300024C600048FBF00208FB1001C8FB0001872
65073+:103F400000C0102103E0000827BD002801403821EF
65074+:103F50000E00035AAFB000100A0004200000000059
65075+:103F60000E0003A1AFB000140A00042000000000FE
65076+:103F70003C02000A034218213C04080024843D6CE2
65077+:103F80002405001A000030210A000080AF8300548D
65078+:103F90003C038000346200708C48000000A058216F
65079+:103FA00000C04821308A00FFAF8800308F4401787C
65080+:103FB0000480FFFE3C0C8000358600708CC500003C
65081+:103FC0003C0308008C6300743C1808008F180070D4
65082+:103FD00000A82023006468210000C82101A4782BD8
65083+:103FE0000319702101CF60213C010800AC2D007441
65084+:103FF0003C010800AC2C00708F480E14AF480144FF
65085+:10400000AF47014CA34A0152A74B01589346010800
65086+:1040100030C5000854A0000135291000934B090059
65087+:1040200024070050316A00FF11470007000000001C
65088+:104030008F450E1CAF450148AF4901543C091000A3
65089+:1040400003E00008AF490178934D010831A800084A
65090+:104050001100001000000000934F010831EE001025
65091+:1040600051C00001352900083C04080090843DD06F
65092+:10407000A34401508F4309A4AF4301488F4209A0D4
65093+:10408000AF420144AF4901543C09100003E000086D
65094+:10409000AF4901783C1908008F393D8C333800084E
65095+:1040A0005700FFF1352900080A00047300000000E2
65096+:1040B00024070040AF470814AF4008108F4209445E
65097+:1040C0008F4309508F4409548F45095C8F46094C32
65098+:1040D000AF820064AF830050AF84004CAF85005CBA
65099+:1040E00003E00008AF8600609346010930C5007FF9
65100+:1040F000000518C0000521400083102103E00008DE
65101+:10410000244200883C09080091293D9124A800021E
65102+:104110003C05110000093C0000E8302500C51825C9
65103+:1041200024820008AC83000003E00008AC80000497
65104+:104130009347010B8F4A002C974F09083C18000E3B
65105+:104140000358482131EEFFFF000E41C0AF48002C5C
65106+:1041500097430908952C001A008040212403000190
65107+:10416000318BFFFFAC8B00008D2D001C00A058216F
65108+:1041700000C06021AC8D00048D24002030E7004099
65109+:10418000AD04000891220019304400031083004858
65110+:104190002885000214A00062240600021086005642
65111+:1041A00024190003109900660000000010E0003A96
65112+:1041B000000000003C07080094E73D8624E200016F
65113+:1041C000934F0934934709219525002A31EE00FFCA
65114+:1041D000000E488230ED00FF978700580009360036
65115+:1041E000000D1C003044FFFF00C310250044C02513
65116+:1041F00000A778213C19400003197025000F4C00DE
65117+:10420000AD090004AD0E0000934D09203C030006EB
65118+:1042100025090014000D360000C32025AD04000858
65119+:104220008F59092C24E5000130A27FFFAD19000C45
65120+:104230008F580930A782005825020028AD180010B9
65121+:104240008F4F0938AD0F0014AD2B00048F4E09407D
65122+:10425000AD2E0008934D09373C05080090A53D9010
65123+:104260008F4409488F46094031A700FF00EC182110
65124+:10427000008678230003C7000005CC0003196025E1
65125+:1042800031E8FFFC01885825AD2B000CAD20001053
65126+:1042900003E00008AF4A002C3C0D080095AD3D86B8
65127+:1042A0003C0E080095CE3D800A0004C901AE1021E5
65128+:1042B0003C05080094A53D8A3C06080094C63D8054
65129+:1042C0003C18080097183D7C952E002400A6782104
65130+:1042D00001F86823000E240025A2FFF200821825B1
65131+:1042E00024190800AD03000CAD190014AD00001036
65132+:1042F0000A0004C4250800189526002495250028E6
65133+:104300000006C40000057C00370E810035ED080072
65134+:10431000AD0E000CAD0D00100A0004C425080014F9
65135+:104320001480FFA200000000952400240004140063
65136+:1043300034430800AD03000C0A0004C42508001033
65137+:104340003C03080094633D8A3C05080094A53D8029
65138+:104350003C06080094C63D7C953900249538002819
65139+:10436000006520210086782300196C000018740075
65140+:1043700025E2FFEE01C2202535A3810024190800A3
65141+:10438000AD03000CAD040010AD190018AD00001411
65142+:104390000A0004C42508001C03E00008240201F4FC
65143+:1043A00027BDFFE8AFB00010AFBF00140E000060E3
65144+:1043B0000080802124050040AF4508148F83005001
65145+:1043C0008F84004C8F85005C0070182100641023DE
65146+:1043D00018400004AF830050AF6300548F66005450
65147+:1043E000AF86004C1200000C000000008F440074E7
65148+:1043F000936800813409FA002D07000710E00005DA
65149+:1044000000891021936C0081240B01F4018B50046E
65150+:1044100001441021AF62000C8F4E095C01C5682376
65151+:1044200019A000048FBF00148F4F095CAF8F005C90
65152+:104430008FBF00148FB000100A00006227BD001863
65153+:104440008F8400648F8300508F82004CAF640044DF
65154+:10445000AF63005003E00008AF6200543C038000EB
65155+:10446000346200708C43000027BDFFF8308700FFE6
65156+:1044700030A900FF30C800FFAF8300308F440178BF
65157+:104480000480FFFE3C028000345900708F38000029
65158+:10449000A3A700033C0708008CE700748FAC000062
65159+:1044A0003C0608008CC60070030378233C0E7FFF97
65160+:1044B00000EFC82135CDFFFF00005021018D2824D9
65161+:1044C00000CA1821000847C0032F202B00A8102580
65162+:1044D0000064C021AFA200003C010800AC390074A8
65163+:1044E0003C010800AC380070934F010AA3A0000201
65164+:1044F0003C0E80FFA3AF00018FAC0000312B007F8A
65165+:1045000035CDFFFF018D4824000B5600012A4025C0
65166+:10451000240730002406FF803C05100027BD00085A
65167+:10452000AF48014CAF470154A7400158A346015280
65168+:1045300003E00008AF45017827BDFFE8AFBF0014D6
65169+:10454000AFB000108F6500743C068000309000FF13
65170+:1045500000A620250E000060AF6400749363000580
65171+:10456000346200080E000062A362000502002021F0
65172+:104570008FBF00148FB00010240500052406000131
65173+:104580000A00057027BD001827BDFFE03C0380002E
65174+:10459000AFB00010AFBF0018AFB1001434620070AC
65175+:1045A0008C470000309000FF30A800FFAF8700303C
65176+:1045B0008F4401780480FFFE3C18800037110070A2
65177+:1045C0008E2F00003C0D08008DAD00743C0A0800E1
65178+:1045D0008D4A007001E7702301AE282100005821A8
65179+:1045E00000AE302B014B4821012638213C01080048
65180+:1045F000AC250074000088213C010800AC27007045
65181+:104600001100000F000000008F6200742619FFFFE8
65182+:104610003208007F0002FE0233E5007F150000062D
65183+:10462000332200FF2407FF800207202624A3FFFF78
65184+:1046300000838025320200FF0040802124111008F1
65185+:104640000E000060000000008F49081831250004AA
65186+:1046500014A0FFFD3218007F001878C000187140C8
65187+:1046600001CF682125AC0088AF4C0818274A098083
65188+:104670008D4B0020AF4B01448D460024AF460148CE
65189+:10468000A35001500E000062A740015802201021E3
65190+:104690008FBF00188FB100148FB0001003E0000826
65191+:1046A00027BD002027BDFFE8308400FFAFBF00100A
65192+:1046B0000E0005BB30A500FF8F8300508FBF001098
65193+:1046C000344500402404FF903C02100027BD001830
65194+:1046D000AF43014CA3440152AF45015403E000082D
65195+:1046E000AF4201789343093E306200081040000D4C
65196+:1046F0003C0901013528080AAC8800008F47007486
65197+:10470000AC8700043C06080090C63D9030C5001000
65198+:1047100050A00006AC8000088F6A0060AC8A0008D8
65199+:104720002484000C03E00008008010210A00062207
65200+:104730002484000C27BDFFE8AFBF0014AFB0001009
65201+:104740009346093F00A050210005288000853823AA
65202+:1047500030C200FF240300063C09080095293D866D
65203+:1047600024E8FFD824050004104300372406000283
65204+:104770009750093C3C0F020400063400320EFFFF44
65205+:1047800001CF6825AC8D0000934C093E318B002091
65206+:104790001160000800000000934309363C02010349
65207+:1047A000345F0300307900FF033FC0252405000873
65208+:1047B000AC98000493430934935909210005F88209
65209+:1047C000306200FF0002C082332F00FF00186E002D
65210+:1047D000000F740001AE6025018920253C094000CE
65211+:1047E00000898025ACF0FFD8934309378F4F0948E3
65212+:1047F0008F580940306200FF004AC821033F7021F2
65213+:1048000001F86023000E6F0001A650253185FFFCE2
65214+:10481000001F58800145482501683821AD09002056
65215+:104820000E00006024F00028240400040E00006242
65216+:10483000A364003F020010218FBF00148FB000104E
65217+:1048400003E0000827BD00180A0006352406001200
65218+:1048500027BDFFD024090010AFB60028AFB5002453
65219+:10486000AFB40020AFB10014AFB000103C0108009D
65220+:10487000A0293D90AFBF002CAFB3001CAFB2001811
65221+:1048800097480908309400FF3C02000E3107FFFFF3
65222+:10489000000731C0AF46002C974409089344010B30
65223+:1048A00030B500FF03428021308300300000B0218A
65224+:1048B0001060012500008821240C00043C01080040
65225+:1048C000A02C3D90934B093E000B5600000A2E038E
65226+:1048D00004A0016000000000AF400048934F010BAE
65227+:1048E00031EE002011C00006000000009358093E80
65228+:1048F00000189E0000139603064001890000000086
65229+:104900009344010B30830040106000038F930050EC
65230+:104910008F8200502453FFFF9347093E30E6000882
65231+:1049200014C0000224120003000090219619002CEC
65232+:1049300093580934934F0937A7990058330C00FF57
65233+:1049400031EE00FF024E6821000D5880016C5021AD
65234+:10495000015140213C010800A4283D869205001821
65235+:1049600030A900FF010918213C010800A4233D885B
65236+:104970009211001816200002000000000000000D37
65237+:104980003C010800A4233D8A3C010800A4203D808E
65238+:104990003C010800A4203D7C935F010B3063FFFFC6
65239+:1049A00033F00040120000022464000A2464000B6B
65240+:1049B0003091FFFF0E00009E022020219358010B32
65241+:1049C0003C08080095083D8A0040202100185982C3
65242+:1049D000316700010E00049A01072821934C010B56
65243+:1049E0008F4B002C974E09083C0F000E034F4021BF
65244+:1049F00031CDFFFF000D51C0AF4A002C974309088D
65245+:104A00009505001A004038212404000130A9FFFF59
65246+:104A1000AC4900008D06001C00404821318A00404E
65247+:104A2000AC4600048D020020ACE20008910300199E
65248+:104A300030630003106400EC28790002172001188D
65249+:104A4000241000021070010C241F0003107F011EAF
65250+:104A500000000000114000DE000000003C090800DA
65251+:104A600095293D8625220001935F0934934E092143
65252+:104A70009504002A33F900FF0019C08231CF00FFEE
65253+:104A8000978E005800184600000F6C00010D80251D
65254+:104A90003045FFFF02051025008E50213C034000E9
65255+:104AA00000433025000A6400ACEC0004ACE60000D2
65256+:104AB000935F09203C19000624EC0014001FC60077
65257+:104AC00003197825ACEF00088F48092C25CD00018B
65258+:104AD00031A57FFFACE8000C8F500930A785005846
65259+:104AE00024E80028ACF000108F4409380100802130
65260+:104AF000ACE40014AD9300048F530940AD9300085B
65261+:104B0000934A09373C19080093393D908F4309486F
65262+:104B10008F460940314200FF0052F82100667023A1
65263+:104B2000001F7F000019C40001F8282531CDFFFCCB
65264+:104B300000AD2025AD84000CAD800010AF4B002CE3
65265+:104B4000934B093E317300081260000D3C060101D1
65266+:104B500034CC080AACEC00288F530074AD13000469
65267+:104B60003C0B0800916B3D903167001050E0000352
65268+:104B7000AD0000088F6A0060AD0A00082510000C27
65269+:104B800012C0003D000000009343093F24160006B8
65270+:104B900024060004306200FF105600C924070002FA
65271+:104BA0009758093C3C0F0204330DFFFF01AF40252D
65272+:104BB000AE0800009345093E30A400201080000894
65273+:104BC00000000000935309363C0B0103357F0300BE
65274+:104BD000327900FF033F7025AE0E00042406000862
65275+:104BE000934F093493480921312AFFFF31ED00FF2B
65276+:104BF000000D1082310300FF0002B60000032C00FC
65277+:104C000002C56025018A9825001220803C094000D9
65278+:104C10000204502302695825AD4BFFD8935F093732
65279+:104C20008F4F09488F58094033F900FF0332702134
65280+:104C30000006B08201D668210007440001F828234D
65281+:104C4000000D1F000068302530A2FFFC2547FFD86B
65282+:104C500000C260250016808002074821ACEC0020CD
65283+:104C6000253000280E00006024120004A372003FCB
65284+:104C70000E000062000000009347010B30F200407C
65285+:104C8000124000053C1900FF8E180000372EFFFF70
65286+:104C9000030E3024AE0600000E0000C702202021C3
65287+:104CA0003C10080092103D90321100031220000FBA
65288+:104CB00002A028218F89005025330001AF930050B6
65289+:104CC000AF7300508F6B00540173F8231BE0000298
65290+:104CD000026020218F640054AF6400548F4C007434
65291+:104CE000258401F4AF64000C02A028210280202159
65292+:104CF000A76000680E0005BB3C1410008F850050B3
65293+:104D000034550006AF45014C8F8A00488FBF002CF8
65294+:104D10008FB3001C25560001AF9600488FB20018D3
65295+:104D2000A34A01528FB60028AF5501548FB1001429
65296+:104D3000AF5401788FB500248FB400208FB00010DD
65297+:104D400003E0000827BD00309358093E00189E007C
65298+:104D500000139603064200362411000293440923EF
65299+:104D6000308300021060FEDD8F8600608F8200506D
65300+:104D700014C2FEDA000000000E0000600000000017
65301+:104D80009369003F24070016312800FF1107000C2B
65302+:104D9000240500083C0C0800918C3D90358B0001E7
65303+:104DA0003C010800A02B3D90936A003F314300FF77
65304+:104DB00010650065240D000A106D005E2402000CD1
65305+:104DC0000E000062000000000A00069000000000D3
65306+:104DD0003C09080095293D863C0A0800954A3D801B
65307+:104DE0000A0006F3012A10213C09080095293D8A92
65308+:104DF0003C04080094843D803C06080094C63D7C39
65309+:104E000095030024012410210046F8230003CC0060
65310+:104E100027F0FFF20330C025240F0800ACF8000C87
65311+:104E2000ACEF0014ACE000100A0006EE24E7001816
65312+:104E30003C010800A0313D90935F093E241600011B
65313+:104E400033F900201720FEA5241100080A0006905F
65314+:104E5000241100048F6E00848F4D094011A0FE9E26
65315+:104E6000AF8E0050240F00143C010800A02F3D908D
65316+:104E70000A00068F00000000950E0024950D002802
65317+:104E8000000E6400000D2C003589810034A6080056
65318+:104E9000ACE9000CACE600100A0006EE24E70014B2
65319+:104EA0001460FEEC000000009502002400021C00CB
65320+:104EB00034640800ACE4000C0A0006EE24E700109D
65321+:104EC0000A000741240700123C02080094423D8A70
65322+:104ED0003C06080094C63D803C03080094633D7C7A
65323+:104EE00095100024951900280046F82103E3C023FB
65324+:104EF00000106C0000197400270FFFEE01CF282569
65325+:104F000035AC8100ACEC000CACE5001024070800C7
65326+:104F1000AD2700182527001C0A0006EEAD2000145E
65327+:104F20008F7F004CAF7F00548F7900540A000699A0
65328+:104F3000AF790050A362003F0E0000620000000045
65329+:104F40000A00069000000000240200140A0008274E
65330+:104F5000A362003F27BDFFE8308400FFAFBF001011
65331+:104F60000E0005BB30A500FF9378007E9379007F8B
65332+:104F7000936E00809368007A332F00FF001866005C
65333+:104F8000000F6C0031CB00FF018D4825000B520053
65334+:104F90008FBF0010012A3825310600FF344470000D
65335+:104FA00000E628252402FF813C03100027BD0018DD
65336+:104FB000AF45014CAF440154A342015203E0000845
65337+:104FC000AF43017827BDFFD8AFB20018AFB10014CE
65338+:104FD000AFB00010AFBF0020AFB3001C9342010977
65339+:104FE000308600FF30B000FF000618C23204000215
65340+:104FF0003071000114800005305200FF93670005F6
65341+:1050000030E5000810A0000D30C80010024020213B
65342+:105010000E0005A702202821240400018FBF0020D4
65343+:105020008FB3001C8FB200188FB100148FB0001026
65344+:105030000080102103E0000827BD00281500003281
65345+:105040000000000093430109000028213062007F26
65346+:10505000000220C00002F94003E49821267900886C
65347+:10506000033B98218E7800248E6F0008130F0046B2
65348+:10507000000000008F640084241800020004FD82F8
65349+:1050800033F900031338007C0000000093660083AE
65350+:10509000934A0109514600043205007C10A00060CB
65351+:1050A000000000003205007C14A0005302402021C3
65352+:1050B00016200006320400018E7F00248F5901045F
65353+:1050C00017F9FFD600002021320400011080000AE9
65354+:1050D000024020218F4209408F9300641053000644
65355+:1050E000000000000E00066D022028218F430940B9
65356+:1050F000AF630044024020210E0006020220282156
65357+:105100000A000860240400013C0908008D2900649D
65358+:10511000252600013C010800AC26006416000012A0
65359+:10512000000000008F6D00843C0E00C001AE6024C2
65360+:1051300015800005024020210E00082E02202821A3
65361+:105140000A00086024040001240500040E00057014
65362+:1051500024060001024020210E00082E02202821F2
65363+:105160000A000860240400010E000041240400012C
65364+:10517000936B007D020B50250E000062A36A007D38
65365+:105180000A0008A38F6D00848F6600748F480104A5
65366+:105190008E67002400064E021507FFB63126007FF9
65367+:1051A000936B008326440001308A007F1146004340
65368+:1051B000316300FF5464FFB08F6400842645000112
65369+:1051C00030B1007F30A200FF122600042405000148
65370+:1051D000004090210A00087624110001240FFF806E
65371+:1051E000024F702401CF9026324200FF00409021F0
65372+:1051F0000A000876241100010E00066D0220282105
65373+:10520000321800301300FFAA321000820240202121
65374+:105210000E0005A7022028210A00086024040001CE
65375+:105220008F6E00743C0F80002405000301CF902591
65376+:10523000AF72007493710083240600010E000570A4
65377+:10524000322400FF0E00004124040001936D007D14
65378+:10525000020D60250E000062A36C007D3C0B08006F
65379+:105260008D6B0054257000013C010800AC300054E7
65380+:105270000A000860240400018F6800743C09800063
65381+:105280002405000401093825AF6700749363008387
65382+:10529000240600010E000570306400FF0E0000417E
65383+:1052A000240400019362007D020298250E00006232
65384+:1052B000A373007D0A00086024040001324D0080C1
65385+:1052C00039AC0080546CFF6C8F6400840A0008C9FC
65386+:1052D0002645000127BDFFC83C0A0008AFBF0030CB
65387+:1052E000AFB5002CAFB40028AFB30024AFB200209C
65388+:1052F000AFB1001CAFB00018034AD8212409004008
65389+:10530000AF490814AF4008108F4209448F43095039
65390+:105310008F4609548F47095C8F48094C9344010814
65391+:105320009345010BAF820064308400FF30A500FF7D
65392+:10533000AF830050AF86004CAF87005C0E00084A78
65393+:10534000AF8800601440017D8FBF0030A760006807
65394+:10535000934D0900240B00503C15080026B53D482C
65395+:1053600031AC00FF3C12080026523D58118B00035F
65396+:10537000000000000000A8210000902193510109C5
65397+:105380008F9F005024040010322E007F000E68C052
65398+:10539000000E6140018D282124B40088AF54081804
65399+:1053A0008F4901048F4A09A43C0B000E034BC02116
65400+:1053B000012A10233C010800AC223D6C8F430958A0
65401+:1053C0003C010800A0243D9097470908007F302346
65402+:1053D0003C010800AC263D7030E8FFFF0008C9C062
65403+:1053E0003C010800AC3F3D94AF59002C974209089E
65404+:1053F0009710002C8EB10000930F001803749821B1
65405+:10540000A7900058AF9300440220F80931F000FF44
65406+:10541000304E000215C001B2304F000111E0014FC3
65407+:10542000000000009343093E3066000814C00002EB
65408+:10543000241400030000A0218F5809A424130001A4
65409+:105440003C010800AC383D98934F0934935109371B
65410+:1054500031EC00FF322E00FF028E6821000D288003
65411+:1054600000AC5021015058213C010800A42B3D887C
65412+:105470003C010800A42A3D8693490934312200FFEB
65413+:1054800002022021249000103C010800A4303D8439
65414+:10549000240700068F9F00503C010800AC273D8C7C
65415+:1054A0008F88005C8F59095800008021011F282334
65416+:1054B00004A00149033F20230480014700A4302BAE
65417+:1054C00010C00149000000003C010800AC253D70FF
65418+:1054D0008E4200000040F809000000003043000246
65419+:1054E000146000F80040882130440001548000100E
65420+:1054F0008E4200043C0908008D293D743C0AC0001E
65421+:10550000012A8025AF500E008F45000030AB000807
65422+:105510001160FFFD00000000974D0E0824100001EF
65423+:10552000A78D003C8F4C0E04AF8C00348E420004DB
65424+:105530000040F8090000000002228825322E0002F7
65425+:1055400015C00180000000003C09080095293D7C41
65426+:105550003C06080094C63D883C0A0800954A3D7EFA
65427+:105560003C1908008F393D74012660213C18080061
65428+:105570008F183D983C03080094633D92018A2021D6
65429+:105580008F4E09400329F821248F000203E32821CC
65430+:10559000031968213C010800A42C3D8AAF8E0064E9
65431+:1055A0003C010800AC2D3D983C010800A4253D803D
65432+:1055B0000E00009E31E4FFFF8F870048004020214D
65433+:1055C0003C010800A0273D918E42000824E800011C
65434+:1055D000AF8800480040F809000000009344010B28
65435+:1055E0008F4C002C974A09083C0B000E034B4021BE
65436+:1055F0003149FFFF000919C08F8B0050AF43002CC9
65437+:10560000974309089506001A00403821308A004067
65438+:1056100030DFFFFFAC5F00008D19001C0040482107
65439+:10562000AC5900048D180020AC580008910F0019E7
65440+:1056300031E30003107300F0000000002862000254
65441+:105640001440010924050002106500FD240D00032B
65442+:10565000106D010D00000000114000D90000000095
65443+:105660003C0A0800954A3D8625420001934D0934C5
65444+:1056700093580921950E002A31A300FF00032082D0
65445+:10568000331F00FF9798005800047E00001FCC00D5
65446+:1056900001F940253049FFFF0109102501D83021CB
65447+:1056A0003C0540000045502500066C00ACED0004B0
65448+:1056B000ACEA0000934309203C04000624ED0014EA
65449+:1056C0000003FE0003E4C825ACF900088F49092C4B
65450+:1056D000270F000131EE7FFFACE9000C8F48093045
65451+:1056E000A78E005824E90028ACE800108F4509383F
65452+:1056F00001204021ACE50014ADAB00048F4209400D
65453+:10570000ADA20008934B09373C1F080093FF3D9062
65454+:105710008F4309488F4A0940316600FF00D4202199
65455+:10572000006A78230004C700001FCC000319282555
65456+:1057300031EEFFFC00AE1025ADA2000CADA00010B4
65457+:10574000AF4C002C934C093E318B00085160000F88
65458+:105750008E58000C3C06010134CA080AACEA002845
65459+:105760008F4B0074AD2B00043C0C0800918C3D90D5
65460+:105770003187001050E00003AD2000088F62006008
65461+:10578000AD2200082528000C8E58000C0300F809F3
65462+:10579000010020213C19080097393D8A3C1F080070
65463+:1057A00097FF3D7E033F782125E900020E0000C7E8
65464+:1057B0003124FFFF3C0E08008DCE3D6C3C080800F4
65465+:1057C0008D083D7401C828233C010800AC253D6CC0
65466+:1057D00014A00006000000003C0308008C633D8C10
65467+:1057E000346400403C010800AC243D8C1200007081
65468+:1057F0008F8C00448F470E108F900044AE0700201E
65469+:105800008F4D0E18AE0D00243C10080096103D8000
65470+:105810000E0000600000000024020040AF420814A7
65471+:105820008F8600508F8A004C00D01821006A5823C0
65472+:1058300019600004AF830050AF6300548F650054BB
65473+:10584000AF85004C1200000C000000008F44007473
65474+:10585000936800813409FA002D0E000711C000057D
65475+:1058600000891821937F0081241901F403F9780439
65476+:1058700001E41821AF63000C8F44095C8F83005C46
65477+:105880000083C0231B000003000000008F50095C50
65478+:10589000AF90005C0E000062000000008F8C005092
65479+:1058A0008E4700103C010800AC2C3D9400E0F80944
65480+:1058B000000000003C0D08008DAD3D6C55A0FEF5CC
65481+:1058C000240700068F450024975909088F8B006430
65482+:1058D0008F9400503C0F001F978200588F86005411
65483+:1058E0008F93004C3328FFFF35E9FF8000A9502437
65484+:1058F000000871C032320100AF4E0024A4C2002C57
65485+:10590000AF4A0024AF6B0044AF740050AF73005433
65486+:105910001640008032380010570000868EA4000424
65487+:10592000322300405460001B8EB100088EB0000C82
65488+:105930000200F809000000008FBF00308FB5002C76
65489+:105940008FB400288FB300248FB200208FB1001CC9
65490+:105950008FB0001803E0000827BD00389347010905
65491+:105960008F8800380007FE0003E8C825AF59008083
65492+:105970008F5809A08F5309A4AFB80010AF580E1468
65493+:105980008FB40010AF540E10AF530E1C0A00096202
65494+:10599000AF530E180220F809000000008EB0000C72
65495+:1059A0000200F809000000000A000AA88FBF0030BA
65496+:1059B000A5800020A59300220A000A5BAD93002475
65497+:1059C0003C09080095293D863C06080094C63D80A8
65498+:1059D0000A0009F4012610213C010800AC203D70AA
65499+:1059E0000A00098E8E4200003C010800AC243D7084
65500+:1059F0000A00098E8E4200003C03080094633D8A31
65501+:105A00003C04080094843D803C1F080097FF3D7CC7
65502+:105A1000951800240064C821033F782300186C0007
65503+:105A200025EEFFF201AE2825AC45000C240208004B
65504+:105A3000ACE20014ACE000100A0009EF24E7001803
65505+:105A400095060024950900280006240000091C0082
65506+:105A5000349F810034790800ACFF000CACF90010D1
65507+:105A60000A0009EF24E700141460FEFB00000000A8
65508+:105A70009518002400187C0035EE0800ACEE000CF0
65509+:105A80000A0009EF24E700103C07080094E73D8076
65510+:105A90003C04080094843D8A3C03080094633D7CE8
65511+:105AA00095190024951800280087F82103E378232E
65512+:105AB0002407080000192C0000186C0025EEFFEEEA
65513+:105AC00001AE302534A28100AD2700182527001C27
65514+:105AD000AD22000CAD2600100A0009EFAD20001425
65515+:105AE00093520109000028210E000602324400FFF3
65516+:105AF0008FBF00308FB5002C8FB400288FB30024E7
65517+:105B00008FB200208FB1001C8FB0001803E0000896
65518+:105B100027BD0038935F010933E400FF0E00066DD6
65519+:105B200000002821323800105300FF7E322300404D
65520+:105B30008EA400040080F809000000000A000AA2F8
65521+:105B4000322300401200FF5F000000008F540E144B
65522+:105B50008F920044AE5400208F530E1C0A000A8A14
65523+:105B6000AE5300248F82001C008040213C040100C1
65524+:105B70009047008530E3002010600009000000001D
65525+:105B80003C0708008CE73D948F83001800E3202336
65526+:105B9000048000089389000414E30003010020211D
65527+:105BA00003E00008008010213C04010003E000082D
65528+:105BB000008010211120000B006738238F8C0020FB
65529+:105BC00024090034918B00BC316A0002514000016D
65530+:105BD0002409003000E9682B15A0FFF10100202105
65531+:105BE00000E938232419FFFC00B9C02400F9782407
65532+:105BF00000F8702B15C0FFEA01E8202130C2000335
65533+:105C00000002182314C00012306900030000302184
65534+:105C100000A9702101C6682100ED602B1180FFE012
65535+:105C20003C0401002D2F00010006482B01053821FE
65536+:105C300001E9302414C0FFDA24E4FFFC2419FFFC3E
65537+:105C400000B9C0240308202103E0000800801021CF
65538+:105C50008F8B002024060004916A00BC31440004AC
65539+:105C60001480FFEC00A970210A000B5E00003021B7
65540+:105C700027BDFFE8AFBF00108F460100934A01091E
65541+:105C80003C1F08008FFF00902407FF80314F00FF6A
65542+:105C900031E8007F0008614003E6C821032CC021E1
65543+:105CA00027090120012770243C010800A02F3DD0C6
65544+:105CB000AF4E080C3C0D08008DAD00903C040080F8
65545+:105CC0003482000301A65821016C182124650120AB
65546+:105CD00030AA007801424025AF48081C3C1F08004C
65547+:105CE0008FFF00908F88004003E6C0213319000722
65548+:105CF00003074824033A7821AF49002825E909C061
65549+:105D0000952E00023C0D08008DAD008C3C0A080069
65550+:105D10008D4A009031CC3FFF01A61821000C59801C
65551+:105D2000006B282100A72024AF44002C95220002FC
65552+:105D30003C1F08008FFF008C9107008530593FFF02
65553+:105D400003E678210019C1800146702101F868211D
65554+:105D500031CC007F31AB007F019A2821017A50219C
65555+:105D60003C03000C3C04000E00A328210144102138
65556+:105D700030E6002027470980AF82002CAF88001C46
65557+:105D8000AF890024AF85002010C00006AF8700282F
65558+:105D90008D0200508CA4010C0044302318C0007701
65559+:105DA00000000000910C0085240DFFDF018D3824D8
65560+:105DB000A10700858F8B001C8F8900248F87002806
65561+:105DC0008D65004CAF850018912F000D31EE00203D
65562+:105DD00011C000170000000024090001A38900047D
65563+:105DE000AF80000C8CE400248F85000C240A00088E
65564+:105DF000AF800008AF8000103C010800A42A3D7E5F
65565+:105E00003C010800A4203D920E000B32000030211E
65566+:105E10008F8500248FBF0010AF82001490A8000D62
65567+:105E200027BD00180008394203E0000830E20001F5
65568+:105E3000913F00022418000133F900FF001921826C
65569+:105E400010980039240800021088005B8F86002C0F
65570+:105E50008CE5002414A0001B8F9F002091220000DD
65571+:105E6000240A00053046003F10CA00472404000100
65572+:105E70008F860008A3840004AF860010AF86000C54
65573+:105E80008CE400248F85000C240A00083C010800E3
65574+:105E9000A42A3D7E3C010800A4203D920E000B3256
65575+:105EA000000000008F8500248FBF0010AF82001417
65576+:105EB00090A8000D27BD00180008394203E0000833
65577+:105EC00030E200018CF800088CF900248FEE00C449
65578+:105ED000A38000048CE40024AF8E000C8F85000C9E
65579+:105EE0008F86000803197823240A0008AF8F00105A
65580+:105EF0003C010800A42A3D7E3C010800A4203D92FC
65581+:105F00000E000B32000000008F8500248FBF0010B0
65582+:105F1000AF82001490A8000D27BD00180008394278
65583+:105F200003E0000830E20001912300003062003FEE
65584+:105F3000104400278F8500208CE400241480002169
65585+:105F4000000000008D2E00183C187FFF8F85002078
65586+:105F5000370FFFFF01CF1824AF8300088F9F000881
65587+:105F60008CA8008403E8C82B1720000203E020213E
65588+:105F70008CA400840A000BEDAF8400088CA3010CF4
65589+:105F80000A000BCBAF8300188D2C00188F860008F9
65590+:105F90003C0D7FFF8F89002035A3FFFF018358242C
65591+:105FA00024040001AF8B0010AD2000CCA3840004BA
65592+:105FB0000A000BF9AF86000C8CCA00140A000BED26
65593+:105FC000AF8A00088CA300C80A000C30AF83000819
65594+:105FD0008F84002C8CAC00648C8D0014018D582BA8
65595+:105FE00011600004000000008CA200640A000C3064
65596+:105FF000AF8200088C8200140A000C30AF820008C7
65597+:106000008F85000C27BDFFE0AFBF0018AFB10014B3
65598+:1060100014A00007AFB000108F86002424020005F2
65599+:1060200090C400003083003F106200B68F840020CF
65600+:106030008F91000800A080218F8C00283C0508006B
65601+:106040008CA53D708D8B000431663FFF00C5502B41
65602+:106050005540000100C02821938D000411A0007359
65603+:1060600000B0F82B8F98002024040034930F00BC5C
65604+:1060700031EE000251C000012404003000A4C82BFE
65605+:10608000172000D10000000000A4282300B0F82B46
65606+:106090003C010800A4243D7C17E000680200202198
65607+:1060A0003C0308008C633D6C0083102B54400001BE
65608+:1060B000008018218F8800243C010800AC233D7427
65609+:1060C000000048219104000D308300205060000141
65610+:1060D0008F490E188F8300140123382B10E00059CC
65611+:1060E000000000003C0408008C843D7400895821A5
65612+:1060F000006B502B114000560090602B006930233C
65613+:1061000000C020213C010800AC263D7412000003B1
65614+:10611000241FFFFC1090008A32270003009FC82430
65615+:106120003C010800AC393D743C010800A4203D92BC
65616+:106130008F84000C120400078F830020AF910008A9
65617+:10614000020020218C7100CCAF90000C26300001A1
65618+:10615000AC7000CC3C0208008C423D748F8A001069
65619+:10616000240700180082202301422823AF84000C5A
65620+:1061700010800002AF850010240700108F86001CDD
65621+:106180003C010800A0273D902407004090CC0085EA
65622+:10619000318B00C0116700408F8D001414A00015D2
65623+:1061A00000002021934A01098F420974314500FF04
65624+:1061B0000002260224A300013090007F3071007F8E
65625+:1061C0001230007A2407FF80A0C300833C09080036
65626+:1061D0008D293D8C8F880024240D0002352C000869
65627+:1061E0003C010800A02D3DD13C010800AC2C3D8CA9
65628+:1061F00024040010910E000D31C6002010C00005CF
65629+:1062000000801821240800013C010800AC283D74DE
65630+:10621000348300018FBF00188FB100148FB00010BD
65631+:106220000060102103E0000827BD00203C010800A9
65632+:10623000A4203D7C13E0FF9A020020210A000C817B
65633+:1062400000A020213C0408008C843D740090602B49
65634+:106250001180FFAE000000003C0F080095EF3D7C70
65635+:1062600001E4702101C6682B11A000072C820004F4
65636+:106270003C1F60008FF954043338003F1700FFE5DE
65637+:10628000240300422C8200041040FFA0240300429B
65638+:106290000A000CDF8FBF0018152DFFC000000000A2
65639+:1062A0008CDF00743C0380002405FF8003E3C825D5
65640+:1062B000ACD9007490D80085240E0004240400108A
65641+:1062C000330F003F01E54025A0C800858F880024DA
65642+:1062D0003C010800A02E3DD1240300019106000DD1
65643+:1062E00030C9002015200003000000003C03080016
65644+:1062F0008C633D743C010800AC233D6C0A000CD655
65645+:10630000000000008F8700108C88008400E8282B94
65646+:1063100014A0000200E088218C910084240900016F
65647+:10632000A38900048F440E18022028210E000B328E
65648+:1063300002203021022080210A000C67AF82001465
65649+:1063400000071823306600033C010800A4263D9294
65650+:10635000122000058F8C0020918B00BC316A000454
65651+:106360001540001524CD00043C0F080095EF3D9228
65652+:1063700001E4702100AE302B50C0FF6E8F84000C02
65653+:106380002C85000514A0FFA32403004230980003CD
65654+:1063900017000002009818232483FFFC3C0108002A
65655+:1063A000AC233D740A000CA30000000000A7582491
65656+:1063B0000A000CCB016718263C010800A42D3D9271
65657+:1063C0000A000D33000000003C010800AC203D74C1
65658+:1063D0000A000CDE240300428F83001014600007C3
65659+:1063E000000010218F88002424050005910600007C
65660+:1063F00030C400FF108500030000000003E0000827
65661+:1064000000000000910A0018314900FF000939C25C
65662+:1064100014E0FFFA8F85001C3C04080094843D7C46
65663+:106420003C0308008C633D943C1908008F393D748F
65664+:106430003C0F080095EF3D920064C0218CAD0054E4
65665+:106440000319702101CF6021018D58231960001DAF
65666+:1064500000000000910E001C8F8C002C974B0E103A
65667+:1064600031CD00FF8D850004016D30238D88000043
65668+:1064700030CEFFFF000E510000AAC82100003821D5
65669+:1064800001072021032A182B0083C021AD990004A5
65670+:10649000AD980000918F000A01CF6821A18D000AFC
65671+:1064A0008F88002C974B0E12A50B0008950A003818
65672+:1064B00025490001A50900389107000D34E60008C0
65673+:1064C000A106000D03E000080000000027BDFFE06A
65674+:1064D000938700048F8F00248FAD00143C0E7FFF44
65675+:1064E0008F89000C35C8FFFFAFBF001CAFB000188C
65676+:1064F00001A8182491EA000D000717C03C1FBFFF38
65677+:10650000006258252D2E00018F90001837F9FFFFEB
65678+:106510003C1808008F183D943C0F080095EF3D8A09
65679+:1065200001796824000E47803C07EFFF3C05F0FF2F
65680+:1065300001A818253149002034E2FFFF34ACFFFFE9
65681+:106540000310582327A500102406000225EA0002A4
65682+:1065500000621824008080211520000200004021E4
65683+:106560008F480E1CA7AA0012056000372407000000
65684+:1065700030FF00FF001FCF008F8B001C00793825F3
65685+:10658000AFA70014916F00853C08080091083D9169
65686+:106590003C18DFFF31EE00C0370AFFFF000E182B5A
65687+:1065A0003C1F080097FF3D8400EA6824A3A800115F
65688+:1065B0000003174001A248258FB90010AFA90014AD
65689+:1065C0003C0A0800914A3D93A7BF00168FA800140B
65690+:1065D000032CC0243C0B01003C0F0FFF030B1825BC
65691+:1065E0003147000335EEFFFF010C68240007160059
65692+:1065F000006EF8243C09700001A2C82503E9582563
65693+:10660000AFB90014AFAB00100E000076A3A00015C8
65694+:106610008F8C0024260200089186000D30C40020D3
65695+:10662000108000068FBF001C3C05080094A53D802B
65696+:1066300024B0FFFF3C010800A4303D808FB000185B
65697+:1066400003E0000827BD00208F9800140118502B8C
65698+:106650005540FFC7240700010A000DB630FF00FFB8
65699+:106660009382000427BDFFE0AFBF00181040000F69
65700+:10667000008050218F880024240B00058F8900089A
65701+:10668000910700008F8400200100282130E3003FA3
65702+:106690008F86002C106B000800003821AFA9001075
65703+:1066A0000E00040EAFAA0014A38000048FBF0018D0
65704+:1066B00003E0000827BD00208D1900183C0F0800DA
65705+:1066C0008DEF3D748F9800103C027FFF8D08001401
65706+:1066D000345FFFFF033F682401F8702101AE60239F
65707+:1066E00001883821AFA900100E00040EAFAA0014D3
65708+:1066F0000A000E04A38000048F8700243C050800D4
65709+:1067000094A53D923C0208008C423D8C90E6000D21
65710+:106710000005240030C300201060002C00444025F8
65711+:106720008F85001C00006021240B000190A30085D0
65712+:1067300000004821240A00013C0F800035EE007063
65713+:106740008DC70000AF8700308F5801780700FFFE2B
65714+:106750003C038000347900708F3800003C0508004D
65715+:106760008CA500743C0D08008DAD007003077823E4
65716+:1067700000AF38210000102100EF302B01A22021B2
65717+:10678000008618213C010800AC2700743C01080079
65718+:10679000AC230070AF4B01483C1908008F393D9481
65719+:1067A000A7490144A74A0146AF59014C3C0B0800D8
65720+:1067B000916B3D91A34B0152AF4801543C0810002E
65721+:1067C000A74C015803E00008AF4801788F4B0E1C1E
65722+:1067D0003C0A08008D4A3D7497490E16974D0E14D9
65723+:1067E00001456021312AFFFF0A000E2731A9FFFF72
65724+:1067F0008F8300249064000D308200201040002917
65725+:10680000000000000000482100005021000040214D
65726+:106810003C07800034EB00708D670000AF870030CC
65727+:106820008F4C01780580FFFE3C0D800035AC007078
65728+:106830008D8B00003C0508008CA500743C0408000A
65729+:106840008C8400700167302300A67821000010219D
65730+:1068500001E6C82B0082C021031970213C01080009
65731+:10686000AC2F00743C010800AC2E0070AF49014809
65732+:106870003C0D08008DAD3D94A7480144240900401B
65733+:10688000A74A01463C081000240AFF91AF4D014C75
65734+:10689000A34A0152AF490154A740015803E0000840
65735+:1068A000AF4801788F490E1897460E1297450E1083
65736+:1068B00030CAFFFF0A000E5D30A8FFFF8F8300245F
65737+:1068C00027BDFFF89064000D308200201040003A90
65738+:1068D00000000000240B000100004821240A0001F0
65739+:1068E0003C088000350700708CE30000AF83003067
65740+:1068F0008F4C01780580FFFE3C0E80003C040800B0
65741+:1069000090843DD035C700708CEC00003C05080039
65742+:106910008CA50074A3A400033C1908008F390070F3
65743+:106920008FAD00000183302300A638210000102124
65744+:106930000322782100E6C02B01F8602101AE40253A
65745+:10694000AFA800003C010800AC2700743C0108001F
65746+:10695000AC2C00709346010A3C04080090843DD1A1
65747+:10696000A3A00002A3A600018FA300003C0580FFA6
65748+:106970003099007F34A2FFFF006278240019C6001E
65749+:1069800001F87025240D3000AF4E014C27BD0008E2
65750+:10699000AF4D0154A7400158AF4B0148A7490144EE
65751+:1069A000A74A01463C091000240AFF80A34A01526D
65752+:1069B00003E00008AF4901788F4B0E1897460E127E
65753+:1069C00097450E1030CAFFFF0A000E9130A9FFFF55
65754+:1069D0008F85001C2402008090A40085308300C0B5
65755+:1069E000106200058F8600208F8800088F87000CBA
65756+:1069F000ACC800C8ACC700C403E000080000000039
65757+:106A00003C0A0800254A39543C09080025293A2047
65758+:106A10003C08080025082DD43C07080024E73B3437
65759+:106A20003C06080024C637C43C05080024A5353CB4
65760+:106A30003C040800248431643C0308002463385C6F
65761+:106A40003C020800244236303C010800AC2A3D508C
65762+:106A50003C010800AC293D4C3C010800AC283D48F5
65763+:106A60003C010800AC273D543C010800AC263D64C5
65764+:106A70003C010800AC253D5C3C010800AC243D58BD
65765+:106A80003C010800AC233D683C010800AC223D609D
65766+:086A900003E000080000000013
65767+:00000001FF
65768diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65769new file mode 100644
65770index 0000000..43d7c4f
65771--- /dev/null
65772+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65773@@ -0,0 +1,6496 @@
65774+:10000000080001180800000000005594000000C816
65775+:1000100000000000000000000000000008005594EF
65776+:10002000000000380000565C080000A00800000036
65777+:100030000000574400005694080059200000008436
65778+:100040000000ADD808005744000001C00000AE5CBD
65779+:100050000800321008000000000092580000B01C98
65780+:10006000000000000000000000000000080092589E
65781+:100070000000033C000142740800049008000400E2
65782+:10008000000012FC000145B000000000000000006C
65783+:1000900000000000080016FC00000004000158AC3D
65784+:1000A000080000A80800000000003D00000158B052
65785+:1000B00000000000000000000000000008003D00FB
65786+:1000C00000000030000195B00A000046000000006A
65787+:1000D000000000000000000D636F6D362E322E31DF
65788+:1000E00062000000060201020000000000000003A0
65789+:1000F000000000C800000032000000030000000003
65790+:1001000000000000000000000000000000000000EF
65791+:1001100000000010000001360000EA600000000549
65792+:1001200000000000000000000000000000000008C7
65793+:1001300000000000000000000000000000000000BF
65794+:1001400000000000000000000000000000000000AF
65795+:10015000000000000000000000000000000000009F
65796+:10016000000000020000000000000000000000008D
65797+:10017000000000000000000000000000000000007F
65798+:10018000000000000000000000000010000000005F
65799+:10019000000000000000000000000000000000005F
65800+:1001A000000000000000000000000000000000004F
65801+:1001B000000000000000000000000000000000003F
65802+:1001C000000000000000000000000000000000002F
65803+:1001D000000000000000000000000000000000001F
65804+:1001E0000000000010000003000000000000000DEF
65805+:1001F0000000000D3C020800244256083C030800A1
65806+:1002000024635754AC4000000043202B1480FFFDB2
65807+:10021000244200043C1D080037BD9FFC03A0F021D0
65808+:100220003C100800261001183C1C0800279C5608AA
65809+:100230000E000256000000000000000D27BDFFB4B4
65810+:10024000AFA10000AFA20004AFA30008AFA4000C50
65811+:10025000AFA50010AFA60014AFA70018AFA8001CF0
65812+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
65813+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
65814+:10028000AFB90040AFBC0044AFBF00480E001544FA
65815+:10029000000000008FBF00488FBC00448FB90040B1
65816+:1002A0008FB8003C8FAF00388FAE00348FAD003078
65817+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
65818+:1002C0008FA8001C8FA700188FA600148FA5001000
65819+:1002D0008FA4000C8FA300088FA200048FA1000040
65820+:1002E00027BD004C3C1B60108F7A5030377B502864
65821+:1002F00003400008AF7A00008F82002427BDFFE092
65822+:10030000AFB00010AFBF0018AFB100148C42000CAA
65823+:100310003C1080008E110100104000348FBF001887
65824+:100320000E000D84000000008F85002024047FFF54
65825+:100330000091202BACB100008E030104960201084D
65826+:1003400000031C003042FFFF00621825ACA300042C
65827+:100350009202010A96030114304200FF3063FFFF4E
65828+:100360000002140000431025ACA200089603010C03
65829+:100370009602010E00031C003042FFFF00621825A8
65830+:10038000ACA3000C960301109602011200031C009E
65831+:100390003042FFFF00621825ACA300108E02011846
65832+:1003A000ACA200148E02011CACA20018148000083C
65833+:1003B0008F820024978200003C0420050044182509
65834+:1003C00024420001ACA3001C0A0000C6A782000062
65835+:1003D0003C0340189442001E00431025ACA2001CB0
65836+:1003E0000E000DB8240400018FBF00188FB1001457
65837+:1003F0008FB000100000102103E0000827BD00208E
65838+:100400003C0780008CE202B834E50100044100089A
65839+:10041000240300013C0208008C42006024420001D9
65840+:100420003C010800AC22006003E0000800601021DD
65841+:100430003C0208008C42005C8CA4002094A30016AF
65842+:100440008CA6000494A5000E24420001ACE40280B6
65843+:100450002463FFFC3C010800AC22005C3C0210005D
65844+:10046000A4E30284A4E5028600001821ACE6028819
65845+:10047000ACE202B803E000080060102127BDFFE0F5
65846+:100480003C028000AFB0001034420100AFBF001C3E
65847+:10049000AFB20018AFB100148C43000094450008BF
65848+:1004A0002462FE002C42038110400003000381C23D
65849+:1004B0000A00010226100004240201001462000553
65850+:1004C0003C1180003C02800890420004305000FF44
65851+:1004D0003C11800036320100964300143202000FB6
65852+:1004E00000021500004310253C0308008C63004403
65853+:1004F00030A40004AE220080246300013C01080007
65854+:10050000AC2300441080000730A200028FBF001C03
65855+:100510008FB200188FB100148FB000100A0000CE07
65856+:1005200027BD00201040002D0000182130A20080BF
65857+:1005300010400005362200708E44001C0E000C672F
65858+:10054000240500A0362200708C4400008F82000C2D
65859+:10055000008210232C43012C10600004AF82001095
65860+:10056000240300010A000145AF84000C8E42000400
65861+:100570003C036020AF84000CAC6200143C02080015
65862+:100580008C42005850400015000018218C62000475
65863+:10059000240301FE304203FF144300100000182121
65864+:1005A0002E020004104000032E0200080A00014041
65865+:1005B0000000802114400003000000000A000140F8
65866+:1005C0002610FFF90000000D2402000202021004B0
65867+:1005D0003C036000AC626914000018218FBF001C4E
65868+:1005E0008FB200188FB100148FB00010006010217E
65869+:1005F00003E0000827BD00203C0480008C8301003C
65870+:1006000024020100506200033C0280080000000D3B
65871+:100610003C02800890430004000010213063000F6A
65872+:1006200000031D0003E00008AC8300800004188074
65873+:100630002782FF9C00621821000410C00044102390
65874+:100640008C640000000210C03C030800246356E4E0
65875+:10065000004310213C038000AC64009003E00008DC
65876+:10066000AF8200243C0208008C42011410400019A3
65877+:100670003084400030A2007F000231C03C02020002
65878+:100680001080001400A218253C026020AC43001426
65879+:100690003C0408008C8456B83C0308008C630110AD
65880+:1006A0003C02800024050900AC4500200086202182
65881+:1006B000246300013C028008AC4400643C01080053
65882+:1006C000AC2301103C010800AC2456B803E000083C
65883+:1006D000000000003C02602003E00008AC4500146C
65884+:1006E00003E000080000102103E0000800001021D2
65885+:1006F00030A2000810400008240201003C0208005B
65886+:100700008C42010C244200013C010800AC22010C87
65887+:1007100003E0000800000000148200080000000050
65888+:100720003C0208008C4200FC244200013C0108000D
65889+:10073000AC2200FC0A0001A330A200203C02080009
65890+:100740008C420084244200013C010800AC22008459
65891+:1007500030A200201040000830A200103C02080027
65892+:100760008C420108244200013C010800AC2201082F
65893+:1007700003E0000800000000104000080000000036
65894+:100780003C0208008C420104244200013C010800A4
65895+:10079000AC22010403E00008000000003C02080055
65896+:1007A0008C420100244200013C010800AC220100FF
65897+:1007B00003E000080000000027BDFFE0AFB1001417
65898+:1007C0003C118000AFB20018AFBF001CAFB00010EA
65899+:1007D0003632010096500008320200041040000733
65900+:1007E000320300028FBF001C8FB200188FB10014BB
65901+:1007F0008FB000100A0000CE27BD00201060000B53
65902+:10080000020028218E2401000E00018A0000000051
65903+:100810003202008010400003240500A10E000C6786
65904+:100820008E44001C0A0001E3240200018E2301040F
65905+:100830008F82000810430006020028218E24010048
65906+:100840000E00018A000000008E220104AF82000821
65907+:10085000000010218FBF001C8FB200188FB1001450
65908+:100860008FB0001003E0000827BD00202C82000498
65909+:1008700014400002000018212483FFFD240200021E
65910+:10088000006210043C03600003E00008AC626914DD
65911+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
65912+:1008A000AFB000103C048000948201083043700017
65913+:1008B000240220001062000A2862200154400052E5
65914+:1008C0008FBF001C24024000106200482402600018
65915+:1008D0001062004A8FBF001C0A0002518FB200183C
65916+:1008E00034820100904300098C5000189451000C90
65917+:1008F000240200091062001C0000902128620009F7
65918+:10090000144000218F8200242402000A5062001249
65919+:10091000323100FF2402000B1062000F00000000C3
65920+:100920002402000C146200188F8200243C0208008C
65921+:100930008C4256B824030900AC83002000501021DB
65922+:100940003C038008AC6200643C010800AC2256B84D
65923+:100950000A0002508FBF001C0E0001E900102602A1
65924+:100960000A0002308F8200240E0001E900102602E6
65925+:100970003C0380089462001A8C72000C3042FFFF26
65926+:10098000020280258F8200248C42000C5040001E01
65927+:100990008FBF001C0E000D84000000003C02800090
65928+:1009A00034420100944300088F82002400031C009D
65929+:1009B0009444001E8F82002000641825AC50000073
65930+:1009C00024040001AC510004AC520008AC40000CFF
65931+:1009D000AC400010AC400014AC4000180E000DB844
65932+:1009E000AC43001C0A0002508FBF001C0E000440E4
65933+:1009F000000000000A0002508FBF001C0E000C9F78
65934+:100A0000000000008FBF001C8FB200188FB10014CF
65935+:100A10008FB000100000102103E0000827BD002067
65936+:100A200027BDFFD8AFB400203C036010AFBF002447
65937+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
65938+:100A40008C6450002402FF7F3C1408002694563822
65939+:100A5000008220243484380CAC6450003C028000B6
65940+:100A6000240300370E0014B0AC4300083C07080014
65941+:100A700024E70618028010212404001D2484FFFFAF
65942+:100A8000AC4700000481FFFD244200043C02080042
65943+:100A9000244207C83C010800AC2256403C02080032
65944+:100AA000244202303C030800246306203C04080072
65945+:100AB000248403B43C05080024A506F03C06080085
65946+:100AC00024C62C9C3C010800AC2256803C02080045
65947+:100AD000244205303C010800AC2756843C01080044
65948+:100AE000AC2656943C010800AC23569C3C010800FF
65949+:100AF000AC2456A03C010800AC2556A43C010800DB
65950+:100B0000AC2256A83C010800AC23563C3C0108002E
65951+:100B1000AC2456443C010800AC2056603C0108005F
65952+:100B2000AC2556643C010800AC2056703C0108001E
65953+:100B3000AC27567C3C010800AC2656903C010800CE
65954+:100B4000AC2356980E00056E00000000AF80000C2C
65955+:100B50003C0280008C5300008F8300043C0208009C
65956+:100B60008C420020106200213262000700008821C0
65957+:100B70002792FF9C3C100800261056E43C02080017
65958+:100B80008C42002024050001022518040043202483
65959+:100B90008F820004004310245044000C26310001D1
65960+:100BA00010800008AF9000248E4300003C028000BB
65961+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
65962+:100BC00026310001AE00000C263100012E22000269
65963+:100BD000261000381440FFE9265200043C020800A9
65964+:100BE0008C420020AF820004326200071040FFD91F
65965+:100BF0003C028000326200011040002D326200028F
65966+:100C00003C0580008CA2010000002021ACA2002045
65967+:100C10008CA301042C42078110400008ACA300A85B
65968+:100C200094A2010824032000304270001443000302
65969+:100C30003C02800890420005304400FF0E0001593C
65970+:100C4000000000003C0280009042010B304300FF96
65971+:100C50002C62001E54400004000310800E00018628
65972+:100C60000A0002EC00000000005410218C42000039
65973+:100C70000040F80900000000104000043C02800021
65974+:100C80008C4301043C026020AC4300143C02080089
65975+:100C90008C4200343C0440003C03800024420001AC
65976+:100CA000AC6401383C010800AC220034326200021E
65977+:100CB00010400010326200043C1080008E0201409F
65978+:100CC000000020210E000159AE0200200E00038317
65979+:100CD000000000003C024000AE0201783C02080027
65980+:100CE0008C420038244200013C010800AC2200384C
65981+:100CF000326200041040FF973C0280003C108000EC
65982+:100D00008E020180000020210E000159AE02002059
65983+:100D10008E03018024020F00546200073C02800809
65984+:100D20008E0201883C0300E03042FFFF00431025A3
65985+:100D30000A000328AE020080344200809042000086
65986+:100D400024030050304200FF14430007000000005D
65987+:100D50000E000362000000001440000300000000C9
65988+:100D60000E000971000000003C0208008C42003CAB
65989+:100D70003C0440003C03800024420001AC6401B804
65990+:100D80003C010800AC22003C0A0002A33C028000A7
65991+:100D90003C02900034420001008220253C02800089
65992+:100DA000AC4400203C0380008C6200200440FFFE25
65993+:100DB0000000000003E00008000000003C0280008A
65994+:100DC000344300010083202503E00008AC440020E8
65995+:100DD00027BDFFE0AFB10014AFB000100080882144
65996+:100DE000AFBF00180E00033230B000FF8F83FF94B6
65997+:100DF000022020219062002502028025A07000259B
65998+:100E00008C7000183C0280000E00033D020280241A
65999+:100E10001600000B8FBF00183C0480008C8201F884
66000+:100E20000440FFFE348201C024030002AC510000E4
66001+:100E3000A04300043C021000AC8201F88FBF0018F0
66002+:100E40008FB100148FB0001003E0000827BD002010
66003+:100E500027BDFFE83C028000AFBF00103442018094
66004+:100E6000944300048C4400083063020010600005C5
66005+:100E7000000028210E00100C000000000A0003787A
66006+:100E8000240500013C02FF000480000700821824B2
66007+:100E90003C02040014620004240500018F82FF94C8
66008+:100EA00090420008240500018FBF001000A010210F
66009+:100EB00003E0000827BD00188F82FF982405000179
66010+:100EC000A040001A3C028000344201400A00034264
66011+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
66012+:100EE000AFB20018AFB10014AFB0001090A2000074
66013+:100EF000304400FF38830020388200300003182B74
66014+:100F00000002102B0062182410600003240200501D
66015+:100F1000148200A88FBF001C90A20005304200017F
66016+:100F2000104000A48FBF001C3C02800034420140EE
66017+:100F3000904200082443FFFF2C6200051040009EF1
66018+:100F40008FB20018000310803C030800246355ACE6
66019+:100F5000004310218C420000004000080000000007
66020+:100F60003C028000345101400E0003328E24000008
66021+:100F70008F92FF948E2200048E50000C1602000205
66022+:100F800024020001AE42000C0E00033D8E2400003E
66023+:100F90008E220004145000068FBF001C8FB2001870
66024+:100FA0008FB100148FB000100A000F7827BD002009
66025+:100FB0008E42000C0A000419000000003C0480006E
66026+:100FC0003482014094A300108C4200043063FFFF80
66027+:100FD0001443001C0000000024020001A4A2001021
66028+:100FE0008C8202380441000F3C0380003C02003F29
66029+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
66030+:1010000000461824004810240002130200031D8229
66031+:10101000106200583C0280008C8202380440FFF7C6
66032+:101020003C038000346201408C44000034620200C2
66033+:10103000AC4400003C021000AC6202380A00043BE1
66034+:101040008FBF001C94A200100A00041900000000C9
66035+:10105000240200201482000F3C0280003C03800028
66036+:1010600094A20012346301408C6300043042FFFFFD
66037+:10107000146200050000000024020001A4A2001276
66038+:101080000A0004028FBF001C94A200120A00041977
66039+:1010900000000000345101400E0003328E24000095
66040+:1010A0008F92FF948E230004964200123050FFFF6F
66041+:1010B0001603000224020001A64200120E00033DA6
66042+:1010C0008E2400008E220004160200068FBF001C32
66043+:1010D0008FB200188FB100148FB000100A00037C8B
66044+:1010E00027BD0020964200120A00041900000000EB
66045+:1010F0003C03800094A20014346301408C6300041C
66046+:101100003042FFFF14620008240200018FBF001C60
66047+:101110008FB200188FB100148FB00010A4A2001479
66048+:101120000A00146327BD002094A20014144000217B
66049+:101130008FBF001C0A000435000000003C03800043
66050+:1011400094A20016346301408C6300043042FFFF18
66051+:101150001462000D240200018FBF001C8FB2001822
66052+:101160008FB100148FB00010A4A200160A000B1457
66053+:1011700027BD00209442007824420004A4A200105D
66054+:101180000A00043B8FBF001C94A200162403000138
66055+:101190003042FFFF144300078FBF001C3C020800D1
66056+:1011A0008C420070244200013C010800AC22007017
66057+:1011B0008FBF001C8FB200188FB100148FB00010C9
66058+:1011C00003E0000827BD002027BDFFD8AFB20018FC
66059+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
66060+:1011E000AFB000103C028000345101008C5001006F
66061+:1011F0009242000092230009304400FF2402001FA5
66062+:10120000106200AB28620020104000192402003850
66063+:101210002862000A1040000D2402000B286200081A
66064+:101220001040002E8F820024046001042862000216
66065+:101230001440002A8F820024240200061062002637
66066+:101240008FBF00200A00055F8FB3001C1062006092
66067+:101250002862000B144000FA8FBF00202402000E09
66068+:10126000106200788F8200240A00055F8FB3001C93
66069+:10127000106200D2286200391040000A2402008067
66070+:1012800024020036106200E528620037104000C3D7
66071+:1012900024020035106200D98FBF00200A00055FCC
66072+:1012A0008FB3001C1062002D2862008110400006E0
66073+:1012B000240200C824020039106200C98FBF002038
66074+:1012C0000A00055F8FB3001C106200A28FBF0020D0
66075+:1012D0000A00055F8FB3001C8F8200248C42000C33
66076+:1012E000104000D78FBF00200E000D8400000000CA
66077+:1012F0003C038000346301008C6200008F85002075
66078+:10130000946700089466000CACA200008C64000492
66079+:101310008F82002400063400ACA400049448001E10
66080+:101320008C62001800073C0000E83825ACA20008D9
66081+:101330008C62001C24040001ACA2000C9062000A24
66082+:1013400000C23025ACA60010ACA00014ACA0001860
66083+:10135000ACA7001C0A00051D8FBF00208F8200244F
66084+:101360008C42000C104000B68FBF00200E000D8490
66085+:10137000000000008F820024962400089625000CAF
66086+:101380009443001E000422029626000E8F82002045
66087+:10139000000426000083202500052C003C0300806B
66088+:1013A00000A6282500832025AC400000AC400004A6
66089+:1013B000AC400008AC40000CAC450010AC40001440
66090+:1013C000AC400018AC44001C0A00051C24040001B9
66091+:1013D0009622000C14400018000000009242000504
66092+:1013E0003042001014400014000000000E000332D0
66093+:1013F0000200202192420005020020213442001008
66094+:101400000E00033DA242000592420000240300208A
66095+:10141000304200FF10430089020020218FBF0020CE
66096+:101420008FB3001C8FB200188FB100148FB0001062
66097+:101430000A00107527BD00280000000D0A00055E97
66098+:101440008FBF00208C42000C1040007D8FBF002019
66099+:101450000E000D84000000008E2200048F84002006
66100+:101460009623000CAC8200003C0280089445002CBE
66101+:101470008F82002400031C0030A5FFFF9446001E4D
66102+:101480003C02400E0065182500C23025AC830004E4
66103+:10149000AC800008AC80000CAC800010AC80001464
66104+:1014A000AC800018AC86001C0A00051C2404000156
66105+:1014B0000E000332020020218F93FF9802002021AA
66106+:1014C0000E00033DA660000C020020210E00034226
66107+:1014D000240500018F8200248C42000C104000582B
66108+:1014E0008FBF00200E000D84000000009622000C2B
66109+:1014F0008F83002000021400AC700000AC62000476
66110+:10150000AC6000088E4400388F820024AC64000C6C
66111+:101510008E46003C9445001E3C02401FAC66001005
66112+:1015200000A228258E62000424040001AC6200148D
66113+:10153000AC600018AC65001C8FBF00208FB3001C8E
66114+:101540008FB200188FB100148FB000100A000DB8D0
66115+:1015500027BD0028240200201082003A8FB3001C0F
66116+:101560000E000F5E00000000104000358FBF00200D
66117+:101570003C0480008C8201F80440FFFE348201C0EC
66118+:1015800024030002AC500000A04300043C02100001
66119+:10159000AC8201F80A00055E8FBF00200200202106
66120+:1015A0008FBF00208FB3001C8FB200188FB10014C2
66121+:1015B0008FB000100A000EA727BD00289625000C4A
66122+:1015C000020020218FBF00208FB3001C8FB20018B3
66123+:1015D0008FB100148FB000100A000ECC27BD002878
66124+:1015E000020020218FB3001C8FB200188FB10014AD
66125+:1015F0008FB000100A000EF727BD00289225000DBD
66126+:10160000020020218FB3001C8FB200188FB100148C
66127+:101610008FB000100A000F4827BD002802002021CB
66128+:101620008FBF00208FB3001C8FB200188FB1001441
66129+:101630008FB000100A000F1F27BD00288FBF0020A9
66130+:101640008FB3001C8FB200188FB100148FB0001040
66131+:1016500003E0000827BD00283C0580008CA202782A
66132+:101660000440FFFE34A2024024030002AC44000008
66133+:10167000A04300043C02100003E00008ACA2027882
66134+:10168000A380001803E00008A38000193C03800039
66135+:101690008C6202780440FFFE8F82001CAC62024024
66136+:1016A00024020002A06202443C02100003E0000891
66137+:1016B000AC6202783C02600003E000088C425404F3
66138+:1016C0009083003024020005008040213063003FF9
66139+:1016D0000000482114620005000050219082004C57
66140+:1016E0009483004E304900FF306AFFFFAD00000CCC
66141+:1016F000AD000010AD000024950200148D05001C03
66142+:101700008D0400183042FFFF004910230002110031
66143+:10171000000237C3004038210086202300A2102B8E
66144+:101720000082202300A72823AD05001CAD0400186B
66145+:10173000A5090014A5090020A50A001603E0000869
66146+:10174000A50A002203E000080000000027BDFFD822
66147+:10175000AFB200183C128008AFB40020AFB3001C39
66148+:10176000AFB10014AFBF0024AFB00010365101007C
66149+:101770003C0260008C4254049222000C3C1408008D
66150+:10178000929400F7304300FF2402000110620032FF
66151+:101790000080982124020002146200353650008037
66152+:1017A0000E00143D000000009202004C2403FF8054
66153+:1017B0003C0480003042007F000211C024420240FD
66154+:1017C0000262102100431824AC8300949245000863
66155+:1017D0009204004C3042007F3C03800614850007D1
66156+:1017E000004380212402FFFFA22200112402FFFFF8
66157+:1017F000A62200120A0005D22402FFFF9602002052
66158+:10180000A222001196020022A62200128E020024BB
66159+:101810003C048008AE2200143485008090A2004C65
66160+:1018200034830100A06200108CA2003CAC6200185E
66161+:101830008C820068AC6200F48C820064AC6200F0C0
66162+:101840008C82006CAC6200F824020001A0A2006847
66163+:101850000A0005EE3C0480080E001456000000004B
66164+:1018600036420080A04000680A0005EE3C04800873
66165+:10187000A2000068A20000690A0006293C02800854
66166+:10188000348300808C62003834850100AC62006CC7
66167+:1018900024020001A062006990A200D59083000894
66168+:1018A000305100FF3072007F12320019001111C058
66169+:1018B00024420240026210212403FF8000431824C6
66170+:1018C0003C048000AC8300943042007F3C038006DF
66171+:1018D000004380218E02000C1040000D02002021E8
66172+:1018E0000E00057E0000000026220001305100FF9E
66173+:1018F0009203003C023410260002102B0002102339
66174+:101900003063007F022288240A0005F8A203003C0D
66175+:101910003C088008350401008C8200E03507008017
66176+:10192000ACE2003C8C8200E0AD02000090E5004C8F
66177+:10193000908600D590E3004C908400D52402FF806F
66178+:1019400000A228243063007F308400FF00A62825F1
66179+:101950000064182A1060000230A500FF38A500803E
66180+:10196000A0E5004CA10500093C0280089043000E50
66181+:10197000344400803C058000A043000A8C8300189A
66182+:101980003C027FFF3442FFFF00621824AC83001842
66183+:101990008CA201F80440FFFE00000000ACB301C0BF
66184+:1019A0008FBF00248FB400208FB3001C8FB20018AB
66185+:1019B0008FB100148FB0001024020002A0A201C455
66186+:1019C00027BD00283C02100003E00008ACA201F88B
66187+:1019D00090A2000024420001A0A200003C030800E5
66188+:1019E0008C6300F4304200FF144300020080302179
66189+:1019F000A0A0000090A200008F84001C000211C073
66190+:101A00002442024024830040008220212402FF80DF
66191+:101A1000008220243063007F3C02800A006218218B
66192+:101A20003C028000AC44002403E00008ACC300008A
66193+:101A300094820006908300058C85000C8C86001033
66194+:101A40008C8700188C88001C8C8400203C010800C6
66195+:101A5000A42256C63C010800A02356C53C0108003C
66196+:101A6000AC2556CC3C010800AC2656D03C01080001
66197+:101A7000AC2756D83C010800AC2856DC3C010800D5
66198+:101A8000AC2456E003E00008000000003C0280089F
66199+:101A9000344201008C4400343C038000346504006F
66200+:101AA000AC6400388C420038AF850028AC62003C42
66201+:101AB0003C020005AC6200300000000000000000A5
66202+:101AC00003E00008000000003C020006308400FF34
66203+:101AD000008220253C028000AC4400300000000061
66204+:101AE00000000000000000003C0380008C62000049
66205+:101AF000304200101040FFFD3462040003E0000893
66206+:101B0000AF82002894C200003C080800950800CA73
66207+:101B100030E7FFFF0080482101021021A4C200002D
66208+:101B200094C200003042FFFF00E2102B544000013D
66209+:101B3000A4C7000094A200003C0308008C6300CC02
66210+:101B400024420001A4A2000094A200003042FFFF42
66211+:101B5000144300073C0280080107102BA4A00000DA
66212+:101B60005440000101003821A4C700003C02800855
66213+:101B7000344601008CC3002894A200003C0480007D
66214+:101B80003042FFFE000210C000621021AC82003C17
66215+:101B90008C82003C006218231860000400000000E2
66216+:101BA0008CC200240A0006BA244200018CC2002420
66217+:101BB000AC8200383C020050344200103C038000EC
66218+:101BC000AC620030000000000000000000000000D7
66219+:101BD0008C620000304200201040FFFD0000000039
66220+:101BE00094A200003C04800030420001000210C0BA
66221+:101BF000004410218C430400AD2300008C420404F7
66222+:101C0000AD2200043C02002003E00008AC8200305A
66223+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
66224+:101C2000AFBF001C94C2000000C080213C1208001D
66225+:101C3000965200C624420001A6020000960300004E
66226+:101C400094E2000000E03021144300058FB1003021
66227+:101C50000E00068F024038210A0006F10000000045
66228+:101C60008C8300048C82000424420040046100073D
66229+:101C7000AC8200048C8200040440000400000000D8
66230+:101C80008C82000024420001AC8200009602000019
66231+:101C90003042FFFF50520001A600000096220000D3
66232+:101CA00024420001A62200003C02800834420100C8
66233+:101CB000962300009442003C144300048FBF001C94
66234+:101CC00024020001A62200008FBF001C8FB2001862
66235+:101CD0008FB100148FB0001003E0000827BD002072
66236+:101CE00027BDFFE03C028008AFBF0018344201006E
66237+:101CF0008C4800343C03800034690400AC68003830
66238+:101D00008C42003830E700FFAF890028AC62003C0D
66239+:101D10003C020005AC620030000000000000000042
66240+:101D200000000000000000000000000000000000B3
66241+:101D30008C82000C8C82000C97830016AD22000070
66242+:101D40008C82001000604021AD2200048C820018BB
66243+:101D5000AD2200088C82001CAD22000C8CA2001465
66244+:101D6000AD2200108C820020AD220014908200056C
66245+:101D7000304200FF00021200AD2200188CA20018B1
66246+:101D8000AD22001C8CA2000CAD2200208CA2001001
66247+:101D9000AD2200248CA2001CAD2200288CA20020C1
66248+:101DA000AD22002C3402FFFFAD260030AD20003400
66249+:101DB000506200013408FFFFAD28003850E00011E8
66250+:101DC0003C0280083C048008348401009482005066
66251+:101DD0003042FFFFAD22003C9483004494850044D0
66252+:101DE000240200013063FFFF000318C200641821C1
66253+:101DF0009064006430A5000700A210040A00075C8C
66254+:101E00000044102534420100AD20003C94430044BE
66255+:101E1000944400443063FFFF000318C2006218219D
66256+:101E200030840007906500642402000100821004E1
66257+:101E30000002102700451024A0620064000000008A
66258+:101E400000000000000000003C0200063442004098
66259+:101E50003C038000AC620030000000000000000085
66260+:101E6000000000008C620000304200101040FFFDB6
66261+:101E70003C06800834C201503463040034C7014A70
66262+:101E800034C4013434C5014034C60144AFA200104B
66263+:101E90000E0006D2AF8300288FBF001803E00008B1
66264+:101EA00027BD00208F8300143C0608008CC600E884
66265+:101EB0008F82001C30633FFF000319800046102111
66266+:101EC000004310212403FF80004318243C068000B7
66267+:101ED000ACC300283042007F3C03800C004330211B
66268+:101EE00090C2000D30A500FF0000382134420010E0
66269+:101EF000A0C2000D8F8900143C028008344201000A
66270+:101F00009443004400091382304800032402000176
66271+:101F1000A4C3000E1102000B2902000210400005AC
66272+:101F2000240200021100000C240300010A0007A48F
66273+:101F30000000182111020006000000000A0007A49A
66274+:101F4000000018218CC2002C0A0007A424430001C1
66275+:101F50008CC20014244300018CC200180043102BD3
66276+:101F60005040000A240700012402002714A20003A5
66277+:101F70003C0380080A0007B1240700013463010014
66278+:101F80009462004C24420001A462004C00091382B8
66279+:101F9000304300032C620002104000090080282119
66280+:101FA000146000040000000094C200340A0007C15D
66281+:101FB0003046FFFF8CC600380A0007C10080282188
66282+:101FC000000030213C040800248456C00A000706A3
66283+:101FD0000000000027BDFF90AFB60068AFB50064F9
66284+:101FE000AFB40060AFB3005CAFB20058AFB1005403
66285+:101FF000AFBF006CAFB000508C9000000080B021EB
66286+:102000003C0208008C4200E8960400328F83001CDA
66287+:102010002414FF8030843FFF0062182100042180D7
66288+:1020200000641821007410243C13800000A090214B
66289+:1020300090A50000AE620028920400323C02800CA1
66290+:102040003063007F00628821308400C02402004099
66291+:10205000148200320000A8218E3500388E2200182C
66292+:102060001440000224020001AE2200189202003C3B
66293+:10207000304200201440000E8F83001C000511C068
66294+:102080002442024000621821306400783C02008043
66295+:102090000082202500741824AE630800AE64081086
66296+:1020A0008E2200188E03000800431021AE22001873
66297+:1020B0008E22002C8E230018244200010062182B6F
66298+:1020C0001060004300000000924200002442000122
66299+:1020D000A24200003C0308008C6300F4304200FF81
66300+:1020E00050430001A2400000924200008F84001C77
66301+:1020F000000211C024420240248300403063007F6C
66302+:10210000008220213C02800A0094202400621821D1
66303+:10211000AE6400240A0008D2AEC30000920300326D
66304+:102120002402FFC000431024304200FF1440000589
66305+:1021300024020001AE220018962200340A00084250
66306+:102140003055FFFF8E22001424420001AE220018F9
66307+:102150009202003000021600000216030441001C27
66308+:10216000000000009602003227A400100080282101
66309+:10217000A7A20016960200320000302124070001B9
66310+:102180003042FFFFAF8200140E000706AFA0001C14
66311+:10219000960200328F83001C3C0408008C8400E807
66312+:1021A00030423FFF000211800064182100621821B4
66313+:1021B00000741024AE62002C3063007F3C02800E5D
66314+:1021C000006218219062000D3042007FA062000D75
66315+:1021D0009222000D304200105040007892420000E0
66316+:1021E0003C028008344401009482004C8EC30000FD
66317+:1021F0003C130800967300C62442FFFFA482004CE3
66318+:10220000946200329623000E3054FFFF3070FFFFBF
66319+:102210003C0308008C6300D000701807A7A30038A7
66320+:102220009482003E3063FFFF3042FFFF14620007DC
66321+:10223000000000008C8200303C038000244200300B
66322+:10224000AC62003C0A00086A8C82002C9482004038
66323+:102250003042FFFF5462000927A400408C820038FE
66324+:102260003C03800024420030AC62003C8C8200348D
66325+:10227000AC6200380A0008793C03800027A50038CA
66326+:1022800027A60048026038210E00068FA7A000484C
66327+:102290008FA300403C02800024630030AC43003830
66328+:1022A0008FA30044AC43003C3C0380003C0200058B
66329+:1022B000AC6200303C028008344401009482004249
66330+:1022C000346304003042FFFF0202102B1440000769
66331+:1022D000AF8300289482004E9483004202021021B2
66332+:1022E000004310230A00088F3043FFFF9483004E01
66333+:1022F00094820042026318210050102300621823C8
66334+:102300003063FFFF3C028008344401009482003CAB
66335+:102310003042FFFF14430003000000000A00089F42
66336+:10232000240300019482003C3042FFFF0062102B26
66337+:10233000144000058F8200289482003C0062102324
66338+:102340003043FFFF8F820028AC550000AC400004F2
66339+:10235000AC540008AC43000C3C02000634420010B0
66340+:102360003C038000AC620030000000000000000070
66341+:10237000000000008C620000304200101040FFFDA1
66342+:102380003C04800834840100001018C20064182145
66343+:102390009065006432020007240600010046100424
66344+:1023A00000451025A0620064948300429622000E2E
66345+:1023B00050430001A386001892420000244200010D
66346+:1023C000A24200003C0308008C6300F4304200FF8E
66347+:1023D00050430001A2400000924200008F84001C84
66348+:1023E000000211C0244202402483004000822021C8
66349+:1023F0002402FF80008220243063007F3C02800A98
66350+:10240000006218213C028000AC440024AEC30000EE
66351+:102410008FBF006C8FB600688FB500648FB400600A
66352+:102420008FB3005C8FB200588FB100548FB0005052
66353+:1024300003E0000827BD007027BDFFD8AFB3001C24
66354+:10244000AFB20018AFB10014AFB00010AFBF0020A2
66355+:102450000080982100E0802130B1FFFF0E000D8444
66356+:1024600030D200FF0000000000000000000000006B
66357+:102470008F8200208F830024AC510000AC520004F6
66358+:10248000AC530008AC40000CAC400010AC40001451
66359+:10249000AC4000189463001E02038025AC50001C61
66360+:1024A0000000000000000000000000002404000103
66361+:1024B0008FBF00208FB3001C8FB200188FB10014A3
66362+:1024C0008FB000100A000DB827BD002830A5FFFF0F
66363+:1024D0000A0008DC30C600FF3C02800834430100DB
66364+:1024E0009462000E3C080800950800C63046FFFFC5
66365+:1024F00014C000043402FFFF946500EA0A000929B1
66366+:102500008F84001C10C20027000000009462004E5F
66367+:102510009464003C3045FFFF00A6102300A6182B52
66368+:102520003087FFFF106000043044FFFF00C5102318
66369+:1025300000E210233044FFFF0088102B1040000EF3
66370+:1025400000E810233C028008344401002403000109
66371+:1025500034420080A44300162402FFFFA482000E30
66372+:10256000948500EA8F84001C0000302130A5FFFF15
66373+:102570000A0009013C0760200044102A10400009AD
66374+:102580003C0280083443008094620016304200010F
66375+:10259000104000043C0280009442007E244200145B
66376+:1025A000A462001603E000080000000027BDFFE061
66377+:1025B0003C028008AFBF001CAFB0001834420100DD
66378+:1025C000944300429442004C104000193068FFFFD1
66379+:1025D0009383001824020001146200298FBF001C9D
66380+:1025E0003C06800834D00100000810C200501021C1
66381+:1025F000904200643103000734C70148304200FFB5
66382+:10260000006210073042000134C9014E34C4012C6D
66383+:1026100034C5013E1040001634C601420E0006D2F9
66384+:10262000AFA90010960200420A0009463048FFFF99
66385+:102630003C028008344401009483004494820042A8
66386+:102640001043000F8FBF001C94820044A4820042FC
66387+:1026500094820050A482004E8C820038AC820030FC
66388+:1026600094820040A482003E9482004AA4820048E2
66389+:102670008FBF001C8FB000180A00090427BD00207E
66390+:102680008FB0001803E0000827BD002027BDFFA081
66391+:10269000AFB1004C3C118000AFBF0058AFB3005445
66392+:1026A000AFB20050AFB000483626018890C2000398
66393+:1026B0003044007FA3A400108E32018090C200003D
66394+:1026C0003043007F240200031062003BAF92001CE5
66395+:1026D00028620004104000062402000424020002C4
66396+:1026E000106200098FBF00580A000B0F8FB300540F
66397+:1026F0001062004D240200051062014E8FBF005889
66398+:102700000A000B0F8FB30054000411C002421021C5
66399+:102710002404FF8024420240004410242643004049
66400+:10272000AE2200243063007F3C02800A0062182140
66401+:102730009062003CAFA3003C00441025A062003C26
66402+:102740008FA3003C9062003C304200401040016C7E
66403+:102750008FBF00583C108008A3800018361001007D
66404+:102760008E0200E08C63003427A4003C27A50010F3
66405+:10277000004310210E0007C3AE0200E093A2001038
66406+:102780003C038000A20200D58C6202780440FFFE68
66407+:102790008F82001CAC62024024020002A06202444C
66408+:1027A0003C021000AC6202780E0009390000000003
66409+:1027B0000A000B0E8FBF00583C05800890C3000133
66410+:1027C00090A2000B1443014E8FBF005834A4008028
66411+:1027D0008C8200189082004C90A200083C0260009D
66412+:1027E0008C4254048C8300183C027FFF3442FFFF6C
66413+:1027F000006218243C0208008C4200B4AC8300182C
66414+:102800003C038000244200013C010800AC2200B4DB
66415+:102810008C6201F80440FFFE8F82001CAC6201C094
66416+:102820000A000AD6240200023C10800890C300016E
66417+:102830009202000B144301328FBF005827A40018E6
66418+:1028400036050110240600033C0260008C4254044B
66419+:102850000E000E470000000027A40028360501F0F6
66420+:102860000E000E47240600038FA200283603010045
66421+:10287000AE0200648FA2002CAE0200688FA200306E
66422+:10288000AE02006C93A40018906300D52402FF8070
66423+:102890000082102400431025304900FF3084007F5F
66424+:1028A0003122007F0082102A544000013929008023
66425+:1028B000000411C0244202402403FF800242102180
66426+:1028C00000431024AE220094264200403042007F94
66427+:1028D0003C038006004340218FA3001C2402FFFF1D
66428+:1028E000AFA800403C130800927300F71062003359
66429+:1028F00093A2001995030014304400FF3063FFFFDA
66430+:102900000064182B106000100000000095040014F3
66431+:102910008D07001C8D0600183084FFFF0044202323
66432+:102920000004210000E438210000102100E4202BE5
66433+:1029300000C2302100C43021AD07001CAD060018D4
66434+:102940000A000A2F93A20019950400148D07001C99
66435+:102950008D0600183084FFFF008220230004210030
66436+:10296000000010210080182100C2302300E4202B39
66437+:1029700000C4302300E33823AD07001CAD06001867
66438+:1029800093A200198FA30040A462001497A2001A1A
66439+:10299000A46200168FA2001CAC6200108FA2001C63
66440+:1029A000AC62000C93A20019A462002097A2001A46
66441+:1029B000A46200228FA2001CAC6200243C048008A8
66442+:1029C000348300808C6200388FA20020012088218F
66443+:1029D000AC62003C8FA20020AC82000093A20018E1
66444+:1029E000A062004C93A20018A0820009A0600068B9
66445+:1029F00093A20018105100512407FF803229007F54
66446+:102A0000000911C024420240024210213046007FDA
66447+:102A10003C03800000471024AC6200943C02800616
66448+:102A200000C2302190C2003CAFA60040000020212F
66449+:102A300000471025A0C2003C8FA80040950200026C
66450+:102A4000950300148D07001C3042FFFF3063FFFF29
66451+:102A50008D060018004310230002110000E2382107
66452+:102A600000E2102B00C4302100C23021AD07001C51
66453+:102A7000AD06001895020002A5020014A50000167C
66454+:102A80008D020008AD0200108D020008AD02000C9E
66455+:102A900095020002A5020020A50000228D02000878
66456+:102AA000AD0200249102003C304200401040001A68
66457+:102AB000262200013C108008A3A90038A38000183A
66458+:102AC000361001008E0200E08D03003427A4004080
66459+:102AD00027A50038004310210E0007C3AE0200E016
66460+:102AE00093A200383C038000A20200D58C620278D9
66461+:102AF0000440FFFE8F82001CAC62024024020002F0
66462+:102B0000A06202443C021000AC6202780E00093957
66463+:102B100000000000262200013043007F14730004EF
66464+:102B2000004020212403FF8002231024004320269C
66465+:102B300093A200180A000A4B309100FF93A40018DA
66466+:102B40008FA3001C2402FFFF1062000A308900FFDF
66467+:102B500024820001248300013042007F14530005C9
66468+:102B6000306900FF2403FF800083102400431026F7
66469+:102B7000304900FF3C028008904200080120882173
66470+:102B8000305000FF123000193222007F000211C0C5
66471+:102B900002421021244202402403FF8000431824F3
66472+:102BA0003C048000AC8300943042007F3C038006EC
66473+:102BB000004310218C43000C004020211060000BCA
66474+:102BC000AFA200400E00057E000000002623000199
66475+:102BD0002405FF803062007F145300020225202468
66476+:102BE000008518260A000AAF307100FF3C048008F7
66477+:102BF000348400808C8300183C027FFF3442FFFF46
66478+:102C000000621824AC8300183C0380008C6201F839
66479+:102C10000440FFFE00000000AC7201C0240200026C
66480+:102C2000A06201C43C021000AC6201F80A000B0E65
66481+:102C30008FBF00583C04800890C300019082000BB5
66482+:102C40001443002F8FBF0058349000809202000878
66483+:102C500030420040104000200000000092020008B6
66484+:102C60000002160000021603044100050240202164
66485+:102C70000E000ECC240500930A000B0E8FBF0058E7
66486+:102C80009202000924030018304200FF1443000D93
66487+:102C900002402021240500390E000E64000030217E
66488+:102CA0000E0003328F84001C8F82FF9424030012D5
66489+:102CB000A04300090E00033D8F84001C0A000B0E88
66490+:102CC0008FBF0058240500360E000E64000030212E
66491+:102CD0000A000B0E8FBF00580E0003320240202165
66492+:102CE000920200058F84001C344200200E00033D38
66493+:102CF000A20200050E0010758F84001C8FBF0058C3
66494+:102D00008FB300548FB200508FB1004C8FB0004889
66495+:102D100003E0000827BD00603C0280083445010044
66496+:102D20003C0280008C42014094A3000E0000302140
66497+:102D300000402021AF82001C3063FFFF3402FFFF00
66498+:102D4000106200063C0760202402FFFFA4A2000ED0
66499+:102D500094A500EA0A00090130A5FFFF03E000087E
66500+:102D60000000000027BDFFC83C0280003C06800830
66501+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
66502+:102D8000AFB30024AFB20020AFB00018345101003F
66503+:102D900034C501008C4301008E2200148CA400E491
66504+:102DA0000000A821AF83001C0044102318400052EB
66505+:102DB000A38000188E22001400005021ACA200E471
66506+:102DC00090C3000890A200D53073007FA3A200102A
66507+:102DD0008CB200E08CB400E4304200FF1053003BA2
66508+:102DE00093A200108F83001C2407FF80000211C0F3
66509+:102DF0000062102124420240246300400047102456
66510+:102E00003063007F3C0980003C08800A006818217C
66511+:102E1000AD2200248C62003427A4001427A50010E2
66512+:102E2000024280210290102304400028AFA3001426
66513+:102E30009062003C00E21024304200FF1440001970
66514+:102E4000020090219062003C34420040A062003CAD
66515+:102E50008F86001C93A3001024C200403042007FE4
66516+:102E6000004828213C0208008C4200F42463000141
66517+:102E7000306400FF14820002A3A30010A3A000107E
66518+:102E800093A20010AFA50014000211C0244202401A
66519+:102E900000C2102100471024AD2200240A000B4577
66520+:102EA00093A200100E0007C3000000003C0280083F
66521+:102EB00034420100AC5000E093A30010240A00014A
66522+:102EC000A04300D50A000B4593A200102402000184
66523+:102ED000154200093C0380008C6202780440FFFE2A
66524+:102EE0008F82001CAC62024024020002A0620244F5
66525+:102EF0003C021000AC6202789222000B2403000214
66526+:102F0000304200FF144300720000000096220008C7
66527+:102F1000304300FF24020082146200402402008437
66528+:102F20003C028000344901008D22000C95230006EC
66529+:102F3000000216023063FFFF3045003F24020027E5
66530+:102F400010A2000FAF83001428A200281040000830
66531+:102F5000240200312402002110A2000924020025CD
66532+:102F600010A20007938200190A000BBD00000000A8
66533+:102F700010A20007938200190A000BBD0000000098
66534+:102F80000E000777012020210A000C3D0000000000
66535+:102F90003C0380008C6202780440FFFE8F82001C9C
66536+:102FA000AC62024024020002A06202443C02100013
66537+:102FB000AC6202780A000C3D000000009523000678
66538+:102FC000912400058D25000C8D2600108D270018FA
66539+:102FD0008D28001C8D290020244200013C0108009E
66540+:102FE000A42356C63C010800A02456C53C01080095
66541+:102FF000AC2556CC3C010800AC2656D03C0108005C
66542+:10300000AC2756D83C010800AC2856DC3C0108002F
66543+:10301000AC2956E00A000C3DA38200191462000A94
66544+:10302000240200813C02800834420100944500EAF9
66545+:10303000922600058F84001C30A5FFFF30C600FFDC
66546+:103040000A000BFE3C0760211462005C00000000D7
66547+:103050009222000A304300FF306200201040000737
66548+:10306000306200403C02800834420100944500EA8E
66549+:103070008F84001C0A000BFC24060040104000074F
66550+:10308000000316003C02800834420100944500EA27
66551+:103090008F84001C0A000BFC24060041000216036A
66552+:1030A000044100463C02800834420100944500EA95
66553+:1030B0008F84001C2406004230A5FFFF3C076019E6
66554+:1030C0000E000901000000000A000C3D0000000095
66555+:1030D0009222000B24040016304200FF1044000628
66556+:1030E0003C0680009222000B24030017304200FFB0
66557+:1030F000144300320000000034C5010090A2000B10
66558+:10310000304200FF1444000B000080218CA20020FC
66559+:103110008CA400202403FF800043102400021140EF
66560+:103120003084007F004410253C032000004310251C
66561+:10313000ACC2083094A2000800021400000214037C
66562+:10314000044200012410000194A2000830420080D3
66563+:103150005040001A0200A82194A20008304220002A
66564+:10316000504000160200A8218CA300183C021C2D20
66565+:10317000344219ED106200110200A8213C0208003F
66566+:103180008C4200D4104000053C0280082403000457
66567+:1031900034420100A04300FC3C028008344201009C
66568+:1031A000944500EA8F84001C2406000630A5FFFF2A
66569+:1031B0000E0009013C0760210200A8210E00093918
66570+:1031C000000000009222000A304200081040000473
66571+:1031D00002A010210E0013790000000002A01021AF
66572+:1031E0008FBF00308FB5002C8FB400288FB3002420
66573+:1031F0008FB200208FB1001C8FB0001803E00008D0
66574+:1032000027BD00382402FF80008220243C02900069
66575+:1032100034420007008220253C028000AC4400209C
66576+:103220003C0380008C6200200440FFFE0000000090
66577+:1032300003E00008000000003C0380002402FF803F
66578+:10324000008220243462000700822025AC64002024
66579+:103250008C6200200440FFFE0000000003E0000834
66580+:103260000000000027BDFFD8AFB3001CAFB10014B1
66581+:10327000AFB00010AFBF0020AFB200183C1180000B
66582+:103280003C0280088E32002034530100AE2400201E
66583+:10329000966300EA000514003C074000004738250B
66584+:1032A00000A08021000030210E0009013065FFFFE1
66585+:1032B000240200A1160200022402FFFFA2620009FC
66586+:1032C000AE3200208FBF00208FB3001C8FB20018D9
66587+:1032D0008FB100148FB0001003E0000827BD002854
66588+:1032E0003C0280082403000527BDFFE834420100AA
66589+:1032F000A04300FCAFBF00103C0280008C420100E4
66590+:10330000240500A1004020210E000C67AF82001CA4
66591+:103310003C0380008C6202780440FFFE8F82001C18
66592+:103320008FBF001027BD0018AC62024024020002CB
66593+:10333000A06202443C021000AC62027803E0000884
66594+:103340000000000027BDFFE83C068000AFBF001072
66595+:1033500034C7010094E20008304400FF3883008243
66596+:10336000388200842C6300012C4200010062182581
66597+:103370001060002D24020083938200195040003B0E
66598+:103380008FBF00103C020800904256CC8CC4010054
66599+:103390003C06080094C656C63045003F38A30032AC
66600+:1033A00038A2003F2C6300012C4200010062182566
66601+:1033B000AF84001CAF860014A380001914600007BE
66602+:1033C00000E020212402002014A2001200000000CE
66603+:1033D0003402FFFF14C2000F00000000240200208E
66604+:1033E00014A2000500E028218CE300142402FFFF52
66605+:1033F0005062000B8FBF00103C040800248456C0AC
66606+:10340000000030210E000706240700010A000CD638
66607+:103410008FBF00100E000777000000008FBF001064
66608+:103420000A00093927BD001814820004240200850F
66609+:103430008CC501040A000CE1000020211482000662
66610+:103440002482FF808CC50104240440008FBF00103B
66611+:103450000A00016727BD0018304200FF2C4200021D
66612+:1034600010400004240200228FBF00100A000B2726
66613+:1034700027BD0018148200048F8200248FBF001023
66614+:103480000A000C8627BD00188C42000C1040001E5C
66615+:1034900000E0282190E300092402001814620003D0
66616+:1034A000240200160A000CFC240300081462000722
66617+:1034B00024020017240300123C02800834420080DA
66618+:1034C000A04300090A000D0994A7000854620007F0
66619+:1034D00094A700088F82FF942404FFFE9043000508
66620+:1034E00000641824A043000594A7000890A6001BC0
66621+:1034F0008CA4000094A500068FBF001000073C00BC
66622+:103500000A0008DC27BD00188FBF001003E0000888
66623+:1035100027BD00188F8500243C04800094A2002A57
66624+:103520008CA30034000230C02402FFF000C210243B
66625+:1035300000621821AC83003C8CA200303C03800068
66626+:10354000AC8200383C02005034420010AC620030C3
66627+:103550000000000000000000000000008C6200007D
66628+:10356000304200201040FFFD30C20008104000062D
66629+:103570003C0280008C620408ACA200208C62040C27
66630+:103580000A000D34ACA200248C430400ACA300203C
66631+:103590008C420404ACA200243C0300203C028000C6
66632+:1035A000AC4300303C0480008C8200300043102487
66633+:1035B0001440FFFD8F8600243C020040AC820030A6
66634+:1035C00094C3002A94C2002894C4002C94C5002EF1
66635+:1035D00024630001004410213064FFFFA4C20028CE
66636+:1035E00014850002A4C3002AA4C0002A03E0000836
66637+:1035F000000000008F84002427BDFFE83C05800404
66638+:1036000024840010AFBF00100E000E472406000AED
66639+:103610008F840024948200129483002E3042000F85
66640+:10362000244200030043180424027FFF0043102BB0
66641+:1036300010400002AC8300000000000D0E000D13CE
66642+:10364000000000008F8300248FBF001027BD0018EA
66643+:10365000946200149463001A3042000F00021500B7
66644+:10366000006218253C02800003E00008AC4300A083
66645+:103670008F8300243C028004944400069462001A64
66646+:103680008C650000A4640016004410233042FFFF44
66647+:103690000045102B03E00008384200018F8400240D
66648+:1036A0003C0780049486001A8C85000094E2000692
66649+:1036B000A482001694E3000600C310233042FFFFEB
66650+:1036C0000045102B384200011440FFF8A483001677
66651+:1036D00003E00008000000008F8400243C02800406
66652+:1036E000944200069483001A8C850000A482001680
66653+:1036F000006210233042FFFF0045102B38420001CA
66654+:103700005040000D8F850024006030213C0780046C
66655+:1037100094E20006A482001694E3000600C310237E
66656+:103720003042FFFF0045102B384200011440FFF8E3
66657+:10373000A48300168F8500243C03800034620400BB
66658+:103740008CA40020AF820020AC6400388CA200243E
66659+:10375000AC62003C3C020005AC62003003E00008B3
66660+:10376000ACA000048F8400243C0300068C8200047B
66661+:1037700000021140004310253C038000AC62003081
66662+:103780000000000000000000000000008C6200004B
66663+:10379000304200101040FFFD34620400AC80000491
66664+:1037A00003E00008AF8200208F86002427BDFFE0E1
66665+:1037B000AFB10014AFB00010AFBF00188CC300044D
66666+:1037C0008CC500248F820020309000FF94C4001A22
66667+:1037D00024630001244200202484000124A7002047
66668+:1037E000ACC30004AF820020A4C4001AACC70024FC
66669+:1037F00004A100060000882104E2000594C2001A1A
66670+:103800008CC2002024420001ACC2002094C2001AE5
66671+:1038100094C300282E040001004310262C4200010E
66672+:10382000004410245040000594C2001A24020001F4
66673+:10383000ACC2000894C2001A94C300280010202BC8
66674+:10384000004310262C4200010044102514400007BC
66675+:10385000000000008CC20008144000042402001084
66676+:103860008CC300041462000F8F8500240E000DA786
66677+:10387000241100018F820024944300289442001AEE
66678+:1038800014430003000000000E000D1300000000B0
66679+:10389000160000048F8500240E000D840000000037
66680+:1038A0008F85002494A2001E94A4001C24420001D1
66681+:1038B0003043FFFF14640002A4A2001EA4A0001E57
66682+:1038C0001200000A3C02800494A2001494A3001A7F
66683+:1038D0003042000F00021500006218253C028000F3
66684+:1038E000AC4300A00A000E1EACA0000894420006E3
66685+:1038F00094A3001A8CA40000A4A200160062102356
66686+:103900003042FFFF0044102B384200011040000DF0
66687+:1039100002201021006030213C07800494E2000660
66688+:10392000A4A2001694E3000600C310233042FFFF58
66689+:103930000044102B384200011440FFF8A4A30016E5
66690+:10394000022010218FBF00188FB100148FB000101B
66691+:1039500003E0000827BD002003E00008000000008D
66692+:103960008F82002C3C03000600021140004310250A
66693+:103970003C038000AC62003000000000000000004A
66694+:10398000000000008C620000304200101040FFFD7B
66695+:1039900034620400AF82002803E00008AF80002CEE
66696+:1039A00003E000080000102103E000080000000010
66697+:1039B0003084FFFF30A5FFFF0000182110800007B2
66698+:1039C000000000003082000110400002000420428C
66699+:1039D000006518210A000E3D0005284003E000089C
66700+:1039E0000060102110C0000624C6FFFF8CA200005A
66701+:1039F00024A50004AC8200000A000E4724840004C1
66702+:103A000003E000080000000010A0000824A3FFFF4E
66703+:103A1000AC86000000000000000000002402FFFF50
66704+:103A20002463FFFF1462FFFA2484000403E000080B
66705+:103A3000000000003C0280083442008024030001A2
66706+:103A4000AC43000CA4430010A4430012A443001490
66707+:103A500003E00008A44300168F82002427BDFFD88E
66708+:103A6000AFB3001CAFB20018AFB10014AFB000107C
66709+:103A7000AFBF00208C47000C248200802409FF8007
66710+:103A80003C08800E3043007F008080213C0A80008B
66711+:103A9000004920240068182130B100FF30D200FF17
66712+:103AA00010E000290000982126020100AD44002CFE
66713+:103AB000004928243042007F004820219062000005
66714+:103AC00024030050304200FF1443000400000000B3
66715+:103AD000AD45002C948200EA3053FFFF0E000D84A8
66716+:103AE000000000008F8200248F83002000112C0032
66717+:103AF0009442001E001224003484000100A22825F4
66718+:103B00003C02400000A22825AC7000008FBF0020BE
66719+:103B1000AC6000048FB20018AC7300088FB10014C1
66720+:103B2000AC60000C8FB3001CAC6400108FB00010B0
66721+:103B3000AC60001424040001AC60001827BD00280C
66722+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
66723+:103B50008FB200188FB100148FB0001003E000087E
66724+:103B600027BD00283C06800034C201009043000FAE
66725+:103B7000240200101062000E2865001110A000073A
66726+:103B800024020012240200082405003A10620006F4
66727+:103B90000000302103E0000800000000240500358B
66728+:103BA0001462FFFC000030210A000E6400000000D7
66729+:103BB0008CC200748F83FF9424420FA003E000089E
66730+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
66731+:103BD000240500013C0480088FBF0010240200016E
66732+:103BE00034830080A462001227BD00182402000163
66733+:103BF00003E00008A080001A27BDFFE0AFB2001864
66734+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
66735+:103C10000E000332008088213C028008345000806E
66736+:103C20009202000924030004304200FF1443000CF8
66737+:103C30003C028008124000082402000A0E000E5BBD
66738+:103C400000000000920200052403FFFE0043102440
66739+:103C5000A202000524020012A20200093C02800810
66740+:103C600034420080022020210E00033DA0400027A6
66741+:103C700016400003022020210E000EBF00000000AD
66742+:103C800002202021324600FF8FBF001C8FB2001897
66743+:103C90008FB100148FB00010240500380A000E64A4
66744+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
66745+:103CB000AFB10014AFB000100E00033200808021BD
66746+:103CC0000E000E5B000000003C02800834450080BE
66747+:103CD00090A2000924120018305100FF1232000394
66748+:103CE0000200202124020012A0A2000990A20005D7
66749+:103CF0002403FFFE004310240E00033DA0A2000594
66750+:103D00000200202124050020163200070000302187
66751+:103D10008FBF001C8FB200188FB100148FB000103D
66752+:103D20000A00034227BD00208FBF001C8FB200187D
66753+:103D30008FB100148FB00010240500390A000E6402
66754+:103D400027BD002027BDFFE83C028000AFB0001077
66755+:103D5000AFBF0014344201009442000C2405003629
66756+:103D60000080802114400012304600FF0E00033214
66757+:103D7000000000003C02800834420080240300124E
66758+:103D8000A043000990430005346300100E000E5B51
66759+:103D9000A04300050E00033D020020210200202167
66760+:103DA0000E000342240500200A000F3C0000000022
66761+:103DB0000E000E64000000000E00033202002021FD
66762+:103DC0003C0280089043001B2405FF9F0200202135
66763+:103DD000006518248FBF00148FB00010A043001B93
66764+:103DE0000A00033D27BD001827BDFFE0AFBF001844
66765+:103DF000AFB10014AFB0001030B100FF0E000332BD
66766+:103E0000008080213C02800824030012344200809C
66767+:103E10000E000E5BA04300090E00033D02002021AE
66768+:103E200002002021022030218FBF00188FB1001422
66769+:103E30008FB00010240500350A000E6427BD002055
66770+:103E40003C0480089083000E9082000A1443000B0B
66771+:103E5000000028218F82FF942403005024050001D4
66772+:103E600090420000304200FF1443000400000000B4
66773+:103E70009082000E24420001A082000E03E00008A0
66774+:103E800000A010213C0380008C6201F80440FFFE7A
66775+:103E900024020002AC6401C0A06201C43C02100014
66776+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
66777+:103EB0003C128008AFB10014AFBF001CAFB00010BF
66778+:103EC00036510080922200092403000A304200FF8C
66779+:103ED0001443003E000000008E4300048E22003890
66780+:103EE000506200808FBF001C92220000240300500B
66781+:103EF000304200FF144300253C0280008C42014008
66782+:103F00008E4300043642010002202821AC43001CED
66783+:103F10009622005C8E2300383042FFFF00021040E2
66784+:103F200000621821AE23001C8E4300048E2400384A
66785+:103F30009622005C006418233042FFFF0003184300
66786+:103F4000000210400043102A10400006000000004C
66787+:103F50008E4200048E230038004310230A000FAA6B
66788+:103F6000000220439622005C3042FFFF0002204006
66789+:103F70003C0280083443010034420080ACA4002C91
66790+:103F8000A040002424020001A062000C0E000F5E7D
66791+:103F900000000000104000538FBF001C3C02800056
66792+:103FA0008C4401403C0380008C6201F80440FFFE19
66793+:103FB00024020002AC6401C0A06201C43C021000F3
66794+:103FC000AC6201F80A0010078FBF001C92220009A2
66795+:103FD00024030010304200FF144300043C02800020
66796+:103FE0008C4401400A000FEE0000282192220009B3
66797+:103FF00024030016304200FF14430006240200147C
66798+:10400000A22200093C0280008C4401400A001001F9
66799+:104010008FBF001C8E2200388E23003C00431023EB
66800+:10402000044100308FBF001C92220027244200016F
66801+:10403000A2220027922200272C42000414400016DE
66802+:104040003C1080009222000924030004304200FF4B
66803+:10405000144300093C0280008C4401408FBF001CC7
66804+:104060008FB200188FB100148FB000102405009398
66805+:104070000A000ECC27BD00208C440140240500938B
66806+:104080008FBF001C8FB200188FB100148FB00010CA
66807+:104090000A000F4827BD00208E0401400E000332A5
66808+:1040A000000000008E4200042442FFFFAE420004E4
66809+:1040B0008E22003C2442FFFFAE22003C0E00033D56
66810+:1040C0008E0401408E0401408FBF001C8FB2001887
66811+:1040D0008FB100148FB00010240500040A000342C1
66812+:1040E00027BD00208FB200188FB100148FB00010D0
66813+:1040F00003E0000827BD00203C0680008CC2018838
66814+:104100003C038008346500809063000E00021402B6
66815+:10411000304400FF306300FF1464000E3C0280084E
66816+:1041200090A20026304200FF104400098F82FF94C5
66817+:10413000A0A400262403005090420000304200FF5B
66818+:1041400014430006000000000A0005A18CC4018091
66819+:104150003C02800834420080A044002603E00008AE
66820+:104160000000000027BDFFE030E700FFAFB20018FD
66821+:10417000AFBF001CAFB10014AFB0001000809021A1
66822+:1041800014E0000630C600FF000000000000000D33
66823+:10419000000000000A001060240001163C038008A3
66824+:1041A0009062000E304200FF14460023346200800B
66825+:1041B00090420026304200FF1446001F000000001D
66826+:1041C0009062000F304200FF1446001B0000000008
66827+:1041D0009062000A304200FF144600038F90FF9463
66828+:1041E0000000000D8F90FF948F82FF983C1180009B
66829+:1041F000AE05003CAC450000A066000A0E0003328C
66830+:104200008E240100A20000240E00033D8E24010034
66831+:104210003C0380008C6201F80440FFFE240200028F
66832+:10422000AC7201C0A06201C43C021000AC6201F893
66833+:104230000A0010618FBF001C000000000000000D8C
66834+:10424000000000002400013F8FBF001C8FB2001847
66835+:104250008FB100148FB0001003E0000827BD0020CC
66836+:104260008F83FF943C0280008C44010034420100A3
66837+:104270008C65003C9046001B0A00102724070001B3
66838+:104280003C0280089043000E9042000A0043102632
66839+:10429000304200FF03E000080002102B27BDFFE0C2
66840+:1042A0003C028008AFB10014AFB00010AFBF0018DF
66841+:1042B0003450008092020005240300303042003068
66842+:1042C00014430085008088218F8200248C42000CDA
66843+:1042D000104000828FBF00180E000D840000000007
66844+:1042E0008F860020ACD100009202000892030009E2
66845+:1042F000304200FF00021200306300FF004310252F
66846+:10430000ACC200049202004D000216000002160327
66847+:1043100004410005000000003C0308008C630048D5
66848+:104320000A00109F3C1080089202000830420040B2
66849+:10433000144000030000182192020027304300FFC0
66850+:104340003C108008361100809222004D00031E00B0
66851+:10435000304200FF0002140000621825ACC30008C0
66852+:104360008E2400308F820024ACC4000C8E250034D3
66853+:104370009443001E3C02C00BACC50010006218251F
66854+:104380008E22003800002021ACC200148E22003C96
66855+:10439000ACC200180E000DB8ACC3001C8E020004A5
66856+:1043A0008F8400203C058000AC8200008E2200201B
66857+:1043B000AC8200048E22001CAC8200088E220058C1
66858+:1043C0008CA3007400431021AC82000C8E22002CC0
66859+:1043D000AC8200108E2200408E23004400021400A4
66860+:1043E00000431025AC8200149222004D240300806B
66861+:1043F000304200FF1443000400000000AC800018AD
66862+:104400000A0010E38F8200248E23000C2402000196
66863+:104410001062000E2402FFFF92220008304200408A
66864+:104420001440000A2402FFFF8E23000C8CA20074AB
66865+:10443000006218233C0208000062102414400002AD
66866+:10444000000028210060282100051043AC820018DC
66867+:104450008F820024000020219443001E3C02C00CE7
66868+:10446000006218258F8200200E000DB8AC43001C9E
66869+:104470003C038008346201008C4200008F850020DC
66870+:10448000346300808FBF0018ACA20000ACA0000411
66871+:104490008C6400488F8200248FB10014ACA4000803
66872+:1044A000ACA0000CACA00010906300059446001E68
66873+:1044B0003C02400D00031E0000C23025ACA30014D6
66874+:1044C0008FB00010ACA0001824040001ACA6001CA2
66875+:1044D0000A000DB827BD00208FBF00188FB100144F
66876+:1044E0008FB0001003E0000827BD00203C028000D0
66877+:1044F0009443007C3C02800834460100308400FF75
66878+:104500003065FFFF2402000524A34650A0C4000C20
66879+:104510005482000C3065FFFF90C2000D2C42000752
66880+:104520001040000724A30A0090C3000D24020014C9
66881+:104530000062100400A210210A00111F3045FFFF85
66882+:104540003065FFFF3C0280083442008003E0000831
66883+:10455000A44500143C03800834680080AD05003891
66884+:10456000346701008CE2001C308400FF00A210239D
66885+:104570001840000330C600FF24A2FFFCACE2001C80
66886+:1045800030820001504000083C0380088D02003C4E
66887+:1045900000A2102304410012240400058C620004D0
66888+:1045A00010A2000F3C0380088C62000414A2001EBD
66889+:1045B000000000003C0208008C4200D8304200207D
66890+:1045C000104000093C0280083462008090630008BB
66891+:1045D0009042004C144300043C0280082404000470
66892+:1045E0000A00110900000000344300803442010039
66893+:1045F000A040000C24020001A462001410C0000AB4
66894+:104600003C0280008C4401003C0380008C6201F875
66895+:104610000440FFFE24020002AC6401C0A06201C499
66896+:104620003C021000AC6201F803E00008000000004A
66897+:1046300027BDFFE800A61823AFBF00101860008058
66898+:10464000308800FF3C02800834470080A0E000244E
66899+:1046500034440100A0E000278C82001C00A210233B
66900+:1046600004400056000000008CE2003C94E3005C33
66901+:104670008CE4002C004530233063FFFF00C3182179
66902+:104680000083202B1080000400E018218CE2002C15
66903+:104690000A00117800A2102194E2005C3042FFFF72
66904+:1046A00000C2102100A21021AC62001C3C02800854
66905+:1046B000344400809482005C8C83001C3042FFFFF5
66906+:1046C0000002104000A210210043102B10400004F3
66907+:1046D000000000008C82001C0A00118B3C06800840
66908+:1046E0009482005C3042FFFF0002104000A21021C3
66909+:1046F0003C06800834C3010034C70080AC82001C33
66910+:10470000A060000CACE500388C62001C00A21023F5
66911+:104710001840000224A2FFFCAC62001C3102000120
66912+:10472000104000083C0380088CE2003C00A21023EB
66913+:1047300004410012240400058CC2000410A20010E1
66914+:104740008FBF00108C62000414A2004F8FBF0010B6
66915+:104750003C0208008C4200D8304200201040000A81
66916+:104760003C02800834620080906300089042004C54
66917+:10477000144300053C028008240400048FBF00108D
66918+:104780000A00110927BD001834430080344201009B
66919+:10479000A040000C24020001A46200143C0280002E
66920+:1047A0008C4401003C0380008C6201F80440FFFE51
66921+:1047B000240200020A0011D8000000008CE2001C54
66922+:1047C000004610230043102B54400001ACE5001CB0
66923+:1047D00094E2005C3042FFFF0062102B144000079F
66924+:1047E0002402000294E2005C8CE3001C3042FFFFD4
66925+:1047F00000621821ACE3001C24020002ACE5003882
66926+:104800000E000F5EA082000C1040001F8FBF001032
66927+:104810003C0280008C4401003C0380008C6201F863
66928+:104820000440FFFE24020002AC6401C0A06201C487
66929+:104830003C021000AC6201F80A0011F08FBF0010BA
66930+:1048400031020010104000108FBF00103C028008A1
66931+:10485000344500808CA3001C94A2005C00661823E1
66932+:104860003042FFFF006218213C023FFF3444FFFF4B
66933+:104870000083102B544000010080182100C3102138
66934+:10488000ACA2001C8FBF001003E0000827BD001879
66935+:1048900027BDFFE800C0402100A63023AFBF0010B5
66936+:1048A00018C00026308A00FF3C028008344900808E
66937+:1048B0008D24001C8D23002C008820230064182BDD
66938+:1048C0001060000F344701008CE2002000461021E8
66939+:1048D000ACE200208CE200200044102B1440000BBE
66940+:1048E0003C023FFF8CE2002000441023ACE2002099
66941+:1048F0009522005C3042FFFF0A0012100082202146
66942+:10490000ACE00020008620213C023FFF3443FFFF43
66943+:104910000064102B54400001006020213C028008FC
66944+:104920003442008000851821AC43001CA0400024C4
66945+:10493000A04000270A0012623C03800831420010A8
66946+:10494000104000433C0380083C06800834C40080CB
66947+:104950008C82003C004810235840003E34660080A2
66948+:104960009082002424420001A0820024908200242E
66949+:104970003C0308008C630024304200FF0043102BEE
66950+:10498000144000688FBF001034C201008C42001C2C
66951+:1049900000A2102318400063000000008CC3000434
66952+:1049A0009482005C006818233042FFFF0003184324
66953+:1049B000000210400043102A1040000500000000D3
66954+:1049C0008CC20004004810230A0012450002104364
66955+:1049D0009482005C3042FFFF000210403C068008D9
66956+:1049E000AC82002C34C5008094A2005C8CA4002C06
66957+:1049F00094A3005C3042FFFF00021040008220219F
66958+:104A00003063FFFF0083202101041021ACA2001CB1
66959+:104A10008CC2000434C60100ACC2001C2402000297
66960+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
66961+:104A30003C0280008C4401003C0380008C6201F841
66962+:104A40000440FFFE240200020A001292000000004F
66963+:104A500034660080ACC50038346401008C82001CD0
66964+:104A600000A210231840000224A2FFFCAC82001C0C
66965+:104A7000314200015040000A3C0380088CC2003CD7
66966+:104A800000A2102304430014240400058C620004D7
66967+:104A900014A200033C0380080A00128424040005C9
66968+:104AA0008C62000414A2001F8FBF00103C0208009B
66969+:104AB0008C4200D8304200201040000A3C0280089E
66970+:104AC00034620080906300089042004C144300055B
66971+:104AD0003C028008240400048FBF00100A00110962
66972+:104AE00027BD00183443008034420100A040000C70
66973+:104AF00024020001A46200143C0280008C440100E6
66974+:104B00003C0380008C6201F80440FFFE2402000296
66975+:104B1000AC6401C0A06201C43C021000AC6201F8A8
66976+:104B20008FBF001003E0000827BD001827BDFFE875
66977+:104B30003C0A8008AFBF0010354900808D22003C40
66978+:104B400000C04021308400FF004610231840009D23
66979+:104B500030E700FF354701002402000100A63023A2
66980+:104B6000A0E0000CA0E0000DA522001418C0002455
66981+:104B7000308200108D23001C8D22002C0068182329
66982+:104B80000043102B1040000F000000008CE20020BA
66983+:104B900000461021ACE200208CE200200043102BE4
66984+:104BA0001440000B3C023FFF8CE200200043102326
66985+:104BB000ACE200209522005C3042FFFF0A0012C1E7
66986+:104BC00000621821ACE00020006618213C023FFF83
66987+:104BD0003446FFFF00C3102B5440000100C01821D1
66988+:104BE0003C0280083442008000651821AC43001C60
66989+:104BF000A0400024A04000270A00130F3C038008B7
66990+:104C0000104000403C0380088D22003C00481023E7
66991+:104C10005840003D34670080912200242442000166
66992+:104C2000A1220024912200243C0308008C6300246C
66993+:104C3000304200FF0043102B1440009A8FBF001039
66994+:104C40008CE2001C00A21023184000960000000017
66995+:104C50008D4300049522005C006818233042FFFF5A
66996+:104C600000031843000210400043102A10400005C2
66997+:104C7000012020218D420004004810230A0012F276
66998+:104C8000000210439522005C3042FFFF00021040FA
66999+:104C90003C068008AC82002C34C5008094A2005CE5
67000+:104CA0008CA4002C94A3005C3042FFFF0002104053
67001+:104CB000008220213063FFFF0083182101031021AF
67002+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
67003+:104CD000240200020E000F5EA0C2000C1040007102
67004+:104CE0008FBF00103C0280008C4401003C03800018
67005+:104CF0008C6201F80440FFFE240200020A0013390E
67006+:104D00000000000034670080ACE500383466010024
67007+:104D10008CC2001C00A210231840000224A2FFFC39
67008+:104D2000ACC2001C30820001504000083C038008E7
67009+:104D30008CE2003C00A2102304430051240400052F
67010+:104D40008C62000410A2003E3C0380088C620004C8
67011+:104D500054A200548FBF00103C0208008C4200D8BF
67012+:104D600030420020104000063C028008346200807F
67013+:104D7000906300089042004C104300403C028008C1
67014+:104D80003443008034420100A040000C24020001A2
67015+:104D9000A46200143C0280008C4401003C038000AB
67016+:104DA0008C6201F80440FFFE24020002AC6401C0E2
67017+:104DB000A06201C43C021000AC6201F80A00137743
67018+:104DC0008FBF001024020005A120002714E2000A72
67019+:104DD0003C038008354301009062000D2C42000620
67020+:104DE000504000053C0380089062000D2442000101
67021+:104DF000A062000D3C03800834670080ACE50038F9
67022+:104E0000346601008CC2001C00A21023184000026E
67023+:104E100024A2FFFCACC2001C308200015040000AFA
67024+:104E20003C0380088CE2003C00A2102304410014E3
67025+:104E3000240400058C62000414A200033C038008D3
67026+:104E40000A00136E240400058C62000414A20015ED
67027+:104E50008FBF00103C0208008C4200D83042002076
67028+:104E60001040000A3C028008346200809063000811
67029+:104E70009042004C144300053C02800824040004C6
67030+:104E80008FBF00100A00110927BD001834430080AD
67031+:104E900034420100A040000C24020001A46200146E
67032+:104EA0008FBF001003E0000827BD00183C0B8008EE
67033+:104EB00027BDFFE83C028000AFBF00103442010074
67034+:104EC000356A00809044000A356901008C45001461
67035+:104ED0008D4800389123000C308400FF0105102319
67036+:104EE0001C4000B3306700FF2CE20006504000B1C8
67037+:104EF0008FBF00102402000100E2300430C2000322
67038+:104F00005440000800A8302330C2000C144000A117
67039+:104F100030C20030144000A38FBF00100A00143BC1
67040+:104F20000000000018C00024308200108D43001CD7
67041+:104F30008D42002C006818230043102B1040000FF6
67042+:104F4000000000008D22002000461021AD2200202C
67043+:104F50008D2200200043102B1440000B3C023FFF29
67044+:104F60008D22002000431023AD2200209542005CDA
67045+:104F70003042FFFF0A0013AF00621821AD2000206D
67046+:104F8000006618213C023FFF3446FFFF00C3102B90
67047+:104F90005440000100C018213C02800834420080C7
67048+:104FA00000651821AC43001CA0400024A04000274D
67049+:104FB0000A0013FD3C038008104000403C038008B9
67050+:104FC0008D42003C004810231840003D34670080AB
67051+:104FD0009142002424420001A14200249142002475
67052+:104FE0003C0308008C630024304200FF0043102B78
67053+:104FF000144000708FBF00108D22001C00A21023EF
67054+:105000001840006C000000008D6300049542005CB5
67055+:10501000006818233042FFFF0003184300021040CD
67056+:105020000043102A10400005014020218D62000439
67057+:10503000004810230A0013E0000210439542005C70
67058+:105040003042FFFF000210403C068008AC82002C7A
67059+:1050500034C5008094A2005C8CA4002C94A3005C56
67060+:105060003042FFFF00021040008220213063FFFF2A
67061+:105070000083182101031021ACA2001C8CC2000483
67062+:1050800034C60100ACC2001C240200020E000F5EF8
67063+:10509000A0C2000C104000478FBF00103C028000EF
67064+:1050A0008C4401003C0380008C6201F80440FFFE48
67065+:1050B000240200020A00142D000000003467008062
67066+:1050C000ACE50038346601008CC2001C00A210233D
67067+:1050D0001840000224A2FFFCACC2001C3082000178
67068+:1050E0005040000A3C0380088CE2003C00A21023E0
67069+:1050F00004430014240400058C62000414A200037D
67070+:105100003C0380080A00141F240400058C6200047C
67071+:1051100014A200288FBF00103C0208008C4200D867
67072+:10512000304200201040000A3C02800834620080B7
67073+:10513000906300089042004C144300053C02800834
67074+:10514000240400048FBF00100A00110927BD0018B5
67075+:105150003443008034420100A040000C24020001CE
67076+:10516000A46200143C0280008C4401003C038000D7
67077+:105170008C6201F80440FFFE24020002AC6401C00E
67078+:10518000A06201C43C021000AC6201F80A00143BAA
67079+:105190008FBF00108FBF0010010030210A00115A8C
67080+:1051A00027BD0018010030210A00129927BD001800
67081+:1051B0008FBF001003E0000827BD00183C038008E3
67082+:1051C0003464010024020003A082000C8C620004FD
67083+:1051D00003E00008AC82001C3C05800834A300807A
67084+:1051E0009062002734A501002406004324420001F8
67085+:1051F000A0620027906300273C0208008C42004810
67086+:10520000306300FF146200043C07602194A500EAAB
67087+:105210000A00090130A5FFFF03E0000800000000BC
67088+:1052200027BDFFE8AFBF00103C0280000E00144411
67089+:105230008C4401803C02800834430100A060000CD3
67090+:105240008C4200048FBF001027BD001803E0000847
67091+:10525000AC62001C27BDFFE03C028008AFBF001815
67092+:10526000AFB10014AFB000103445008034460100E7
67093+:105270003C0880008D09014090C3000C8CA4003CC8
67094+:105280008CA200381482003B306700FF9502007C3E
67095+:1052900090A30027146000093045FFFF2402000599
67096+:1052A00054E200083C04800890C2000D2442000132
67097+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
67098+:1052C0003C048008348201009042000C2403000555
67099+:1052D000304200FF1443000A24A205DC348300801E
67100+:1052E000906200272C4200075040000524A20A00CB
67101+:1052F00090630027240200140062100400A2102111
67102+:105300003C108008361000803045FFFF012020212E
67103+:105310000E001444A60500149602005C8E030038AB
67104+:105320003C1180003042FFFF000210400062182153
67105+:10533000AE03001C0E0003328E24014092020025B1
67106+:1053400034420040A20200250E00033D8E2401409D
67107+:105350008E2401403C0380008C6201F80440FFFE73
67108+:1053600024020002AC6401C0A06201C43C0210002F
67109+:10537000AC6201F88FBF00188FB100148FB000101D
67110+:1053800003E0000827BD00203C0360103C02080039
67111+:1053900024420174AC62502C8C6250003C048000AA
67112+:1053A00034420080AC6250003C0208002442547C2D
67113+:1053B0003C010800AC2256003C020800244254384C
67114+:1053C0003C010800AC2256043C020002AC840008F8
67115+:1053D000AC82000C03E000082402000100A0302190
67116+:1053E0003C1C0800279C56083C0200023C050400B7
67117+:1053F00000852826008220260004102B2CA5000101
67118+:105400002C840001000210803C0308002463560035
67119+:105410000085202500431821108000030000102182
67120+:10542000AC6600002402000103E000080000000058
67121+:105430003C1C0800279C56083C0200023C05040066
67122+:1054400000852826008220260004102B2CA50001B0
67123+:105450002C840001000210803C03080024635600E5
67124+:105460000085202500431821108000050000102130
67125+:105470003C02080024425438AC62000024020001BF
67126+:1054800003E00008000000003C0200023C030400AE
67127+:1054900000821026008318262C4200012C63000194
67128+:1054A000004310251040000B000028213C1C080080
67129+:1054B000279C56083C0380008C62000824050001EC
67130+:1054C00000431025AC6200088C62000C00441025DB
67131+:1054D000AC62000C03E0000800A010213C1C080096
67132+:1054E000279C56083C0580008CA3000C0004202754
67133+:1054F000240200010064182403E00008ACA3000C9F
67134+:105500003C020002148200063C0560008CA208D018
67135+:105510002403FFFE0043102403E00008ACA208D0DF
67136+:105520003C02040014820005000000008CA208D098
67137+:105530002403FFFD00431024ACA208D003E00008C0
67138+:10554000000000003C02601A344200108C430080CE
67139+:1055500027BDFFF88C440084AFA3000093A3000094
67140+:10556000240200041462001AAFA4000493A20001F4
67141+:105570001040000797A300023062FFFC3C0380004C
67142+:10558000004310218C4200000A001536AFA200042F
67143+:105590003062FFFC3C03800000431021AC4400005B
67144+:1055A000A3A000003C0560008CA208D02403FFFEED
67145+:1055B0003C04601A00431024ACA208D08FA300045E
67146+:1055C0008FA2000034840010AC830084AC82008081
67147+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
67148+:1055E0003C1C0800279C56083C0280008C43000CA1
67149+:1055F0008C420004004318243C0200021060001496
67150+:10560000006228243C0204003C04000210A00005B3
67151+:10561000006210243C0208008C4256000A00155B10
67152+:1056200000000000104000073C0404003C02080099
67153+:105630008C4256040040F809000000000A00156082
67154+:10564000000000000000000D3C1C0800279C5608CC
67155+:105650008FBF001003E0000827BD0018800802403B
67156+:1056600080080100800800808008000000000C8095
67157+:105670000000320008000E9808000EF408000F88A1
67158+:1056800008001028080010748008010080080080BD
67159+:10569000800800000A000028000000000000000050
67160+:1056A0000000000D6370362E322E316200000000C3
67161+:1056B00006020104000000000000000000000000DD
67162+:1056C000000000000000000038003C000000000066
67163+:1056D00000000000000000000000000000000020AA
67164+:1056E00000000000000000000000000000000000BA
67165+:1056F00000000000000000000000000000000000AA
67166+:10570000000000000000000021003800000000013F
67167+:105710000000002B000000000000000400030D400A
67168+:105720000000000000000000000000000000000079
67169+:105730000000000000000000100000030000000056
67170+:105740000000000D0000000D3C020800244259AC8E
67171+:105750003C03080024635BF4AC4000000043202BB2
67172+:105760001480FFFD244200043C1D080037BD9FFC4F
67173+:1057700003A0F0213C100800261000A03C1C0800EB
67174+:10578000279C59AC0E0002F6000000000000000D3E
67175+:1057900027BDFFB4AFA10000AFA20004AFA3000873
67176+:1057A000AFA4000CAFA50010AFA60014AFA700185F
67177+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
67178+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
67179+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
67180+:1057E0000E000820000000008FBF00488FBC00445E
67181+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
67182+:105800008FAD00308FAC002C8FAB00288FAA002406
67183+:105810008FA900208FA8001C8FA700188FA6001446
67184+:105820008FA500108FA4000C8FA300088FA2000486
67185+:105830008FA1000027BD004C3C1B60188F7A5030B0
67186+:10584000377B502803400008AF7A000000A01821E1
67187+:1058500000801021008028213C0460003C0760008B
67188+:105860002406000810600006348420788C42000072
67189+:10587000ACE220088C63000003E00008ACE3200CDD
67190+:105880000A000F8100000000240300403C02600079
67191+:1058900003E00008AC4320003C0760008F86000452
67192+:1058A0008CE520740086102100A2182B14600007DC
67193+:1058B000000028218F8AFDA024050001A1440013C7
67194+:1058C0008F89000401244021AF88000403E0000810
67195+:1058D00000A010218F84FDA08F8500049086001306
67196+:1058E00030C300FF00A31023AF82000403E00008D0
67197+:1058F000A08000138F84FDA027BDFFE8AFB000108B
67198+:10590000AFBF001490890011908700112402002875
67199+:10591000312800FF3906002830E300FF2485002CE1
67200+:105920002CD00001106200162484001C0E00006EB2
67201+:10593000000000008F8FFDA03C05600024020204DF
67202+:1059400095EE003E95ED003C000E5C0031ACFFFF93
67203+:10595000016C5025ACAA2010520000012402000462
67204+:10596000ACA22000000000000000000000000000C9
67205+:105970008FBF00148FB0001003E0000827BD00188F
67206+:105980000A0000A6000028218F85FDA027BDFFD8B2
67207+:10599000AFBF0020AFB3001CAFB20018AFB100140E
67208+:1059A000AFB000100080982190A4001124B0001C1A
67209+:1059B00024B1002C308300FF386200280E000090D4
67210+:1059C0002C5200010E00009800000000020020216F
67211+:1059D0001240000202202821000028210E00006E43
67212+:1059E000000000008F8DFDA03C0880003C05600099
67213+:1059F00095AC003E95AB003C02683025000C4C0095
67214+:105A0000316AFFFF012A3825ACA7201024020202C8
67215+:105A1000ACA6201452400001240200028FBF0020D7
67216+:105A20008FB3001C8FB200188FB100148FB000101C
67217+:105A300027BD002803E00008ACA2200027BDFFE03E
67218+:105A4000AFB20018AFB10014AFB00010AFBF001C70
67219+:105A50003C1160008E2320748F82000430D0FFFF41
67220+:105A600030F2FFFF1062000C2406008F0E00006E63
67221+:105A7000000000003C06801F0010440034C5FF00F9
67222+:105A80000112382524040002AE2720100000302126
67223+:105A9000AE252014AE2420008FBF001C8FB200184A
67224+:105AA0008FB100148FB0001000C0102103E0000877
67225+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
67226+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
67227+:105AD00000102400009180253C036000AC70201071
67228+:105AE0008FBF00188FB100148FB000102402000483
67229+:105AF000AC62200027BD002003E000080000102158
67230+:105B000027BDFFE03C046018AFBF0018AFB1001420
67231+:105B1000AFB000108C8850002403FF7F34028071E6
67232+:105B20000103382434E5380C241F00313C1980006F
67233+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
67234+:105B40000E00054CAF9100400E00050A3C116000AC
67235+:105B50000E00007D000000008E3008083C0F570941
67236+:105B60002418FFF00218602435EEE00035EDF00057
67237+:105B7000018E5026018D58262D4600012D69000109
67238+:105B8000AF86004C0E000D09AF8900503C06601630
67239+:105B90008CC700003C0860148D0500A03C03FFFF8B
67240+:105BA00000E320243C02535300052FC2108200550D
67241+:105BB00034D07C00960201F2A780006C10400003F4
67242+:105BC000A780007C384B1E1EA78B006C960201F844
67243+:105BD000104000048F8D0050384C1E1EA78C007C96
67244+:105BE0008F8D005011A000058F83004C240E0020E3
67245+:105BF000A78E007CA78E006C8F83004C1060000580
67246+:105C00009785007C240F0020A78F007CA78F006C55
67247+:105C10009785007C2CB8008153000001240500808A
67248+:105C20009784006C2C91040152200001240404008C
67249+:105C30001060000B3C0260008FBF00188FB1001491
67250+:105C40008FB0001027BD0020A784006CA785007CC2
67251+:105C5000A380007EA780007403E00008A780009264
67252+:105C60008C4704382419103C30FFFFFF13F9000360
67253+:105C700030A8FFFF1100004624030050A380007EDF
67254+:105C80009386007E50C00024A785007CA780007CFE
67255+:105C90009798007CA780006CA7800074A780009272
67256+:105CA0003C010800AC3800800E00078700000000AF
67257+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
67258+:105CC000260C0388356A00100000482100002821B6
67259+:105CD00001AE20243C105709AF8C0010AF8A004859
67260+:105CE000AF89001810900023AF8500148FBF0018F3
67261+:105CF0008FB100148FB0001027BD002003E0000812
67262+:105D0000AF80005400055080014648218D260004D4
67263+:105D10000A00014800D180219798007CA784006C7C
67264+:105D2000A7800074A78000923C010800AC38008076
67265+:105D30000E000787000000003C0F60008DED080892
67266+:105D4000240EFFF03C0B600E260C0388356A001011
67267+:105D5000000048210000282101AE20243C105709F2
67268+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
67269+:105D7000AF85001424110001AF9100548FBF0018AB
67270+:105D80008FB100148FB0001003E0000827BD002081
67271+:105D90000A00017BA383007E3083FFFF8F880040D1
67272+:105DA0008F87003C000321403C0580003C020050EE
67273+:105DB000008248253C0660003C0A010034AC040027
67274+:105DC0008CCD08E001AA58241160000500000000F5
67275+:105DD0008CCF08E024E7000101EA7025ACCE08E092
67276+:105DE0008D19001001805821ACB900388D180014AD
67277+:105DF000ACB8003CACA9003000000000000000007E
67278+:105E00000000000000000000000000000000000092
67279+:105E100000000000000000003C0380008C640000D3
67280+:105E2000308200201040FFFD3C0F60008DED08E047
67281+:105E30003C0E010001AE18241460FFE100000000D8
67282+:105E4000AF87003C03E00008AF8B00588F8500400F
67283+:105E5000240BFFF03C06800094A7001A8CA90024B4
67284+:105E600030ECFFFF000C38C000EB5024012A402129
67285+:105E7000ACC8003C8CA400248CC3003C00831023DD
67286+:105E800018400033000000008CAD002025A2000166
67287+:105E90003C0F0050ACC2003835EE00103C068000CC
67288+:105EA000ACCE003000000000000000000000000048
67289+:105EB00000000000000000000000000000000000E2
67290+:105EC000000000003C0480008C9900003338002062
67291+:105ED0001300FFFD30E20008104000173C0980006D
67292+:105EE0008C880408ACA800108C83040CACA30014AC
67293+:105EF0003C1900203C188000AF19003094AE001807
67294+:105F000094AF001C01CF3021A4A6001894AD001A54
67295+:105F100025A70001A4A7001A94AB001A94AC001E98
67296+:105F2000118B00030000000003E0000800000000E7
67297+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
67298+:105F40008D240404ACA400140A0002183C1900209B
67299+:105F50008CA200200A0002003C0F00500A0001EE53
67300+:105F60000000000027BDFFE8AFBF00100E000232A6
67301+:105F7000000000008F8900408FBF00103C038000AC
67302+:105F8000A520000A9528000A9527000427BD0018BF
67303+:105F90003105FFFF30E6000F0006150000A22025A6
67304+:105FA00003E00008AC6400803C0508008CA50020DC
67305+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
67306+:105FC00010A300100000802124040001020430040A
67307+:105FD00000A6202400C3102450440006261000010F
67308+:105FE000001018802787FDA41480000A006718217C
67309+:105FF000261000012E0900025520FFF38F83000CAC
67310+:10600000AF85000C8FBF00148FB0001003E00008B4
67311+:1060100027BD00188C6800003C058000ACA8002457
67312+:106020000E000234261000013C0508008CA500205B
67313+:106030000A0002592E0900022405000100851804F7
67314+:106040003C0408008C84002027BDFFC8AFBF00348B
67315+:1060500000831024AFBE0030AFB7002CAFB60028CD
67316+:10606000AFB50024AFB40020AFB3001CAFB200182E
67317+:10607000AFB1001410400051AFB000108F84004049
67318+:10608000948700069488000A00E8302330D5FFFF8B
67319+:1060900012A0004B8FBF0034948B0018948C000A20
67320+:1060A000016C50233142FFFF02A2482B1520000251
67321+:1060B00002A02021004020212C8F000515E00002C5
67322+:1060C00000809821241300040E0001C102602021E9
67323+:1060D0008F87004002609021AF80004494F4000A52
67324+:1060E000026080211260004E3291FFFF3C1670006A
67325+:1060F0003C1440003C1E20003C1760008F99005863
67326+:106100008F380000031618241074004F0283F82BF8
67327+:1061100017E0003600000000107E00478F86004424
67328+:1061200014C0003A2403000102031023022320219B
67329+:106130003050FFFF1600FFF13091FFFF8F870040C6
67330+:106140003C1100203C108000AE11003094EB000A9E
67331+:106150003C178000024B5021A4EA000A94E9000A8F
67332+:1061600094E800043123FFFF3106000F00062D00E4
67333+:106170000065F025AEFE008094F3000A94F6001846
67334+:1061800012D30036001221408CFF00148CF4001052
67335+:1061900003E468210000C02101A4782B029870213B
67336+:1061A00001CF6021ACED0014ACEC001002B238233A
67337+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
67338+:1061C0008FBE00308FB7002C8FB600288FB500240B
67339+:1061D0008FB400208FB3001C8FB200188FB1001451
67340+:1061E0008FB0001003E0000827BD00381477FFCC03
67341+:1061F0008F8600440E000EE202002021004018218C
67342+:106200008F86004410C0FFC9020310230270702360
67343+:106210008F87004001C368210A0002E431B2FFFF0A
67344+:106220008F86004414C0FFC93C1100203C10800040
67345+:106230000A0002AEAE1100300E00046602002021FA
67346+:106240000A0002DB00401821020020210E0009395B
67347+:10625000022028210A0002DB004018210E0001EE76
67348+:10626000000000000A0002C702B2382327BDFFC8A1
67349+:10627000AFB7002CAFB60028AFB50024AFB40020F4
67350+:10628000AFB3001CAFB20018AFB10014AFB0001034
67351+:10629000AFBF00300E00011B241300013C047FFF40
67352+:1062A0003C0380083C0220003C010800AC20007048
67353+:1062B0003496FFFF34770080345200033C1512C03F
67354+:1062C000241400013C1080002411FF800E000245C0
67355+:1062D000000000008F8700488F8B00188F89001402
67356+:1062E0008CEA00EC8CE800E8014B302B01092823F4
67357+:1062F00000A6102314400006014B18231440000E82
67358+:106300003C05800002A3602B1180000B0000000000
67359+:106310003C0560008CEE00EC8CED00E88CA4180CC1
67360+:10632000AF8E001804800053AF8D00148F8F0010C3
67361+:10633000ADF400003C0580008CBF00003BF900017B
67362+:10634000333800011700FFE13C0380008C6201003C
67363+:1063500024060C0010460009000000008C680100B3
67364+:106360002D043080548000103C0480008C690100B2
67365+:106370002D2331811060000C3C0480008CAA0100A8
67366+:1063800011460004000020218CA6010024C5FF81D5
67367+:1063900030A400FF8E0B01000E000269AE0B00243A
67368+:1063A0000A00034F3C0480008C8D01002DAC3300AB
67369+:1063B00011800022000000003C0708008CE70098D4
67370+:1063C00024EE00013C010800AC2E00983C04800043
67371+:1063D0008C8201001440000300000000566000148D
67372+:1063E0003C0440008C9F01008C9801000000982123
67373+:1063F00003F1C82400193940330F007F00EF7025E6
67374+:1064000001D26825AC8D08308C8C01008C85010090
67375+:10641000258B0100017130240006514030A3007F1C
67376+:106420000143482501324025AC8808303C04400037
67377+:10643000AE0401380A00030E000000008C99010030
67378+:10644000240F0020AC99002092F80000330300FFD5
67379+:10645000106F000C241F0050547FFFDD3C048000AF
67380+:106460008C8401000E00154E000000000A00034F4E
67381+:106470003C04800000963824ACA7180C0A000327BF
67382+:106480008F8F00108C8501000E0008F72404008017
67383+:106490000A00034F3C04800000A4102B24030001D9
67384+:1064A00010400009000030210005284000A4102BF6
67385+:1064B00004A00003000318405440FFFC00052840DE
67386+:1064C0005060000A0004182B0085382B54E00004AB
67387+:1064D0000003184200C33025008520230003184222
67388+:1064E0001460FFF9000528420004182B03E000089F
67389+:1064F00000C310213084FFFF30C600FF3C0780003E
67390+:106500008CE201B80440FFFE00064C000124302557
67391+:106510003C08200000C820253C031000ACE00180AE
67392+:10652000ACE50184ACE4018803E00008ACE301B809
67393+:106530003C0660008CC5201C2402FFF03083020062
67394+:10654000308601001060000E00A2282434A500014E
67395+:106550003087300010E0000530830C0034A50004C3
67396+:106560003C04600003E00008AC85201C1060FFFDC7
67397+:106570003C04600034A5000803E00008AC85201C42
67398+:1065800054C0FFF334A500020A0003B03087300086
67399+:1065900027BDFFE8AFB00010AFBF00143C0760009C
67400+:1065A000240600021080001100A080218F83005873
67401+:1065B0000E0003A78C6400188F8200580000202171
67402+:1065C000240600018C45000C0E000398000000001A
67403+:1065D0001600000224020003000010218FBF0014E7
67404+:1065E0008FB0001003E0000827BD00188CE8201CC5
67405+:1065F0002409FFF001092824ACE5201C8F870058EE
67406+:106600000A0003CD8CE5000C3C02600E00804021A6
67407+:1066100034460100240900180000000000000000BA
67408+:10662000000000003C0A00503C0380003547020097
67409+:10663000AC68003834640400AC65003CAC670030E2
67410+:106640008C6C0000318B00201160FFFD2407FFFFE0
67411+:106650002403007F8C8D00002463FFFF248400044A
67412+:10666000ACCD00001467FFFB24C60004000000004E
67413+:10667000000000000000000024A402000085282B78
67414+:106680003C0300203C0E80002529FFFF010540212E
67415+:10669000ADC300301520FFE00080282103E0000892
67416+:1066A000000000008F82005827BDFFD8AFB3001C48
67417+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
67418+:1066C00094460002008098218C5200182CC300814F
67419+:1066D0008C4800048C4700088C51000C8C49001039
67420+:1066E000106000078C4A00142CC4000414800013AE
67421+:1066F00030EB000730C5000310A0001000000000C0
67422+:106700002410008B02002021022028210E00039873
67423+:10671000240600031660000224020003000010217A
67424+:106720008FBF00208FB3001C8FB200188FB10014F0
67425+:106730008FB0001003E0000827BD00281560FFF1AE
67426+:106740002410008B3C0C80003C030020241F00011F
67427+:10675000AD830030AF9F0044000000000000000047
67428+:10676000000000002419FFF024D8000F031978243A
67429+:106770003C1000D0AD88003801F0702524CD000316
67430+:106780003C08600EAD87003C35850400AD8E0030BE
67431+:10679000000D38823504003C3C0380008C6B000007
67432+:1067A000316200201040FFFD0000000010E00008F2
67433+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
67434+:1067C00024A50004AC8800001467FFFB24840004A7
67435+:1067D0003C05600EACA60038000000000000000080
67436+:1067E000000000008F8600543C0400203C0780001D
67437+:1067F000ACE4003054C000060120202102402021DA
67438+:106800000E0003A7000080210A00041D02002021C1
67439+:106810000E0003DD01402821024020210E0003A7C5
67440+:10682000000080210A00041D0200202127BDFFE096
67441+:10683000AFB200183092FFFFAFB10014AFBF001C21
67442+:10684000AFB000101640000D000088210A0004932C
67443+:106850000220102124050003508500278CE5000C40
67444+:106860000000000D262800013111FFFF24E2002066
67445+:106870000232802B12000019AF8200588F82004430
67446+:10688000144000168F8700583C0670003C0320001F
67447+:106890008CE5000000A62024148300108F84006083
67448+:1068A000000544023C09800000A980241480FFE90F
67449+:1068B000310600FF2CCA000B5140FFEB26280001D7
67450+:1068C000000668803C0E080025CE575801AE6021B6
67451+:1068D0008D8B0000016000080000000002201021E4
67452+:1068E0008FBF001C8FB200188FB100148FB0001042
67453+:1068F00003E0000827BD00200E0003982404008454
67454+:106900001600FFD88F8700580A000474AF8000601B
67455+:10691000020028210E0003BF240400018F870058C5
67456+:106920000A000474AF820060020028210E0003BF39
67457+:10693000000020210A0004A38F8700580E000404E1
67458+:10694000020020218F8700580A000474AF82006083
67459+:1069500030AFFFFF000F19C03C0480008C9001B8DD
67460+:106960000600FFFE3C1920043C181000AC83018097
67461+:10697000AC800184AC990188AC9801B80A00047518
67462+:106980002628000190E2000390E30002000020218D
67463+:106990000002FE0000033A0000FF2825240600083C
67464+:1069A0000E000398000000001600FFDC2402000324
67465+:1069B0008F870058000010210A000474AF82006025
67466+:1069C00090E8000200002021240600090A0004C308
67467+:1069D00000082E0090E4000C240900FF308500FF21
67468+:1069E00010A900150000302190F9000290F8000372
67469+:1069F000308F00FF94EB000400196E000018740043
67470+:106A0000000F62000186202501AE5025014B28258C
67471+:106A10003084FF8B0A0004C32406000A90E30002BE
67472+:106A200090FF0004000020210003360000DF28252D
67473+:106A30000A0004C32406000B0A0004D52406008BB8
67474+:106A4000000449C23127003F000443423C02800059
67475+:106A500000082040240316802CE60020AC43002CC4
67476+:106A600024EAFFE02482000114C0000330A900FFE3
67477+:106A700000801021314700FF000260803C0D800043
67478+:106A8000240A0001018D20213C0B000E00EA28049D
67479+:106A9000008B302111200005000538278CCE000026
67480+:106AA00001C5382503E00008ACC700008CD8000001
67481+:106AB0000307782403E00008ACCF000027BDFFE007
67482+:106AC000AFB10014AFB00010AFBF00183C076000BA
67483+:106AD0008CE408083402F0003C1160003083F000C0
67484+:106AE000240501C03C04800E000030211062000625
67485+:106AF000241000018CEA08083149F0003928E00030
67486+:106B00000008382B000780403C0D0200AE2D081411
67487+:106B1000240C16803C0B80008E2744000E000F8B47
67488+:106B2000AD6C002C120000043C02169124050001FB
67489+:106B3000120500103C023D2C345800E0AE384408E9
67490+:106B40003C1108008E31007C8FBF00183C066000AD
67491+:106B500000118540360F16808FB100148FB00010E1
67492+:106B60003C0E020027BD0020ACCF442003E000080B
67493+:106B7000ACCE08103C0218DA345800E0AE384408B5
67494+:106B80003C1108008E31007C8FBF00183C0660006D
67495+:106B900000118540360F16808FB100148FB00010A1
67496+:106BA0003C0E020027BD0020ACCF442003E00008CB
67497+:106BB000ACCE08100A0004EB240500010A0004EB27
67498+:106BC0000000282124020400A7820024A780001CC2
67499+:106BD000000020213C06080024C65A582405FFFF67
67500+:106BE00024890001000440803124FFFF01061821A0
67501+:106BF0002C87002014E0FFFAAC6500002404040098
67502+:106C0000A7840026A780001E000020213C06080063
67503+:106C100024C65AD82405FFFF248D0001000460809B
67504+:106C200031A4FFFF018658212C8A00201540FFFA6D
67505+:106C3000AD650000A7800028A7800020A780002263
67506+:106C4000000020213C06080024C65B582405FFFFF5
67507+:106C5000249900010004C0803324FFFF030678213B
67508+:106C60002C8E000415C0FFFAADE500003C05600065
67509+:106C70008CA73D002403E08F00E31024344601403C
67510+:106C800003E00008ACA63D002487007F000731C266
67511+:106C900024C5FFFF000518C2246400013082FFFFF5
67512+:106CA000000238C0A78400303C010800AC27003047
67513+:106CB000AF80002C0000282100002021000030219E
67514+:106CC0002489000100A728213124FFFF2CA81701E7
67515+:106CD000110000032C8300801460FFF924C600011A
67516+:106CE00000C02821AF86002C10C0001DA786002AF6
67517+:106CF00024CAFFFF000A11423C08080025085B581F
67518+:106D00001040000A00002021004030212407FFFF2E
67519+:106D1000248E00010004688031C4FFFF01A86021B7
67520+:106D20000086582B1560FFFAAD87000030A2001FC7
67521+:106D30005040000800043080240300010043C804D0
67522+:106D400000041080004878212738FFFF03E0000886
67523+:106D5000ADF8000000C820212405FFFFAC8500002D
67524+:106D600003E000080000000030A5FFFF30C6FFFF71
67525+:106D700030A8001F0080602130E700FF0005294295
67526+:106D80000000502110C0001D24090001240B000147
67527+:106D900025180001010B2004330800FF0126782686
67528+:106DA000390E00202DED00012DC2000101A2182591
67529+:106DB0001060000D014450250005C880032C4021BF
67530+:106DC0000100182110E0000F000A20278D040000A8
67531+:106DD000008A1825AD03000024AD00010000402109
67532+:106DE0000000502131A5FFFF252E000131C9FFFF12
67533+:106DF00000C9102B1040FFE72518000103E0000830
67534+:106E0000000000008D0A0000014440240A0005D162
67535+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
67536+:106E2000AFB00010AFBF001430E7FFFF00005021EB
67537+:106E30003410FFFF0000602124AF001F00C0482174
67538+:106E4000241800012419002005E0001601E010219B
67539+:106E50000002F943019F682A0009702B01AE40240B
67540+:106E600011000017000C18800064102110E00005CC
67541+:106E70008C4B000000F840040008382301675824B8
67542+:106E800000003821154000410000402155600016E7
67543+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
67544+:106EA00001E0102124A2003E0002F943019F682A5C
67545+:106EB0000009702B01AE40241500FFEB000C188078
67546+:106EC000154600053402FFFF020028210E0005B51B
67547+:106ED00000003821020010218FBF00148FB0001075
67548+:106EE00003E0000827BD00181520000301601821E9
67549+:106EF000000B1C0224080010306A00FF154000053A
67550+:106F0000306E000F250D000800031A0231A800FFA3
67551+:106F1000306E000F15C00005307F000325100004FF
67552+:106F200000031902320800FF307F000317E000055C
67553+:106F3000386900012502000200031882304800FF72
67554+:106F4000386900013123000110600004310300FFA3
67555+:106F5000250A0001314800FF310300FF000C6940A1
67556+:106F600001A34021240A000110CAFFD53110FFFF00
67557+:106F7000246E000131C800FF1119FFC638C9000195
67558+:106F80002D1F002053E0001C258B0001240D000163
67559+:106F90000A000648240E002051460017258B0001E8
67560+:106FA00025090001312800FF2D0900205120001281
67561+:106FB000258B000125430001010D5004014B1024D5
67562+:106FC000250900011440FFF4306AFFFF3127FFFF5D
67563+:106FD00010EE000C2582FFFF304CFFFF0000502117
67564+:106FE0003410FFFF312800FF2D0900205520FFF24B
67565+:106FF00025430001258B0001014648260A000602B0
67566+:10700000316CFFFF00003821000050210A000654B7
67567+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
67568+:10702000AFB10014001039423211FFE000071080A8
67569+:10703000AFB3001C00B1282330D3FFFFAFB200185C
67570+:1070400030A5FFFF00809021026030210044202104
67571+:10705000AFBF00200E0005E03207001F022288218A
67572+:107060003403FFFF0240202102002821026030216A
67573+:1070700000003821104300093231FFFF02201021A7
67574+:107080008FBF00208FB3001C8FB200188FB1001487
67575+:107090008FB0001003E0000827BD00280E0005E0B7
67576+:1070A0000000000000408821022010218FBF002036
67577+:1070B0008FB3001C8FB200188FB100148FB0001076
67578+:1070C00003E0000827BD0028000424003C03600002
67579+:1070D000AC603D0810A00002348210063482101605
67580+:1070E00003E00008AC623D0427BDFFE0AFB0001034
67581+:1070F000309000FF2E020006AFBF001810400008BD
67582+:10710000AFB10014001030803C03080024635784A2
67583+:1071100000C328218CA400000080000800000000AB
67584+:10712000000020218FBF00188FB100148FB0001015
67585+:107130000080102103E0000827BD00209791002A5D
67586+:1071400016200051000020213C020800904200332C
67587+:107150000A0006BB00000000978D002615A0003134
67588+:10716000000020210A0006BB2402000897870024A3
67589+:1071700014E0001A00001821006020212402000100
67590+:107180001080FFE98FBF0018000429C2004530219C
67591+:1071900000A6582B1160FFE43C0880003C0720004B
67592+:1071A000000569C001A76025AD0C00203C038008E4
67593+:1071B0002402001F2442FFFFAC6000000441FFFDD9
67594+:1071C0002463000424A5000100A6702B15C0FFF560
67595+:1071D000000569C00A0006A58FBF00189787001C2C
67596+:1071E0003C04080024845A58240504000E0006605C
67597+:1071F00024060001978B002424440001308AFFFFFD
67598+:107200002569FFFF2D48040000402821150000409B
67599+:10721000A789002424AC3800000C19C00A0006B964
67600+:10722000A780001C9787001E3C04080024845AD8BD
67601+:10723000240504000E00066024060001979900262C
67602+:10724000244400013098FFFF272FFFFF2F0E04007A
67603+:107250000040882115C0002CA78F0026A780001EA3
67604+:107260003A020003262401003084FFFF0E00068D41
67605+:107270002C4500010011F8C027F00100001021C0CA
67606+:107280000A0006BB240200089785002E978700227B
67607+:107290003C04080024845B580E00066024060001AC
67608+:1072A0009787002A8F89002C2445000130A8FFFF12
67609+:1072B00024E3FFFF0109302B0040802114C0001897
67610+:1072C000A783002AA7800022978500300E000F7543
67611+:1072D00002002021244A05003144FFFF0E00068DE4
67612+:1072E000240500013C05080094A500320E000F752E
67613+:1072F00002002021244521003C0208009042003376
67614+:107300000A0006BB000521C00A0006F3A784001E80
67615+:1073100024AC3800000C19C00A0006B9A784001C70
67616+:107320000A00070DA7850022308400FF27BDFFE873
67617+:107330002C820006AFBF0014AFB000101040001543
67618+:1073400000A03821000440803C0308002463579CBF
67619+:10735000010328218CA40000008000080000000028
67620+:1073600024CC007F000751C2000C59C23170FFFFCE
67621+:107370002547C40030E5FFFF2784001C02003021B0
67622+:107380000E0005B52407000197860028020620217B
67623+:10739000A78400288FBF00148FB0001003E00008FE
67624+:1073A00027BD00183C0508008CA50030000779C2F5
67625+:1073B0000E00038125E4DF003045FFFF3C04080098
67626+:1073C00024845B58240600010E0005B52407000143
67627+:1073D000978E002A8FBF00148FB0001025CD0001BA
67628+:1073E00027BD001803E00008A78D002A0007C9C2C6
67629+:1073F0002738FF00001878C231F0FFFF3C04080076
67630+:1074000024845AD802002821240600010E0005B564
67631+:1074100024070001978D0026260E0100000E84002F
67632+:1074200025AC00013C0B6000A78C0026AD603D0838
67633+:1074300036040006000030213C0760008CE23D0469
67634+:10744000305F000617E0FFFD24C9000100061B00A5
67635+:10745000312600FF006440252CC50004ACE83D0443
67636+:1074600014A0FFF68FBF00148FB0001003E00008D7
67637+:1074700027BD0018000751C22549C8002406000195
67638+:10748000240700013C04080024845A580E0005B566
67639+:107490003125FFFF978700248FBF00148FB00010A5
67640+:1074A00024E6000127BD001803E00008A786002499
67641+:1074B0003C0660183C090800252900FCACC9502C8A
67642+:1074C0008CC850003C0580003C020002350700805B
67643+:1074D000ACC750003C04080024841FE03C030800B3
67644+:1074E00024631F98ACA50008ACA2000C3C01080066
67645+:1074F000AC2459A43C010800AC2359A803E00008BF
67646+:107500002402000100A030213C1C0800279C59AC3B
67647+:107510003C0C04003C0B0002008B3826008C4026FB
67648+:107520002CE200010007502B2D050001000A4880C5
67649+:107530003C030800246359A4004520250123182199
67650+:107540001080000300001021AC660000240200013E
67651+:1075500003E00008000000003C1C0800279C59AC18
67652+:107560003C0B04003C0A0002008A3026008B3826BF
67653+:107570002CC200010006482B2CE5000100094080C8
67654+:107580003C030800246359A4004520250103182169
67655+:1075900010800005000010213C0C0800258C1F986D
67656+:1075A000AC6C00002402000103E0000800000000B1
67657+:1075B0003C0900023C080400008830260089382677
67658+:1075C0002CC30001008028212CE400010083102539
67659+:1075D0001040000B000030213C1C0800279C59ACD7
67660+:1075E0003C0A80008D4E00082406000101CA68256F
67661+:1075F000AD4D00088D4C000C01855825AD4B000C9D
67662+:1076000003E0000800C010213C1C0800279C59AC76
67663+:107610003C0580008CA6000C0004202724020001F9
67664+:1076200000C4182403E00008ACA3000C3C020002D4
67665+:107630001082000B3C0560003C070400108700032B
67666+:107640000000000003E00008000000008CA908D042
67667+:10765000240AFFFD012A402403E00008ACA808D05A
67668+:107660008CA408D02406FFFE0086182403E000083E
67669+:10767000ACA308D03C05601A34A600108CC300806F
67670+:1076800027BDFFF88CC50084AFA3000093A40000C1
67671+:107690002402001010820003AFA5000403E00008DC
67672+:1076A00027BD000893A7000114E0001497AC000266
67673+:1076B00097B800023C0F8000330EFFFC01CF682119
67674+:1076C000ADA50000A3A000003C0660008CC708D058
67675+:1076D0002408FFFE3C04601A00E82824ACC508D04A
67676+:1076E0008FA300048FA200003499001027BD00086A
67677+:1076F000AF22008003E00008AF2300843C0B800031
67678+:10770000318AFFFC014B48218D2800000A00080C3B
67679+:10771000AFA8000427BDFFE8AFBF00103C1C080065
67680+:10772000279C59AC3C0580008CA4000C8CA2000462
67681+:107730003C0300020044282410A0000A00A31824DF
67682+:107740003C0604003C0400021460000900A610245A
67683+:107750001440000F3C0404000000000D3C1C080015
67684+:10776000279C59AC8FBF001003E0000827BD00180C
67685+:107770003C0208008C4259A40040F80900000000B7
67686+:107780003C1C0800279C59AC0A0008358FBF00102C
67687+:107790003C0208008C4259A80040F8090000000093
67688+:1077A0000A00083B000000003C0880008D0201B880
67689+:1077B0000440FFFE35090180AD2400003C031000A9
67690+:1077C00024040040AD250004A1240008A1260009DE
67691+:1077D000A527000A03E00008AD0301B83084FFFFCD
67692+:1077E0000080382130A5FFFF000020210A00084555
67693+:1077F000240600803087FFFF8CA400002406003898
67694+:107800000A000845000028218F8300788F860070C9
67695+:107810001066000B008040213C07080024E75B68ED
67696+:10782000000328C000A710218C440000246300013D
67697+:10783000108800053063000F5466FFFA000328C06B
67698+:1078400003E00008000010213C07080024E75B6CFF
67699+:1078500000A7302103E000088CC200003C03900028
67700+:1078600034620001008220253C038000AC640020CB
67701+:107870008C65002004A0FFFE0000000003E000086B
67702+:10788000000000003C0280003443000100832025FA
67703+:1078900003E00008AC44002027BDFFE0AFB10014B6
67704+:1078A0003091FFFFAFB00010AFBF001812200013DF
67705+:1078B00000A080218CA20000240400022406020003
67706+:1078C0001040000F004028210E0007250000000096
67707+:1078D00000001021AE000000022038218FBF0018E8
67708+:1078E0008FB100148FB0001000402021000028212B
67709+:1078F000000030210A00084527BD00208CA20000AE
67710+:10790000022038218FBF00188FB100148FB00010F3
67711+:107910000040202100002821000030210A000845F5
67712+:1079200027BD002000A010213087FFFF8CA5000498
67713+:107930008C4400000A000845240600068F83FD9C45
67714+:1079400027BDFFE8AFBF0014AFB00010906700087C
67715+:10795000008010210080282130E600400000202116
67716+:1079600010C000088C5000000E0000BD0200202155
67717+:10797000020020218FBF00148FB000100A000548BC
67718+:1079800027BD00180E0008A4000000000E0000BD76
67719+:1079900002002021020020218FBF00148FB00010B0
67720+:1079A0000A00054827BD001827BDFFE0AFB0001052
67721+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
67722+:1079C00092060001008088210E00087230D2000467
67723+:1079D00092040005001129C2A6050000348300406E
67724+:1079E000A20300050E00087C022020210E00054A9B
67725+:1079F0000220202124020001AE02000C02202821D6
67726+:107A0000A602001024040002A602001224060200AE
67727+:107A1000A60200140E000725A60200161640000F4D
67728+:107A20008FBF001C978C00743C0B08008D6B007896
67729+:107A30002588FFFF3109FFFF256A0001012A382B45
67730+:107A400010E00006A78800743C0F6006240E0016A4
67731+:107A500035ED0010ADAE00508FBF001C8FB2001886
67732+:107A60008FB100148FB0001003E0000827BD002084
67733+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
67734+:107A80001080000400A088212402008010820007DA
67735+:107A9000000000000000000D8FBF00188FB100141F
67736+:107AA0008FB0001003E0000827BD00200E00087210
67737+:107AB00000A020218F86FD9C0220202190C500057A
67738+:107AC0000E00087C30B000FF2403003E1603FFF1D7
67739+:107AD0003C0680008CC401780480FFFE34C801405D
67740+:107AE000240900073C071000AD11000002202021EE
67741+:107AF000A10900048FBF00188FB100148FB00010CF
67742+:107B0000ACC701780A0008C527BD002027BDFFE0EB
67743+:107B1000AFB00010AFBF0018AFB100143C10800030
67744+:107B20008E110020000000000E00054AAE04002067
67745+:107B3000AE1100208FBF00188FB100148FB000105D
67746+:107B400003E0000827BD00203084FFFF00803821BB
67747+:107B50002406003500A020210A0008450000282145
67748+:107B60003084FFFF008038212406003600A0202149
67749+:107B70000A0008450000282127BDFFD0AFB500242A
67750+:107B80003095FFFFAFB60028AFB40020AFBF002C88
67751+:107B9000AFB3001CAFB20018AFB10014AFB000100B
67752+:107BA00030B6FFFF12A000270000A0218F920058DE
67753+:107BB0008E4300003C0680002402004000033E0289
67754+:107BC00000032C0230E4007F006698241482001D1C
67755+:107BD00030A500FF8F8300682C68000A1100001098
67756+:107BE0008F8D0044000358803C0C0800258C57B84A
67757+:107BF000016C50218D4900000120000800000000A8
67758+:107C000002D4302130C5FFFF0E0008522404008446
67759+:107C1000166000028F920058AF8000688F8D00447C
67760+:107C20002659002026980001032090213314FFFFDD
67761+:107C300015A00004AF9900580295202B1480FFDC9A
67762+:107C400000000000028010218FBF002C8FB600289A
67763+:107C50008FB500248FB400208FB3001C8FB20018A2
67764+:107C60008FB100148FB0001003E0000827BD003072
67765+:107C70002407003414A70149000000009247000EB9
67766+:107C80008F9FFDA08F90FD9C24181600A3E700197C
67767+:107C90009242000D3C0880003C07800CA3E20018D3
67768+:107CA000964A00123C0D60003C117FFFA60A005C62
67769+:107CB000964400103623FFFF240200053099FFFF91
67770+:107CC000AE1900548E46001CAD1800288CEF000041
67771+:107CD0008DAE444801E6482601C93021AE06003881
67772+:107CE0008E05003824CB00013C0E7F00AE05003C21
67773+:107CF0008E0C003CAFEC0004AE0B00208E13002075
67774+:107D0000AE13001CA3E0001BAE03002CA3E2001284
67775+:107D10008E4A001424130050AE0A00348E0400343E
67776+:107D2000AFE400148E590018AE1900489258000CA8
67777+:107D3000A218004E920D000835AF0020A20F0008D7
67778+:107D40008E090018012E282434AC4000AE0C001817
67779+:107D5000920B0000317200FF1253027F2403FF8058
67780+:107D60003C04080024845BE80E0008AA0000000020
67781+:107D70003C1108008E315BE80E00087202202021C1
67782+:107D80002405000424080001A2050025022020216A
67783+:107D90000E00087CA20800053C0580008CB001782C
67784+:107DA0000600FFFE8F92005834AE0140240F0002FF
67785+:107DB0003C091000ADD10000A1CF0004ACA90178AE
67786+:107DC0000A000962AF8000682CAD003751A0FF9413
67787+:107DD0008F8D0044000580803C110800263157E05B
67788+:107DE000021178218DEE000001C0000800000000A3
67789+:107DF0002411000414B1008C3C0780003C080800EA
67790+:107E00008D085BE88F86FD9CACE800208E4500085D
67791+:107E10008F99FDA0240D0050ACC500308E4C000899
67792+:107E2000ACCC00508E4B000CACCB00348E43001019
67793+:107E3000ACC300388E4A0010ACCA00548E42001405
67794+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
67795+:107E5000ACD0002090C40000309800FF130D024AFF
67796+:107E6000000000008CC400348CD00030009030231F
67797+:107E700004C000F12404008C126000EE2402000310
67798+:107E80000A000962AF8200682419000514B900666F
67799+:107E90003C0580003C0808008D085BE88F86FD9C4F
67800+:107EA000ACA800208E4C00048F8AFDA0240720007F
67801+:107EB000ACCC001C924B000824120008A14B001906
67802+:107EC0008F82005890430009A14300188F85005805
67803+:107ED00090BF000A33E400FF1092001028890009C7
67804+:107EE000152000BA240E0002240D0020108D000B76
67805+:107EF000340780002898002117000008240740005C
67806+:107F000024100040109000053C0700012419008057
67807+:107F1000109900023C070002240740008CC20018A0
67808+:107F20003C03FF00004350240147F825ACDF001854
67809+:107F300090B2000BA0D200278F8300589464000CED
67810+:107F4000108001FE000000009467000C3C1F8000C0
67811+:107F50002405FFBFA4C7005C9063000E2407000443
67812+:107F6000A0C300088F820058904A000FA0CA0009E1
67813+:107F70008F8900588D3200108FE400740244C823AA
67814+:107F8000ACD900588D300014ACD0002C95380018B6
67815+:107F9000330DFFFFACCD00409531001A322FFFFFAB
67816+:107FA000ACCF00448D2E001CACCE00489128000EB2
67817+:107FB000A0C8000890CC000801855824126001B6C2
67818+:107FC000A0CB00088F9200580A000962AF870068B2
67819+:107FD0002406000614A600143C0E80003C0F080086
67820+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
67821+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
67822+:1080000024040005ACA800048CCC003C1260008164
67823+:10801000AD6C00000A000962AF84006824110007FB
67824+:1080200010B1004B240400063C05080024A55BE8C1
67825+:108030000E000881240400818F9200580013102B39
67826+:108040000A000962AF820068241F002314BFFFF6F4
67827+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
67828+:10806000AD8500208F91FD9C8E4600042564002084
67829+:1080700026450014AE260028240600030E000F81BA
67830+:10808000257000308F87005802002021240600034D
67831+:108090000E000F8124E500083C04080024845BE8FE
67832+:1080A0000E0008AA0000000092230000240A0050DD
67833+:1080B000306200FF544AFFE18F9200580E000F6CAF
67834+:1080C000000000000A000A6A8F920058240800335A
67835+:1080D00014A800323C0380003C1108008E315BE89C
67836+:1080E0008F8FFDA0AC7100208E420008240D002867
67837+:1080F0008F89FD9CADE200308E4A000C24060009F9
67838+:10810000ADEA00348E5F0010ADFF00388E440014DD
67839+:10811000ADE400208E590018ADF900248E58001CE3
67840+:10812000ADF80028A1ED00118E4E00041260003160
67841+:10813000AD2E00288F9200580A000962AF860068B1
67842+:10814000240D002214ADFFB8000000002404000735
67843+:108150003C1008008E105BE83C188000AF10002037
67844+:108160005660FEAEAF8400683C04080024845BE8DF
67845+:108170000E0008AA241300508F84FD9C90920000EA
67846+:10818000325900FF1333014B000000008F9200585A
67847+:10819000000020210A000962AF8400683C05080045
67848+:1081A00024A55BE80E000858240400810A000A6A2E
67849+:1081B0008F92005802D498213265FFFF0E000852BA
67850+:1081C000240400840A0009628F920058108EFF5325
67851+:1081D000240704002887000310E00179241100041B
67852+:1081E000240F0001548FFF4D240740000A000A228B
67853+:1081F000240701003C05080024A55BE80E0008A444
67854+:10820000240400828F920058000030210A00096285
67855+:10821000AF8600683C04080024845BE88CC2003808
67856+:108220000E0008AA8CC3003C8F9200580A000AC0B6
67857+:1082300000002021240400823C05080024A55BE8FE
67858+:108240000E0008A4000000008F92005800001021CA
67859+:108250000A000962AF8200688E5000048F91FD9C75
67860+:108260003C078000ACF00020922C00050200282181
67861+:10827000318B0002156001562404008A8F92FDA004
67862+:108280002404008D9245001B30A6002014C001502C
67863+:1082900002002821922E00092408001231C900FF93
67864+:1082A0001128014B240400810E00087202002021D5
67865+:1082B0009258001B240F000402002021370D0042B9
67866+:1082C000A24D001B0E00087CA22F00253C0580005B
67867+:1082D0008CA401780480FFFE34B90140241F000201
67868+:1082E000AF300000A33F00048F9200583C101000F4
67869+:1082F000ACB001780A000A6B0013102B8E500004FA
67870+:108300008F91FD9C3C038000AC700020922A0005F8
67871+:108310000200282131420002144000172404008A80
67872+:10832000922C00092412000402002821318B00FF46
67873+:1083300011720011240400810E0008720200202135
67874+:108340008F89FDA0240800122405FFFE912F001B39
67875+:108350000200202135EE0020A12E001BA2280009DA
67876+:108360009226000500C538240E00087CA2270005CF
67877+:1083700002002821000020210E0009330000000027
67878+:108380000A000A6A8F9200588E4C00043C07800055
67879+:108390003C10080026105BE8ACEC00203C01080013
67880+:1083A000AC2C5BE8924B0003317100041220013BBE
67881+:1083B0008F84FD9C24020006A0820009924F001BBE
67882+:1083C000240EFFC031E9003F012E4025A08800089F
67883+:1083D0009245000330A6000114C0013200000000E5
67884+:1083E0008E420008AE0200083C0208008C425BF09E
67885+:1083F000104001318F90FDA0000219C28F8DFD9CAD
67886+:10840000A603000C8E4A000C24180001240400145A
67887+:10841000AE0A002C8E420010AE02001C965F0016C1
67888+:10842000A61F003C96590014A619003EADB8000CDA
67889+:10843000A5B80010A5B80012A5B80014A5B800167C
67890+:1084400012600144A2040011925100033232000272
67891+:108450002E5300018F920058266200080A0009621C
67892+:10846000AF8200688E4400043C1980003C068008FE
67893+:10847000AF2400208E45000890D80000240D005045
67894+:10848000331100FF122D009C2407008824060009E8
67895+:108490000E000845000000000A000A6A8F9200588A
67896+:1084A0008E5000043C0980003C118008AD30002053
67897+:1084B0009228000024050050310400FF10850110AF
67898+:1084C0002407008802002021000028210E00084512
67899+:1084D0002406000E922D00002418FF80020028219F
67900+:1084E00001B8802524040004240600300E0007256E
67901+:1084F000A23000000A000A6A8F9200588E500004D1
67902+:108500008F91FDA03C028000AC500020923F001BE8
67903+:1085100033F900101320006C240700810200202191
67904+:10852000000028212406001F0E000845000000005E
67905+:108530000A000A6A8F9200588E44001C0E00085DE3
67906+:1085400000000000104000E3004048218F880058E0
67907+:1085500024070089012020218D05001C240600012C
67908+:108560000E000845000000000A000A6A8F920058B9
67909+:10857000964900023C10080026105BE831280004F0
67910+:10858000110000973C0460008E4E001C3C0F8000E0
67911+:10859000ADEE00203C010800AC2E5BE896470002DF
67912+:1085A00030E40001148000E6000000008E42000468
67913+:1085B000AE0200083C1008008E105BF0120000ECC8
67914+:1085C0003C0F80008F92FD9C241000018E4E0018FD
67915+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
67916+:1085E000A2400005AE50000C3C0808008D085BF06E
67917+:1085F0008F840058A6500010000839C2A6500012FF
67918+:10860000A6500014A6500016A5A7000C8C8C0008DC
67919+:108610008F8B00588F8A0058ADAC002C8D63000CF6
67920+:1086200024070002ADA3001C91460010A1A6001172
67921+:108630008F82005890450011A3E500088F990058DB
67922+:1086400093380012A258004E8F910058922F0013B9
67923+:10865000A1AF00128F920058964E0014A5AE003CB8
67924+:1086600096490016A5A9003E8E480018ADA8001432
67925+:108670005660FD6AAF8700683C05080024A55BE8EA
67926+:108680000E000881000020218F9200580000382140
67927+:108690000A000962AF8700683C05080024A55BE872
67928+:1086A0000E0008A4240400828F9200580A000A4D8C
67929+:1086B000000038210E000F6C000000008F9200585F
67930+:1086C0000A000AC0000020210E00087202002021CA
67931+:1086D0009223001B02002021346A00100E00087C47
67932+:1086E000A22A001B000038210200202100002821BE
67933+:1086F0000A000BA52406001F9242000C305F000107
67934+:1087000013E0000300000000964A000EA4CA002CEB
67935+:10871000924B000C316300025060000600003821CB
67936+:108720008E470014964C0012ACC7001CA4CC001A53
67937+:10873000000038210A000B7F240600093C050800D0
67938+:1087400024A55BE80E0008A42404008B8F92005837
67939+:108750000A000A4D0013382B3C0C08008D8C5BE896
67940+:1087600024DFFFFE25930100326B007F016790211B
67941+:1087700002638824AD110028AE4600E0AE4000E45C
67942+:108780000A0009B3AE5F001CACC000543C0D0800E9
67943+:108790008DAD5BE83C18800C37090100ACED00287A
67944+:1087A0008E510014AD3100E08E4F0014AD2F00E467
67945+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
67946+:1087C0005491FDD6240740000A000A222407100015
67947+:1087D0000E00092D000000000A000A6A8F9200585E
67948+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
67949+:1087F000AC205BE810710062000000003C196C6264
67950+:1088000037387970147800082404000297850074C2
67951+:108810009782006C2404009200A2F82B13E0001948
67952+:1088200002002821240400020E00069524050200FF
67953+:108830003C068000ACC200203C010800AC225BE892
67954+:108840001040000D8F8C0058240A002824040003D7
67955+:10885000918B0010316300FF546A00012404000171
67956+:108860000E0000810000000010400004240400837A
67957+:108870000A000BC28F920058240400833C050800B4
67958+:1088800024A55BE80E000881000000008F920058CC
67959+:108890000013382B0A000962AF8700680A000B49F1
67960+:1088A000240200128E4400080E00085D0000000043
67961+:1088B0000A000B55AE0200083C05080024A55BE841
67962+:1088C0000E000858240400878F9200580A000B728B
67963+:1088D0000013102B240400040E000695240500301C
67964+:1088E0001440002A004048218F8800582407008344
67965+:1088F000012020218D05001C0A000BB32406000175
67966+:108900008F8300788F8600701066FEEE000038219D
67967+:108910003C07080024E75B6C000320C00087282187
67968+:108920008CAE000011D0005D246F000131E3000F18
67969+:108930005466FFFA000320C00A000B8C00003821A7
67970+:108940008E4400040E00085D000000000A000BC801
67971+:10895000AE0200083C05080024A55BE80E0008A450
67972+:10896000240400828F9200580A000B72000010212C
67973+:108970003C05080024A55BE80A000C7C2404008761
67974+:108980008C83442C0A000C5B3C196C628F88005865
67975+:108990003C0780083C0C8000240B0050240A000196
67976+:1089A000AD820020A0EB0000A0EA000191030004CA
67977+:1089B000A0E3001891040005A0E400199106000648
67978+:1089C0003C04080024845B6CA0E6001A91020007B6
67979+:1089D0003C06080024C65B68A0E2001B9105000865
67980+:1089E000A0E5001C911F0009A0FF001D9119000ABD
67981+:1089F000A0F9001E9118000BA0F8001F9112000CA6
67982+:108A0000A0F200209111000DA0F100219110000EA4
67983+:108A1000A0F00022910F000FA0EF0023910E001094
67984+:108A2000A0EE0024910D0011A0ED0025950C00147E
67985+:108A3000A4EC0028950B00168F8A00708F920078A6
67986+:108A4000A4EB002A95030018000A10C02545000178
67987+:108A5000A4E3002C8D1F001C0044C0210046C82147
67988+:108A600030A5000FAF3F0000AF09000010B20006B4
67989+:108A7000AF850070000038218D05001C01202021E9
67990+:108A80000A000BB32406000124AD000131A7000F3A
67991+:108A9000AF8700780A000CF9000038213C06080076
67992+:108AA00024C65B680086902100003821ACA000003D
67993+:108AB0000A000B8CAE4000003C0482013C036000C5
67994+:108AC00034820E02AC603D68AF80009803E000087D
67995+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
67996+:108AE000001018422C620041AFBF00141440000275
67997+:108AF00024040080240300403C010800AC300060E6
67998+:108B00003C010800AC2300640E000F7500602821B2
67999+:108B1000244802BF2409FF8001092824001039805D
68000+:108B2000001030408FBF00148FB0001000A720212C
68001+:108B300000861821AF8300803C010800AC25005856
68002+:108B40003C010800AC24005C03E0000827BD0018CD
68003+:108B5000308300FF30C6FFFF30E400FF3C08800098
68004+:108B60008D0201B80440FFFE000354000144382583
68005+:108B70003C09600000E920253C031000AD050180A0
68006+:108B8000AD060184AD04018803E00008AD0301B81F
68007+:108B90008F8500583C0A6012354800108CAC0004E8
68008+:108BA0003C0D600E35A60010318B00062D690001CA
68009+:108BB000AD0900C48CA70004ACC731808CA20008AA
68010+:108BC00094A40002ACC231848CA3001C0460000396
68011+:108BD000A784009003E00008000000008CAF00189C
68012+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
68013+:108BF0008F8500588F87FF288F86FF308CAE00044A
68014+:108C00003C0F601235E80010ACEE00788CAD000827
68015+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
68016+:108C2000ACCB004894CA00543C0208008C4200447B
68017+:108C300025490001A4C9005494C400543083FFFFA7
68018+:108C400010620017000000003C0208008C42004047
68019+:108C5000A4C200528CA30018ACE300308CA2001414
68020+:108C6000ACE2002C8CB90018ACF900388CB80014B8
68021+:108C700024050001ACF800348D0600BC50C5001975
68022+:108C80008D0200B48D0200B8A4E2004894E40048CC
68023+:108C9000A4E4004A94E800EA03E000083102FFFF80
68024+:108CA0003C0208008C420024A4C00054A4C200521C
68025+:108CB0008CA30018ACE300308CA20014ACE2002CB2
68026+:108CC0008CB90018ACF900388CB8001424050001E8
68027+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
68028+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
68029+:108CF00094E800EA03E000083102FFFF8F86005885
68030+:108D00003C0480008CC900088CC80008000929C0F8
68031+:108D1000000839C0AC87002090C30007306200040F
68032+:108D20001040003EAF85009490CB0007316A0008E8
68033+:108D30001140003D8F87FF2C8CCD000C8CCE001491
68034+:108D400001AE602B11800036000000008CC2000CC8
68035+:108D5000ACE200708CCB00188F85FF288F88FF3025
68036+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
68037+:108D70008CC9000CAD0900608CC4001CACA400D0F0
68038+:108D800090E3007C0062C824A0F9007C90D8000722
68039+:108D9000330F000811E000040000000090ED007C9B
68040+:108DA00035AC0001A0EC007C90CF000731EE000153
68041+:108DB00011C000060000000090E3007C241800347D
68042+:108DC00034790002A0F9007CACB800DC90C2000746
68043+:108DD0003046000210C000040000000090E8007C53
68044+:108DE00035040004A0E4007C90ED007D3C0B600E97
68045+:108DF000356A001031AC003FA0EC007D8D4931D4C4
68046+:108E00003127000110E00002240E0001A0AE00098D
68047+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
68048+:108E20000A000DAF8CC200140A000DB0ACE0007057
68049+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
68050+:108E4000AFB00010AFBF0020AFB10014918F00157C
68051+:108E50003C13600E3673001031EB000FA38B009CA7
68052+:108E60008D8F00048D8B0008959F0012959900103E
68053+:108E70009584001A9598001E958E001C33EDFFFF17
68054+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
68055+:108E90003C010800AC2D00243C010800AC29004432
68056+:108EA0003C010800AC2A0040AE683178AE67317CE6
68057+:108EB00091850015959100163C12601236520010F3
68058+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
68059+:108ED00091830014959F0018240600010066C804C1
68060+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
68061+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
68062+:108F0000918A00159584000E3C07600A314900FFE4
68063+:108F1000AF8B00883084FFFFAE4900C835110010C8
68064+:108F20000E000D1034F004103C0208008C4200606A
68065+:108F30003C0308008C6300643C0608008CC60058A3
68066+:108F40003C0508008CA5005C8F8400808FBF00204A
68067+:108F5000AE23004CAE65319CAE030054AE4500DC40
68068+:108F6000AE6231A0AE6331A4AE663198AE22004845
68069+:108F70008FB3001CAE0200508FB10014AE4200E06F
68070+:108F8000AE4300E4AE4600D88FB000108FB2001898
68071+:108F90000A00057D27BD0028978500929783007CF5
68072+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
68073+:108FB000240400058F900058104000552409000239
68074+:108FC0000E0006958F850080AF8200942404000374
68075+:108FD0001040004F240900023C0680000E00008172
68076+:108FE000ACC2002024070001240820001040004DDE
68077+:108FF00024040005978E00928F8AFF2C24090050CC
68078+:1090000025C50001A7850092A14900003C0D08007C
68079+:109010008DAD0064240380008F84FF28000D66005E
68080+:10902000AD4C0018A5400006954B000A8F85FF3017
68081+:109030002402FF8001633024A546000A915F000AE4
68082+:109040000000482103E2C825A159000AA0A0000899
68083+:10905000A140004CA08000D5961800029783009094
68084+:109060003C020004A49800EA960F00022418FFBFF7
68085+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
68086+:109080008E0C0008ACAC0040A4A00050A4A000547A
68087+:109090008E0B000C240C0030AC8B00288E060010C8
68088+:1090A000AC860024A480003EA487004EA487005014
68089+:1090B000A483003CAD420074AC8800D8ACA800602A
68090+:1090C000A08700FC909F00D433F9007FA09900D4C2
68091+:1090D000909000D402187824A08F00D4914E007C88
68092+:1090E00035CD0001A14D007C938B009CAD480070F4
68093+:1090F000AC8C00DCA08B00D68F8800888F87008422
68094+:10910000AC8800C4AC8700C8A5400078A540007AB0
68095+:109110008FBF00148FB000100120102103E0000861
68096+:1091200027BD00188F8500940E0007258F860080CC
68097+:109130000A000E9F2409000227BDFFE0AFB0001017
68098+:109140008F900058AFB10014AFBF00188E09000413
68099+:109150000E00054A000921C08E0800048F84FF28F4
68100+:109160008F82FF30000839C03C068000ACC7002069
68101+:10917000948500EA904300131460001C30B1FFFF97
68102+:109180008F8CFF2C918B0008316A00401540000B3A
68103+:10919000000000008E0D0004022030218FBF001857
68104+:1091A0008FB100148FB00010240400220000382179
68105+:1091B000000D29C00A000D2F27BD00200E000098C9
68106+:1091C000000000008E0D0004022030218FBF001827
68107+:1091D0008FB100148FB00010240400220000382149
68108+:1091E000000D29C00A000D2F27BD00200E000090A1
68109+:1091F000000000008E0D0004022030218FBF0018F7
68110+:109200008FB100148FB00010240400220000382118
68111+:10921000000D29C00A000D2F27BD002027BDFFE04B
68112+:10922000AFB200183092FFFFAFB00010AFBF001C0C
68113+:10923000AFB100141240001E000080218F8600583C
68114+:109240008CC500002403000600053F02000514023F
68115+:1092500030E4000714830016304500FF2CA80006F8
68116+:1092600011000040000558803C0C0800258C58BCBB
68117+:10927000016C50218D490000012000080000000011
68118+:109280008F8E0098240D000111CD005024020002A1
68119+:10929000AF820098260900013130FFFF24C800206A
68120+:1092A0000212202B010030211480FFE5AF88005806
68121+:1092B000020010218FBF001C8FB200188FB1001464
68122+:1092C0008FB0001003E0000827BD00209387007EC8
68123+:1092D00054E00034000030210E000DE700000000D3
68124+:1092E0008F8600580A000EFF240200018F87009825
68125+:1092F0002405000210E50031240400130000282199
68126+:1093000000003021240700010E000D2F0000000096
68127+:109310000A000F008F8600588F83009824020002F5
68128+:109320001462FFF6240400120E000D9A00000000E3
68129+:109330008F85009400403021240400120E000D2F70
68130+:10934000000038210A000F008F8600588F83009894
68131+:109350002411000310710029241F0002107FFFCE8A
68132+:1093600026090001240400100000282100003021FB
68133+:109370000A000F1D240700018F91009824060002A7
68134+:109380001626FFF9240400100E000E410000000014
68135+:10939000144000238F9800588F8600580A000EFF53
68136+:1093A00024020003240400140E000D2F00002821C5
68137+:1093B0008F8600580A000EFF240200020E000EA93C
68138+:1093C000000000000A000F008F8600580E000D3FBD
68139+:1093D00000000000241900022404001400002821C9
68140+:1093E0000000302100003821AF9900980E000D2FA9
68141+:1093F000000000000A000F008F8600580E000D5775
68142+:10940000000000008F8500942419000200403021E4
68143+:1094100024040010000038210A000F56AF9900986C
68144+:109420000040382124040010970F0002000028217A
68145+:109430000E000D2F31E6FFFF8F8600580A000F0047
68146+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
68147+:109450008C8500182402000100A61824AC83001893
68148+:1094600003E00008A08200053084FFFF30A5FFFF65
68149+:109470001080000700001821308200011040000217
68150+:1094800000042042006518211480FFFB00052840DD
68151+:1094900003E000080060102110C000070000000079
68152+:1094A0008CA2000024C6FFFF24A50004AC820000AB
68153+:1094B00014C0FFFB2484000403E000080000000047
68154+:1094C00010A0000824A3FFFFAC86000000000000ED
68155+:1094D000000000002402FFFF2463FFFF1462FFFA74
68156+:1094E0002484000403E0000800000000000411C010
68157+:1094F00003E000082442024027BDFFE8AFB000109F
68158+:1095000000808021AFBF00140E000F9600A0202124
68159+:1095100000504821240AFF808FBF00148FB0001034
68160+:10952000012A30243127007F3C08800A3C042100B6
68161+:1095300000E8102100C428253C03800027BD001846
68162+:10954000AC650024AF820038AC400000AC6500245C
68163+:1095500003E00008AC4000403C0D08008DAD005811
68164+:1095600000056180240AFF8001A45821016C482174
68165+:10957000012A30243127007F3C08800C3C04210064
68166+:1095800000E8102100C428253C038000AC650028B9
68167+:10959000AF82003403E00008AC40002430A5FFFF98
68168+:1095A0003C0680008CC201B80440FFFE3C086015F8
68169+:1095B00000A838253C031000ACC40180ACC0018475
68170+:1095C000ACC7018803E00008ACC301B83C0D08003B
68171+:1095D0008DAD005800056180240AFF8001A4582148
68172+:1095E000016C4021010A4824000931403107007F05
68173+:1095F00000C728253C04200000A418253C02800058
68174+:10960000AC43083003E00008AF80003427BDFFE81A
68175+:10961000AFB0001000808021AFBF00140E000F9685
68176+:1096200000A0202100504821240BFF80012B502452
68177+:10963000000A39403128007F3C0620008FBF00140B
68178+:109640008FB0001000E8282534C2000100A21825C0
68179+:109650003C04800027BD0018AC83083003E00008FC
68180+:10966000AF8000383C0580088CA700603C0680086D
68181+:109670000087102B144000112C8340008CA8006040
68182+:109680002D0340001060000F240340008CC90060CF
68183+:109690000089282B14A00002008018218CC30060D0
68184+:1096A00000035A42000B30803C0A0800254A59202A
68185+:1096B00000CA202103E000088C8200001460FFF340
68186+:1096C0002403400000035A42000B30803C0A08008B
68187+:1096D000254A592000CA202103E000088C8200009E
68188+:1096E0003C05800890A60008938400AB24C20001CA
68189+:1096F000304200FF3043007F1064000C0002382726
68190+:10970000A0A200083C0480008C85017804A0FFFE24
68191+:109710008F8A00A0240900023C081000AC8A014096
68192+:10972000A089014403E00008AC8801780A00101BFE
68193+:1097300030E2008027BDFFD8AFB200188F9200A49E
68194+:10974000AFBF0020AFB3001CAFB00010AFB100142A
68195+:109750008F9300348E5900283C1000803C0EFFEFA0
68196+:10976000AE7900008E580024A260000A35CDFFFFBC
68197+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
68198+:10978000A271000C8E6F000C3C080040A271000B0F
68199+:1097900001F06025018D4824012A382400E8302595
68200+:1097A000AE66000C8E450004AE6000183C0400FF5D
68201+:1097B000AE6500148E43002C3482FFFFA6600008C3
68202+:1097C0000062F824AE7F00108E5900088F9000A030
68203+:1097D000964E0012AE7900208E51000C31D83FFF1A
68204+:1097E00000187980AE7100248E4D001401F06021C4
68205+:1097F00031CB0001AE6D00288E4A0018000C41C22A
68206+:10980000000B4B80AE6A002C8E46001C01093821EB
68207+:10981000A667001CAE660030964500028E4400200C
68208+:10982000A665001EAE64003492430033306200042B
68209+:1098300054400006924700003C0280083443010077
68210+:109840008C7F00D0AE7F0030924700008F860038BA
68211+:10985000A0C700309245003330A4000250800007BA
68212+:10986000925100018F880038240BFF80910A00304C
68213+:10987000014B4825A1090030925100018F9000381A
68214+:10988000240CFFBF2404FFDFA21100318F8D0038AC
68215+:109890003C1880083711008091AF003C31EE007F0A
68216+:1098A000A1AE003C8F890038912B003C016C502404
68217+:1098B000A12A003C8F9F00388E68001493E6003C7C
68218+:1098C0002D0700010007114000C4282400A218251C
68219+:1098D000A3E3003C8F87003896590012A4F90032A8
68220+:1098E0008E450004922E007C30B0000300107823D7
68221+:1098F00031ED000300AD102131CC000215800002D3
68222+:1099000024460034244600303C0280083443008062
68223+:10991000907F007C00BFC824333800041700000289
68224+:1099200024C2000400C010218F98003824190002BE
68225+:10993000ACE20034A3190000924F003F8F8E003834
68226+:109940003C0C8008358B0080A1CF00018F9100383E
68227+:10995000924D003F8E440004A62D0002956A005CE3
68228+:109960000E000FF43150FFFF00024B800209382532
68229+:109970003C08420000E82825AE2500048E4400384B
68230+:109980008F850038ACA400188E460034ACA6001CAD
68231+:10999000ACA0000CACA00010A4A00014A4A0001661
68232+:1099A000A4A00020A4A00022ACA000248E62001479
68233+:1099B00050400001240200018FBF00208FB3001C23
68234+:1099C0008FB200188FB100148FB00010ACA2000845
68235+:1099D0000A00101327BD002827BDFFC83C058008DA
68236+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
68237+:1099F000AFB60028AFB50024AFB40020AFB3001C51
68238+:109A0000AFB20018AFB10014AFB00010948300786B
68239+:109A10009482007A104300512405FFFF0080F0215A
68240+:109A20000A0011230080B821108B004D8FBF003435
68241+:109A30008F8600A03C1808008F18005C2411FF805E
68242+:109A40003C1680000306782101F18024AED0002C62
68243+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
68244+:109A6000018D5021000B4840012AA82196A4000036
68245+:109A70003C0808008D0800582405FF8030953FFF02
68246+:109A800001061821001539800067C8210325F82434
68247+:109A90003C02010003E290253338007F3C11800C2A
68248+:109AA000AED20028031190219250000D320F000415
68249+:109AB00011E0003702E0982196E3007A96E8007AF8
68250+:109AC00096E5007A2404800031077FFF24E300013B
68251+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
68252+:109AE00096E6007A3C1408008E94006030D67FFF22
68253+:109AF00012D400C1000000008E5800188F8400A00E
68254+:109B000002A028212713FFFF0E000FCEAE53002C1A
68255+:109B100097D5007897D4007A12950010000028217C
68256+:109B20003C098008352401003C0A8008914800085F
68257+:109B3000908700D53114007F30E400FF0284302B81
68258+:109B400014C0FFB9268B0001938E00AB268C000158
68259+:109B5000008E682115ACFFB78F8600A08FBF003440
68260+:109B60008FBE00308FB7002C8FB600288FB5002431
68261+:109B70008FB400208FB3001C8FB200188FB1001477
68262+:109B80008FB0001000A0102103E0000827BD0038AE
68263+:109B900000C020210E000F99028028218E4B00105A
68264+:109BA0008E4C00308F84003824090002016C502351
68265+:109BB000AE4A0010A089000096E3005C8E4400309D
68266+:109BC0008F9100380E000FF43070FFFF00024380C9
68267+:109BD000020838253C02420000E22825AE25000498
68268+:109BE0008E5F00048F8A00388E590000240B000815
68269+:109BF000AD5F001CAD590018AD40000CAD40001029
68270+:109C00009246000A240400052408C00030D000FF5A
68271+:109C1000A550001496580008A55800169251000A45
68272+:109C20003C188008322F00FFA54F0020964E0008F8
68273+:109C300037110100A54E0022AD400024924D000BCB
68274+:109C400031AC00FFA54C0002A14B00018E49003051
68275+:109C50008F830038240BFFBFAC690008A06400307C
68276+:109C60008F9000382403FFDF9607003200E8282495
68277+:109C700000B51025A6020032921F003233F9003FD2
68278+:109C800037260040A20600328F8C0038AD800034A9
68279+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
68280+:109CA00031CD007FA18D003C8F84003835EEFFFF61
68281+:109CB000908A003C014B4824A089003C8F850038E5
68282+:109CC00090A8003C01033824A0A7003C8E42003439
68283+:109CD0008F9100383C038008AE2200408E59002C42
68284+:109CE0008E5F0030033F3023AE26004492300048A0
68285+:109CF0003218007FA23800488F8800388E4D00301F
68286+:109D00008D0C004801AE582401965024014B482583
68287+:109D1000AD0900489244000AA104004C964700088F
68288+:109D20008F850038A4A7004E8E5000308E4400303E
68289+:109D30000E0003818C65006092F9007C0002F940FE
68290+:109D4000004028210002110003E2302133360002D6
68291+:109D500012C00003020680210005B0800216802197
68292+:109D6000926D007C31B30004126000020005708027
68293+:109D7000020E80218E4B00308F8800382405800031
68294+:109D8000316A0003000A4823312400030204182129
68295+:109D9000AD03003496E4007A96F0007A96F1007AEA
68296+:109DA00032027FFF2447000130FF7FFF0225C824D5
68297+:109DB000033F3025A6E6007A96F8007A3C120800A8
68298+:109DC0008E520060330F7FFF11F200180000000078
68299+:109DD0008F8400A00E000FCE02A028218F8400A047
68300+:109DE0000E000FDE028028210E001013000000007C
68301+:109DF0000A00111F0000000096F1007A022480245E
68302+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
68303+:109E1000000E69C2000D6027000C51C03169007F3F
68304+:109E2000012A20250A001119A2E4007A96E6007A98
68305+:109E300000C5C024A6F8007A92EF007A92F3007A67
68306+:109E400031F200FF001271C2000E6827000DB1C090
68307+:109E5000326C007F01962825A2E5007A0A0011D015
68308+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
68309+:109E7000AC640018AC65001C03E000088C620014A0
68310+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
68311+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
68312+:109EA000AFB30044AFB20040AFB1003CAFB0003838
68313+:109EB00034C80100910500D590C700083084FFFF29
68314+:109EC00030A500FF30E2007F0045182AAFA4001043
68315+:109ED000A7A00018A7A0002610600055AFA000148E
68316+:109EE00090CA00083149007F00A9302324D3FFFF26
68317+:109EF0000013802B8FB400100014902B02128824C2
68318+:109F0000522000888FB300143C03800894790052DB
68319+:109F1000947E00508FB60010033EC0230018BC0092
68320+:109F2000001714030016FC0002C2A82A16A00002A3
68321+:109F3000001F2C030040282100133C0000072403CD
68322+:109F400000A4102A5440000100A020212885000907
68323+:109F500014A000020080A021241400083C0C8008FA
68324+:109F60008D860048001459808D88004C3C03800089
68325+:109F70003169FFFF3C0A0010012A202534710400DA
68326+:109F8000AC660038AF9100A4AC68003CAC64003013
68327+:109F900000000000000000000000000000000000C1
68328+:109FA00000000000000000000000000000000000B1
68329+:109FB0008C6E000031CD002011A0FFFD0014782A26
68330+:109FC00001F01024104000390000A8213C16800840
68331+:109FD00092D700083C1280008E44010032F6007FC8
68332+:109FE0000E000F9902C028218E3900108E44010006
68333+:109FF0000000902133373FFF0E000FB102E028210F
68334+:10A00000923800003302003F2C500008520000102C
68335+:10A0100000008821000210803C030800246358E4FB
68336+:10A020000043F8218FFE000003C00008000000007C
68337+:10A0300090CF0008938C00AB31EE007F00AE682318
68338+:10A04000018D58210A0012172573FFFF0000882197
68339+:10A050003C1E80008FC401000E000FCE02E02821BC
68340+:10A060008FC401000E000FDE02C028211220000F55
68341+:10A070000013802B8F8B00A426A400010004AC00E9
68342+:10A08000027298230015AC032578004002B4B02A70
68343+:10A090000013802B241700010300882102D0102414
68344+:10A0A000AF9800A41440FFC9AFB700143C07800864
68345+:10A0B00094E200508FAE00103C05800002A288217F
68346+:10A0C0003C060020A4F10050ACA6003094F40050EF
68347+:10A0D00094EF005201D51823306CFFFF11F4001EDD
68348+:10A0E000AFAC00108CEF004C001561808CF500487F
68349+:10A0F00001EC28210000202100AC582B02A4C02133
68350+:10A10000030BB021ACE5004CACF600488FB4001056
68351+:10A110000014902B021288241620FF7C3C03800838
68352+:10A120008FB300148FBF005C8FBE00583A620001ED
68353+:10A130008FB700548FB600508FB5004C8FB40048D5
68354+:10A140008FB300448FB200408FB1003C8FB0003815
68355+:10A1500003E0000827BD006094FE00548CF2004428
68356+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
68357+:10A170008CE800448CAD003C010D50231940003B9D
68358+:10A18000000000008CF7004026E20001ACA200387D
68359+:10A190003C05005034A700103C038000AC67003041
68360+:10A1A00000000000000000000000000000000000AF
68361+:10A1B000000000000000000000000000000000009F
68362+:10A1C0008C7800003316002012C0FFFD3C1180087F
68363+:10A1D000962200543C1580003C068008304E000159
68364+:10A1E000000E18C0007578218DEC04003C070800B3
68365+:10A1F0008CE700443C040020ACCC00488DF40404FF
68366+:10A20000240B0001ACD4004C10EB0260AEA4003073
68367+:10A21000963900523C0508008CA5004000B99021F9
68368+:10A22000A6320052963F005427ED0001A62D00549F
68369+:10A230009626005430C4FFFF5487FF2F8FB40010C0
68370+:10A2400030A5FFFF0E0011F4A62000543C070800C3
68371+:10A250008CE70024963E00520047B82303D74823DA
68372+:10A26000A62900520A0012198FB400108CE2004097
68373+:10A270000A0012BE00000000922400012407000121
68374+:10A280003085007F14A7001C97AD00268E2B00148C
68375+:10A29000240CC000316A3FFF01AC48243C06080092
68376+:10A2A0008CC60060012A402531043FFF0086882BC0
68377+:10A2B00012200011A7A800263C0508008CA5005814
68378+:10A2C0008F9100A0000439802402FF8000B1182182
68379+:10A2D0000067F82103E2F02433F8007F3C1280008D
68380+:10A2E0003C19800EAE5E002C0319702191D0000D38
68381+:10A2F000360F0004A1CF000D0E001028241200011B
68382+:10A30000241100013C1E80008FC401000E000FCEFE
68383+:10A3100002E028218FC401000E000FDE02C02821B8
68384+:10A320001620FF558F8B00A40A0012860013802B85
68385+:10A330008F8600A490C80001310400201080019194
68386+:10A34000241000013C048008348B0080916A007C5A
68387+:10A350008F9E0034AFA0002C314900011120000F66
68388+:10A36000AFB000288CCD00148C8E006001AE602B45
68389+:10A370001580000201A038218C8700603C188008FD
68390+:10A38000370300808C70007000F0782B15E000021D
68391+:10A3900000E020218C640070AFA4002C3C028008F7
68392+:10A3A000344500808CD200148CBF0070025FC82B33
68393+:10A3B00017200002024020218CA400708FA7002CDF
68394+:10A3C0000087182310600003AFA3003024050002AB
68395+:10A3D000AFA500288FA400280264882B162000BA9D
68396+:10A3E000000018218CD000388FCE000C3C0F00806C
68397+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
68398+:10A40000AFCD000490CA003F3586FFFF01662024CF
68399+:10A410003C0900203C08FFEFA3CA000B0089382547
68400+:10A420003511FFFF00F118243C0500088F8700A4B8
68401+:10A430000065C825AFD9000C8CE20014AFC000182D
68402+:10A440008FA60030AFC200148CF800188FB0002C1B
68403+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
68404+:10A4600003326824AFCF00248CEC000C020670216C
68405+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
68406+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
68407+:10A49000014B48230126402311000011AFC80010D2
68408+:10A4A00090EB003D8FC900048FC80000000B5100E5
68409+:10A4B000012A28210000102100AA882B010218215E
68410+:10A4C0000071F821AFC50004AFDF000090F2003D3D
68411+:10A4D000A3D2000A8F9900A497380006A7D80008D5
68412+:10A4E0008F910038240800023C038008A228000055
68413+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
68414+:10A500000E000FF48F9200380002CB808F8500A4DC
68415+:10A51000021978253C18420001F87025AE4E00045F
68416+:10A520008F8400388CAD0038AC8D00188CAC0034B2
68417+:10A53000AC8C001CAC80000CAC800010A48000141B
68418+:10A54000A4800016A4800020A4800022AC800024F7
68419+:10A5500090A6003F8FA7002CA486000250E0019235
68420+:10A56000240700018FA200305040000290A2003D5D
68421+:10A5700090A2003E244A0001A08A00018F84003886
68422+:10A580008FA9002CAC8900083C128008364D008051
68423+:10A5900091AC007C3186000214C000022407003414
68424+:10A5A000240700308F8500A43C198008373F0080C5
68425+:10A5B00090B0000093F9007C240E0004A0900030BD
68426+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
68427+:10A5D0003304000301C46023A1B200318F8E003820
68428+:10A5E0008F8600A42402C00095CA003294C90012CC
68429+:10A5F0008FAB002C0142402431233FFF010388250B
68430+:10A60000A5D1003291D000323185000300EBF82152
68431+:10A610003218003F370F0040A1CF00328FA4002C2A
68432+:10A6200003E5382133280004108000028F850038AC
68433+:10A6300000E838213C0A8008ACA700343549010005
68434+:10A640008D2800D08FA3002C2419FFBFACA80038A0
68435+:10A6500090B1003C2C640001240FFFDF3227007F03
68436+:10A66000A0A7003C8F98003800049140931F003C45
68437+:10A6700003F98024A310003C8F8C0038918E003C9D
68438+:10A6800001CF682401B23025A186003C8F8900A447
68439+:10A690008F8800388D2B0020AD0B00408D220024C8
68440+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
68441+:10A6B0000E001013AD03004C8FB1002824070002D8
68442+:10A6C000122700118FA300280003282B00058023E8
68443+:10A6D0000270982400608021006090210A00126FAF
68444+:10A6E0000010882B962900128F8400A00000902172
68445+:10A6F0003125FFFFA7A900180E000FC22411000189
68446+:10A700000A00131D3C1E80003C0B80003C12800898
68447+:10A710008D640100924900088F92FF340E000F995A
68448+:10A720003125007F8F9900388FA700288FA4003033
68449+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
68450+:10A740008F91003800026B80020D80253C0842008A
68451+:10A750008F8D00A402085025AE2A00048DA5003874
68452+:10A760008F8A003800007821000F1100AD450018D5
68453+:10A770008DB800343C047FFF3488FFFFAD58001CC7
68454+:10A7800091A6003E8D4C001C8D4900180006190052
68455+:10A79000000677020183C821004E58250323882B29
68456+:10A7A000012B382100F1F821AD59001CAD5F0018D4
68457+:10A7B000AD40000CAD40001091B0003E8FA40030C1
68458+:10A7C00024090005A550001495A500042419C00013
68459+:10A7D00000884024A545001691B8003EA5580020E9
68460+:10A7E00095AF0004A54F0022AD40002491AE003F7C
68461+:10A7F000A54E000291A6003E91AC003D01861023BB
68462+:10A80000244B0001A14B00018F9100388FA3003031
68463+:10A810003C028008344B0100AE230008A22900301E
68464+:10A820008F8C00388F8700A4959F003294F000121F
68465+:10A830002407FFBF033FC02432053FFF03057825EF
68466+:10A84000A58F0032918E00322418FFDF31CD003FFA
68467+:10A8500035A60040A18600328F910038240DFFFFFD
68468+:10A86000240CFF80AE2000348D6A00D0AE2A003860
68469+:10A870009223003C3069007FA229003C8F90003871
68470+:10A880003C0380009219003C0327F824A21F003CDF
68471+:10A890008F8E003891C5003C00B87824A1CF003CD1
68472+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
68473+:10A8B000AD46004491420048004C5825A14B004849
68474+:10A8C0008F9000388F9900A48E09004801238824B6
68475+:10A8D00002283825AE070048933F003EA21F004CD7
68476+:10A8E0008F9800A48F8F003897050004A5E5004ECF
68477+:10A8F0000E0003818DC500609246007C8FAC003055
68478+:10A9000000026940000291000040282130CB000283
68479+:10A9100001B21021156000AA018230213C0E80088E
68480+:10A9200035C20080904C007C31830004106000032D
68481+:10A930008FB900300005788000CF3021241F00043B
68482+:10A940008F910038332D000303ED8023320800037C
68483+:10A9500000C85021AE2A00343C188000A7C500383A
68484+:10A960003C0680088F04010090DE00080E000FDE18
68485+:10A9700033C5007F0E001013000000000A00140D04
68486+:10A980008FA300288F9800348CC90038241F00033F
68487+:10A99000A7000008AF0900008CC50034A300000A1E
68488+:10A9A0008F9900A4AF0500043C080080932D003F60
68489+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
68490+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
68491+:10A9D00003D170243646FFFF01C61824AF03000CD4
68492+:10A9E0008F2C0014972900128F8400A0AF0C001048
68493+:10A9F0008F2F0014AF000018AF000020AF0F00141D
68494+:10AA0000AF0000248F270018312F3FFF000F59801F
68495+:10AA1000AF0700288F2500080164F821312D0001BF
68496+:10AA2000AF0500308F31000C8F920038001F51C2EB
68497+:10AA3000000D438001481021241E00023C068008BE
68498+:10AA4000A702001CA7000034AF11002CA25E00007A
68499+:10AA500034D20080964E005C8F9900383C0342004F
68500+:10AA600031CCFFFF01833825AF2700048F8B00A472
68501+:10AA7000240500012402C0008D640038240700343E
68502+:10AA8000AF2400188D690034AF29001CAF20000CE2
68503+:10AA9000AF200010A7200014A7200016A720002038
68504+:10AAA000A7200022AF200024A7300002A325000128
68505+:10AAB0008F8800388F9F00A4AD10000893ED000030
68506+:10AAC000A10D00308F8A00A48F98003891510001A9
68507+:10AAD000A31100318F8B0038957E003203C27024A1
68508+:10AAE00001CF6025A56C0032916300323064003FD5
68509+:10AAF000A16400329249007C3125000214A00002BA
68510+:10AB00008F840038240700303C198008AC8700345B
68511+:10AB1000373201008E5F00D0240AFFBF020090216F
68512+:10AB2000AC9F0038908D003C31A8007FA088003C8D
68513+:10AB30008F9E003893C2003C004A8824A3D1003C79
68514+:10AB40008F8300380010882B9066003C34CE0020A4
68515+:10AB5000A06E003C8F8400A48F9800388C8C00205D
68516+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
68517+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
68518+:10AB80003C1E80000A0012700000000094C80052B1
68519+:10AB90003C0A08008D4A002401488821A4D10052B3
68520+:10ABA0000A0012198FB40010A08700018F840038AA
68521+:10ABB000240B0001AC8B00080A0013BE3C12800875
68522+:10ABC000000520800A0014A200C4302127BDFFE048
68523+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
68524+:10ABE000AFB1001435B200808E4C001835A80100BA
68525+:10ABF000964B000695A70050910900FC000C5602E8
68526+:10AC0000016728233143007F312600FF240200031F
68527+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
68528+:10AC2000910600FC2412000530C200FF10520033D0
68529+:10AC300000000000160000098FBF001C8FB2001832
68530+:10AC40008FB100148FB00010240D0C003C0C80005C
68531+:10AC500027BD002003E00008AD8D00240E0011FB8D
68532+:10AC6000020020218FBF001C8FB200188FB100148A
68533+:10AC70008FB00010240D0C003C0C800027BD00207C
68534+:10AC800003E00008AD8D0024965800789651007AB4
68535+:10AC9000924E007D0238782631E8FFFF31C400C0B3
68536+:10ACA000148000092D11000116000037000000007B
68537+:10ACB0005620FFE28FBF001C0E0010D100000000E4
68538+:10ACC0000A00156A8FBF001C1620FFDA0000000082
68539+:10ACD0000E0010D1000000001440FFD88FBF001CF0
68540+:10ACE0001600002200000000925F007D33E2003F6A
68541+:10ACF000A242007D0A00156A8FBF001C950900EA78
68542+:10AD00008F86008000802821240400050E0007257E
68543+:10AD10003130FFFF978300923C0480002465FFFFE1
68544+:10AD2000A78500928C8A01B80540FFFE0000000054
68545+:10AD3000AC8001808FBF001CAC9001848FB20018E2
68546+:10AD40008FB100148FB000103C0760133C0B100053
68547+:10AD5000240D0C003C0C800027BD0020AC8701882E
68548+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
68549+:10AD7000020020215040FFB18FBF001C925F007D78
68550+:10AD80000A00159733E2003F0E0011FB020020215C
68551+:10AD90001440FFAA8FBF001C122000070000000013
68552+:10ADA0009259007D3330003F36020040A242007DC0
68553+:10ADB0000A00156A8FBF001C0E0010D100000000B1
68554+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
68555+:10ADD0000A0015C636020040000000000000001BFB
68556+:10ADE0000000000F0000000A00000008000000063C
68557+:10ADF0000000000500000005000000040000000441
68558+:10AE00000000000300000003000000030000000336
68559+:10AE10000000000300000002000000020000000229
68560+:10AE2000000000020000000200000002000000021A
68561+:10AE3000000000020000000200000002000000020A
68562+:10AE400000000002000000020000000200000002FA
68563+:10AE50000000000100000001000000018008010066
68564+:10AE6000800800808008000000000C000000308096
68565+:10AE7000080011D00800127C08001294080012A8E3
68566+:10AE8000080012BC080011D0080011D0080012F010
68567+:10AE90000800132C080013400800138808001A8CBF
68568+:10AEA00008001A8C08001AC408001AC408001AD82E
68569+:10AEB00008001AA808001D0008001CCC08001D5836
68570+:10AEC00008001D5808001DE008001D108008024001
68571+:10AED000080027340800256C0800275C080027F4C8
68572+:10AEE0000800293C0800298808002AAC080029B479
68573+:10AEF00008002A38080025DC08002EDC08002EA4F3
68574+:10AF000008002588080025880800258808002B20CF
68575+:10AF100008002B20080025880800258808002DD06F
68576+:10AF2000080025880800258808002588080025884D
68577+:10AF300008002E0C080025880800258808002588B0
68578+:10AF4000080025880800258808002588080025882D
68579+:10AF5000080025880800258808002588080025881D
68580+:10AF6000080025880800258808002588080029A8E9
68581+:10AF7000080025880800258808002E680800258814
68582+:10AF800008002588080025880800258808002588ED
68583+:10AF900008002588080025880800258808002588DD
68584+:10AFA00008002588080025880800258808002588CD
68585+:10AFB00008002588080025880800258808002588BD
68586+:10AFC00008002CF4080025880800258808002C6853
68587+:10AFD00008002BC408003CE408003CB808003C848E
68588+:10AFE00008003C5808003C3808003BEC8008010091
68589+:10AFF00080080080800800008008008008004C6401
68590+:10B0000008004C9C08004BE408004C6408004C64A9
68591+:10B01000080049B808004C64080050500A000C842D
68592+:10B0200000000000000000000000000D7278703683
68593+:10B030002E322E31620000000602010300000000E3
68594+:10B0400000000001000000000000000000000000FF
68595+:10B0500000000000000000000000000000000000F0
68596+:10B0600000000000000000000000000000000000E0
68597+:10B0700000000000000000000000000000000000D0
68598+:10B0800000000000000000000000000000000000C0
68599+:10B0900000000000000000000000000000000000B0
68600+:10B0A00000000000000000000000000000000000A0
68601+:10B0B0000000000000000000000000000000000090
68602+:10B0C0000000000000000000000000000000000080
68603+:10B0D0000000000000000000000000000000000070
68604+:10B0E0000000000000000000000000000000000060
68605+:10B0F0000000000000000000000000000000000050
68606+:10B10000000000000000000000000000000000003F
68607+:10B11000000000000000000000000000000000002F
68608+:10B12000000000000000000000000000000000001F
68609+:10B13000000000000000000000000000000000000F
68610+:10B1400000000000000000000000000000000000FF
68611+:10B1500000000000000000000000000000000000EF
68612+:10B1600000000000000000000000000000000000DF
68613+:10B1700000000000000000000000000000000000CF
68614+:10B1800000000000000000000000000000000000BF
68615+:10B1900000000000000000000000000000000000AF
68616+:10B1A000000000000000000000000000000000009F
68617+:10B1B000000000000000000000000000000000008F
68618+:10B1C000000000000000000000000000000000007F
68619+:10B1D000000000000000000000000000000000006F
68620+:10B1E000000000000000000000000000000000005F
68621+:10B1F000000000000000000000000000000000004F
68622+:10B20000000000000000000000000000000000003E
68623+:10B21000000000000000000000000000000000002E
68624+:10B22000000000000000000000000000000000001E
68625+:10B23000000000000000000000000000000000000E
68626+:10B2400000000000000000000000000000000000FE
68627+:10B2500000000000000000000000000000000000EE
68628+:10B2600000000000000000000000000000000000DE
68629+:10B2700000000000000000000000000000000000CE
68630+:10B2800000000000000000000000000000000000BE
68631+:10B2900000000000000000000000000000000000AE
68632+:10B2A000000000000000000000000000000000009E
68633+:10B2B000000000000000000000000000000000008E
68634+:10B2C000000000000000000000000000000000007E
68635+:10B2D000000000000000000000000000000000006E
68636+:10B2E000000000000000000000000000000000005E
68637+:10B2F000000000000000000000000000000000004E
68638+:10B30000000000000000000000000000000000003D
68639+:10B31000000000000000000000000000000000002D
68640+:10B32000000000000000000000000000000000001D
68641+:10B33000000000000000000000000000000000000D
68642+:10B3400000000000000000000000000000000000FD
68643+:10B3500000000000000000000000000000000000ED
68644+:10B3600000000000000000000000000000000000DD
68645+:10B3700000000000000000000000000000000000CD
68646+:10B3800000000000000000000000000000000000BD
68647+:10B3900000000000000000000000000000000000AD
68648+:10B3A000000000000000000000000000000000009D
68649+:10B3B000000000000000000000000000000000008D
68650+:10B3C000000000000000000000000000000000007D
68651+:10B3D000000000000000000000000000000000006D
68652+:10B3E000000000000000000000000000000000005D
68653+:10B3F000000000000000000000000000000000004D
68654+:10B40000000000000000000000000000000000003C
68655+:10B41000000000000000000000000000000000002C
68656+:10B42000000000000000000000000000000000001C
68657+:10B43000000000000000000000000000000000000C
68658+:10B4400000000000000000000000000000000000FC
68659+:10B4500000000000000000000000000000000000EC
68660+:10B4600000000000000000000000000000000000DC
68661+:10B4700000000000000000000000000000000000CC
68662+:10B4800000000000000000000000000000000000BC
68663+:10B4900000000000000000000000000000000000AC
68664+:10B4A000000000000000000000000000000000009C
68665+:10B4B000000000000000000000000000000000008C
68666+:10B4C000000000000000000000000000000000007C
68667+:10B4D000000000000000000000000000000000006C
68668+:10B4E000000000000000000000000000000000005C
68669+:10B4F000000000000000000000000000000000004C
68670+:10B50000000000000000000000000000000000003B
68671+:10B51000000000000000000000000000000000002B
68672+:10B52000000000000000000000000000000000001B
68673+:10B53000000000000000000000000000000000000B
68674+:10B5400000000000000000000000000000000000FB
68675+:10B5500000000000000000000000000000000000EB
68676+:10B5600000000000000000000000000000000000DB
68677+:10B5700000000000000000000000000000000000CB
68678+:10B5800000000000000000000000000000000000BB
68679+:10B5900000000000000000000000000000000000AB
68680+:10B5A000000000000000000000000000000000009B
68681+:10B5B000000000000000000000000000000000008B
68682+:10B5C000000000000000000000000000000000007B
68683+:10B5D000000000000000000000000000000000006B
68684+:10B5E000000000000000000000000000000000005B
68685+:10B5F000000000000000000000000000000000004B
68686+:10B60000000000000000000000000000000000003A
68687+:10B61000000000000000000000000000000000002A
68688+:10B62000000000000000000000000000000000001A
68689+:10B63000000000000000000000000000000000000A
68690+:10B6400000000000000000000000000000000000FA
68691+:10B6500000000000000000000000000000000000EA
68692+:10B6600000000000000000000000000000000000DA
68693+:10B6700000000000000000000000000000000000CA
68694+:10B6800000000000000000000000000000000000BA
68695+:10B6900000000000000000000000000000000000AA
68696+:10B6A000000000000000000000000000000000009A
68697+:10B6B000000000000000000000000000000000008A
68698+:10B6C000000000000000000000000000000000007A
68699+:10B6D000000000000000000000000000000000006A
68700+:10B6E000000000000000000000000000000000005A
68701+:10B6F000000000000000000000000000000000004A
68702+:10B700000000000000000000000000000000000039
68703+:10B710000000000000000000000000000000000029
68704+:10B720000000000000000000000000000000000019
68705+:10B730000000000000000000000000000000000009
68706+:10B7400000000000000000000000000000000000F9
68707+:10B7500000000000000000000000000000000000E9
68708+:10B7600000000000000000000000000000000000D9
68709+:10B7700000000000000000000000000000000000C9
68710+:10B7800000000000000000000000000000000000B9
68711+:10B7900000000000000000000000000000000000A9
68712+:10B7A0000000000000000000000000000000000099
68713+:10B7B0000000000000000000000000000000000089
68714+:10B7C0000000000000000000000000000000000079
68715+:10B7D0000000000000000000000000000000000069
68716+:10B7E0000000000000000000000000000000000059
68717+:10B7F0000000000000000000000000000000000049
68718+:10B800000000000000000000000000000000000038
68719+:10B810000000000000000000000000000000000028
68720+:10B820000000000000000000000000000000000018
68721+:10B830000000000000000000000000000000000008
68722+:10B8400000000000000000000000000000000000F8
68723+:10B8500000000000000000000000000000000000E8
68724+:10B8600000000000000000000000000000000000D8
68725+:10B8700000000000000000000000000000000000C8
68726+:10B8800000000000000000000000000000000000B8
68727+:10B8900000000000000000000000000000000000A8
68728+:10B8A0000000000000000000000000000000000098
68729+:10B8B0000000000000000000000000000000000088
68730+:10B8C0000000000000000000000000000000000078
68731+:10B8D0000000000000000000000000000000000068
68732+:10B8E0000000000000000000000000000000000058
68733+:10B8F0000000000000000000000000000000000048
68734+:10B900000000000000000000000000000000000037
68735+:10B910000000000000000000000000000000000027
68736+:10B920000000000000000000000000000000000017
68737+:10B930000000000000000000000000000000000007
68738+:10B9400000000000000000000000000000000000F7
68739+:10B9500000000000000000000000000000000000E7
68740+:10B9600000000000000000000000000000000000D7
68741+:10B9700000000000000000000000000000000000C7
68742+:10B9800000000000000000000000000000000000B7
68743+:10B9900000000000000000000000000000000000A7
68744+:10B9A0000000000000000000000000000000000097
68745+:10B9B0000000000000000000000000000000000087
68746+:10B9C0000000000000000000000000000000000077
68747+:10B9D0000000000000000000000000000000000067
68748+:10B9E0000000000000000000000000000000000057
68749+:10B9F0000000000000000000000000000000000047
68750+:10BA00000000000000000000000000000000000036
68751+:10BA10000000000000000000000000000000000026
68752+:10BA20000000000000000000000000000000000016
68753+:10BA30000000000000000000000000000000000006
68754+:10BA400000000000000000000000000000000000F6
68755+:10BA500000000000000000000000000000000000E6
68756+:10BA600000000000000000000000000000000000D6
68757+:10BA700000000000000000000000000000000000C6
68758+:10BA800000000000000000000000000000000000B6
68759+:10BA900000000000000000000000000000000000A6
68760+:10BAA0000000000000000000000000000000000096
68761+:10BAB0000000000000000000000000000000000086
68762+:10BAC0000000000000000000000000000000000076
68763+:10BAD0000000000000000000000000000000000066
68764+:10BAE0000000000000000000000000000000000056
68765+:10BAF0000000000000000000000000000000000046
68766+:10BB00000000000000000000000000000000000035
68767+:10BB10000000000000000000000000000000000025
68768+:10BB20000000000000000000000000000000000015
68769+:10BB30000000000000000000000000000000000005
68770+:10BB400000000000000000000000000000000000F5
68771+:10BB500000000000000000000000000000000000E5
68772+:10BB600000000000000000000000000000000000D5
68773+:10BB700000000000000000000000000000000000C5
68774+:10BB800000000000000000000000000000000000B5
68775+:10BB900000000000000000000000000000000000A5
68776+:10BBA0000000000000000000000000000000000095
68777+:10BBB0000000000000000000000000000000000085
68778+:10BBC0000000000000000000000000000000000075
68779+:10BBD0000000000000000000000000000000000065
68780+:10BBE0000000000000000000000000000000000055
68781+:10BBF0000000000000000000000000000000000045
68782+:10BC00000000000000000000000000000000000034
68783+:10BC10000000000000000000000000000000000024
68784+:10BC20000000000000000000000000000000000014
68785+:10BC30000000000000000000000000000000000004
68786+:10BC400000000000000000000000000000000000F4
68787+:10BC500000000000000000000000000000000000E4
68788+:10BC600000000000000000000000000000000000D4
68789+:10BC700000000000000000000000000000000000C4
68790+:10BC800000000000000000000000000000000000B4
68791+:10BC900000000000000000000000000000000000A4
68792+:10BCA0000000000000000000000000000000000094
68793+:10BCB0000000000000000000000000000000000084
68794+:10BCC0000000000000000000000000000000000074
68795+:10BCD0000000000000000000000000000000000064
68796+:10BCE0000000000000000000000000000000000054
68797+:10BCF0000000000000000000000000000000000044
68798+:10BD00000000000000000000000000000000000033
68799+:10BD10000000000000000000000000000000000023
68800+:10BD20000000000000000000000000000000000013
68801+:10BD30000000000000000000000000000000000003
68802+:10BD400000000000000000000000000000000000F3
68803+:10BD500000000000000000000000000000000000E3
68804+:10BD600000000000000000000000000000000000D3
68805+:10BD700000000000000000000000000000000000C3
68806+:10BD800000000000000000000000000000000000B3
68807+:10BD900000000000000000000000000000000000A3
68808+:10BDA0000000000000000000000000000000000093
68809+:10BDB0000000000000000000000000000000000083
68810+:10BDC0000000000000000000000000000000000073
68811+:10BDD0000000000000000000000000000000000063
68812+:10BDE0000000000000000000000000000000000053
68813+:10BDF0000000000000000000000000000000000043
68814+:10BE00000000000000000000000000000000000032
68815+:10BE10000000000000000000000000000000000022
68816+:10BE20000000000000000000000000000000000012
68817+:10BE30000000000000000000000000000000000002
68818+:10BE400000000000000000000000000000000000F2
68819+:10BE500000000000000000000000000000000000E2
68820+:10BE600000000000000000000000000000000000D2
68821+:10BE700000000000000000000000000000000000C2
68822+:10BE800000000000000000000000000000000000B2
68823+:10BE900000000000000000000000000000000000A2
68824+:10BEA0000000000000000000000000000000000092
68825+:10BEB0000000000000000000000000000000000082
68826+:10BEC0000000000000000000000000000000000072
68827+:10BED0000000000000000000000000000000000062
68828+:10BEE0000000000000000000000000000000000052
68829+:10BEF0000000000000000000000000000000000042
68830+:10BF00000000000000000000000000000000000031
68831+:10BF10000000000000000000000000000000000021
68832+:10BF20000000000000000000000000000000000011
68833+:10BF30000000000000000000000000000000000001
68834+:10BF400000000000000000000000000000000000F1
68835+:10BF500000000000000000000000000000000000E1
68836+:10BF600000000000000000000000000000000000D1
68837+:10BF700000000000000000000000000000000000C1
68838+:10BF800000000000000000000000000000000000B1
68839+:10BF900000000000000000000000000000000000A1
68840+:10BFA0000000000000000000000000000000000091
68841+:10BFB0000000000000000000000000000000000081
68842+:10BFC0000000000000000000000000000000000071
68843+:10BFD0000000000000000000000000000000000061
68844+:10BFE0000000000000000000000000000000000051
68845+:10BFF0000000000000000000000000000000000041
68846+:10C000000000000000000000000000000000000030
68847+:10C010000000000000000000000000000000000020
68848+:10C020000000000000000000000000000000000010
68849+:10C030000000000000000000000000000000000000
68850+:10C0400000000000000000000000000000000000F0
68851+:10C0500000000000000000000000000000000000E0
68852+:10C0600000000000000000000000000000000000D0
68853+:10C0700000000000000000000000000000000000C0
68854+:10C0800000000000000000000000000000000000B0
68855+:10C0900000000000000000000000000000000000A0
68856+:10C0A0000000000000000000000000000000000090
68857+:10C0B0000000000000000000000000000000000080
68858+:10C0C0000000000000000000000000000000000070
68859+:10C0D0000000000000000000000000000000000060
68860+:10C0E0000000000000000000000000000000000050
68861+:10C0F0000000000000000000000000000000000040
68862+:10C10000000000000000000000000000000000002F
68863+:10C11000000000000000000000000000000000001F
68864+:10C12000000000000000000000000000000000000F
68865+:10C1300000000000000000000000000000000000FF
68866+:10C1400000000000000000000000000000000000EF
68867+:10C1500000000000000000000000000000000000DF
68868+:10C1600000000000000000000000000000000000CF
68869+:10C1700000000000000000000000000000000000BF
68870+:10C1800000000000000000000000000000000000AF
68871+:10C19000000000000000000000000000000000009F
68872+:10C1A000000000000000000000000000000000008F
68873+:10C1B000000000000000000000000000000000007F
68874+:10C1C000000000000000000000000000000000006F
68875+:10C1D000000000000000000000000000000000005F
68876+:10C1E000000000000000000000000000000000004F
68877+:10C1F000000000000000000000000000000000003F
68878+:10C20000000000000000000000000000000000002E
68879+:10C21000000000000000000000000000000000001E
68880+:10C22000000000000000000000000000000000000E
68881+:10C2300000000000000000000000000000000000FE
68882+:10C2400000000000000000000000000000000000EE
68883+:10C2500000000000000000000000000000000000DE
68884+:10C2600000000000000000000000000000000000CE
68885+:10C2700000000000000000000000000000000000BE
68886+:10C2800000000000000000000000000000000000AE
68887+:10C29000000000000000000000000000000000009E
68888+:10C2A000000000000000000000000000000000008E
68889+:10C2B000000000000000000000000000000000007E
68890+:10C2C000000000000000000000000000000000006E
68891+:10C2D000000000000000000000000000000000005E
68892+:10C2E000000000000000000000000000000000004E
68893+:10C2F000000000000000000000000000000000003E
68894+:10C30000000000000000000000000000000000002D
68895+:10C31000000000000000000000000000000000001D
68896+:10C32000000000000000000000000000000000000D
68897+:10C3300000000000000000000000000000000000FD
68898+:10C3400000000000000000000000000000000000ED
68899+:10C3500000000000000000000000000000000000DD
68900+:10C3600000000000000000000000000000000000CD
68901+:10C3700000000000000000000000000000000000BD
68902+:10C3800000000000000000000000000000000000AD
68903+:10C39000000000000000000000000000000000009D
68904+:10C3A000000000000000000000000000000000008D
68905+:10C3B000000000000000000000000000000000007D
68906+:10C3C000000000000000000000000000000000006D
68907+:10C3D000000000000000000000000000000000005D
68908+:10C3E000000000000000000000000000000000004D
68909+:10C3F000000000000000000000000000000000003D
68910+:10C40000000000000000000000000000000000002C
68911+:10C41000000000000000000000000000000000001C
68912+:10C42000000000000000000000000000000000000C
68913+:10C4300000000000000000000000000000000000FC
68914+:10C4400000000000000000000000000000000000EC
68915+:10C4500000000000000000000000000000000000DC
68916+:10C4600000000000000000000000000000000000CC
68917+:10C4700000000000000000000000000000000000BC
68918+:10C4800000000000000000000000000000000000AC
68919+:10C49000000000000000000000000000000000009C
68920+:10C4A000000000000000000000000000000000008C
68921+:10C4B000000000000000000000000000000000007C
68922+:10C4C000000000000000000000000000000000006C
68923+:10C4D000000000000000000000000000000000005C
68924+:10C4E000000000000000000000000000000000004C
68925+:10C4F000000000000000000000000000000000003C
68926+:10C50000000000000000000000000000000000002B
68927+:10C51000000000000000000000000000000000001B
68928+:10C52000000000000000000000000000000000000B
68929+:10C5300000000000000000000000000000000000FB
68930+:10C5400000000000000000000000000000000000EB
68931+:10C5500000000000000000000000000000000000DB
68932+:10C5600000000000000000000000000000000000CB
68933+:10C5700000000000000000000000000000000000BB
68934+:10C5800000000000000000000000000000000000AB
68935+:10C59000000000000000000000000000000000009B
68936+:10C5A000000000000000000000000000000000008B
68937+:10C5B000000000000000000000000000000000007B
68938+:10C5C000000000000000000000000000000000006B
68939+:10C5D000000000000000000000000000000000005B
68940+:10C5E000000000000000000000000000000000004B
68941+:10C5F000000000000000000000000000000000003B
68942+:10C60000000000000000000000000000000000002A
68943+:10C61000000000000000000000000000000000001A
68944+:10C62000000000000000000000000000000000000A
68945+:10C6300000000000000000000000000000000000FA
68946+:10C6400000000000000000000000000000000000EA
68947+:10C6500000000000000000000000000000000000DA
68948+:10C6600000000000000000000000000000000000CA
68949+:10C6700000000000000000000000000000000000BA
68950+:10C6800000000000000000000000000000000000AA
68951+:10C69000000000000000000000000000000000009A
68952+:10C6A000000000000000000000000000000000008A
68953+:10C6B000000000000000000000000000000000007A
68954+:10C6C000000000000000000000000000000000006A
68955+:10C6D000000000000000000000000000000000005A
68956+:10C6E000000000000000000000000000000000004A
68957+:10C6F000000000000000000000000000000000003A
68958+:10C700000000000000000000000000000000000029
68959+:10C710000000000000000000000000000000000019
68960+:10C720000000000000000000000000000000000009
68961+:10C7300000000000000000000000000000000000F9
68962+:10C7400000000000000000000000000000000000E9
68963+:10C7500000000000000000000000000000000000D9
68964+:10C7600000000000000000000000000000000000C9
68965+:10C7700000000000000000000000000000000000B9
68966+:10C7800000000000000000000000000000000000A9
68967+:10C790000000000000000000000000000000000099
68968+:10C7A0000000000000000000000000000000000089
68969+:10C7B0000000000000000000000000000000000079
68970+:10C7C0000000000000000000000000000000000069
68971+:10C7D0000000000000000000000000000000000059
68972+:10C7E0000000000000000000000000000000000049
68973+:10C7F0000000000000000000000000000000000039
68974+:10C800000000000000000000000000000000000028
68975+:10C810000000000000000000000000000000000018
68976+:10C820000000000000000000000000000000000008
68977+:10C8300000000000000000000000000000000000F8
68978+:10C8400000000000000000000000000000000000E8
68979+:10C8500000000000000000000000000000000000D8
68980+:10C8600000000000000000000000000000000000C8
68981+:10C8700000000000000000000000000000000000B8
68982+:10C8800000000000000000000000000000000000A8
68983+:10C890000000000000000000000000000000000098
68984+:10C8A0000000000000000000000000000000000088
68985+:10C8B0000000000000000000000000000000000078
68986+:10C8C0000000000000000000000000000000000068
68987+:10C8D0000000000000000000000000000000000058
68988+:10C8E0000000000000000000000000000000000048
68989+:10C8F0000000000000000000000000000000000038
68990+:10C900000000000000000000000000000000000027
68991+:10C910000000000000000000000000000000000017
68992+:10C920000000000000000000000000000000000007
68993+:10C9300000000000000000000000000000000000F7
68994+:10C9400000000000000000000000000000000000E7
68995+:10C9500000000000000000000000000000000000D7
68996+:10C9600000000000000000000000000000000000C7
68997+:10C9700000000000000000000000000000000000B7
68998+:10C9800000000000000000000000000000000000A7
68999+:10C990000000000000000000000000000000000097
69000+:10C9A0000000000000000000000000000000000087
69001+:10C9B0000000000000000000000000000000000077
69002+:10C9C0000000000000000000000000000000000067
69003+:10C9D0000000000000000000000000000000000057
69004+:10C9E0000000000000000000000000000000000047
69005+:10C9F0000000000000000000000000000000000037
69006+:10CA00000000000000000000000000000000000026
69007+:10CA10000000000000000000000000000000000016
69008+:10CA20000000000000000000000000000000000006
69009+:10CA300000000000000000000000000000000000F6
69010+:10CA400000000000000000000000000000000000E6
69011+:10CA500000000000000000000000000000000000D6
69012+:10CA600000000000000000000000000000000000C6
69013+:10CA700000000000000000000000000000000000B6
69014+:10CA800000000000000000000000000000000000A6
69015+:10CA90000000000000000000000000000000000096
69016+:10CAA0000000000000000000000000000000000086
69017+:10CAB0000000000000000000000000000000000076
69018+:10CAC0000000000000000000000000000000000066
69019+:10CAD0000000000000000000000000000000000056
69020+:10CAE0000000000000000000000000000000000046
69021+:10CAF0000000000000000000000000000000000036
69022+:10CB00000000000000000000000000000000000025
69023+:10CB10000000000000000000000000000000000015
69024+:10CB20000000000000000000000000000000000005
69025+:10CB300000000000000000000000000000000000F5
69026+:10CB400000000000000000000000000000000000E5
69027+:10CB500000000000000000000000000000000000D5
69028+:10CB600000000000000000000000000000000000C5
69029+:10CB700000000000000000000000000000000000B5
69030+:10CB800000000000000000000000000000000000A5
69031+:10CB90000000000000000000000000000000000095
69032+:10CBA0000000000000000000000000000000000085
69033+:10CBB0000000000000000000000000000000000075
69034+:10CBC0000000000000000000000000000000000065
69035+:10CBD0000000000000000000000000000000000055
69036+:10CBE0000000000000000000000000000000000045
69037+:10CBF0000000000000000000000000000000000035
69038+:10CC00000000000000000000000000000000000024
69039+:10CC10000000000000000000000000000000000014
69040+:10CC20000000000000000000000000000000000004
69041+:10CC300000000000000000000000000000000000F4
69042+:10CC400000000000000000000000000000000000E4
69043+:10CC500000000000000000000000000000000000D4
69044+:10CC600000000000000000000000000000000000C4
69045+:10CC700000000000000000000000000000000000B4
69046+:10CC800000000000000000000000000000000000A4
69047+:10CC90000000000000000000000000000000000094
69048+:10CCA0000000000000000000000000000000000084
69049+:10CCB0000000000000000000000000000000000074
69050+:10CCC0000000000000000000000000000000000064
69051+:10CCD0000000000000000000000000000000000054
69052+:10CCE0000000000000000000000000000000000044
69053+:10CCF0000000000000000000000000000000000034
69054+:10CD00000000000000000000000000000000000023
69055+:10CD10000000000000000000000000000000000013
69056+:10CD20000000000000000000000000000000000003
69057+:10CD300000000000000000000000000000000000F3
69058+:10CD400000000000000000000000000000000000E3
69059+:10CD500000000000000000000000000000000000D3
69060+:10CD600000000000000000000000000000000000C3
69061+:10CD700000000000000000000000000000000000B3
69062+:10CD800000000000000000000000000000000000A3
69063+:10CD90000000000000000000000000000000000093
69064+:10CDA0000000000000000000000000000000000083
69065+:10CDB0000000000000000000000000000000000073
69066+:10CDC0000000000000000000000000000000000063
69067+:10CDD0000000000000000000000000000000000053
69068+:10CDE0000000000000000000000000000000000043
69069+:10CDF0000000000000000000000000000000000033
69070+:10CE00000000000000000000000000000000000022
69071+:10CE10000000000000000000000000000000000012
69072+:10CE20000000000000000000000000000000000002
69073+:10CE300000000000000000000000000000000000F2
69074+:10CE400000000000000000000000000000000000E2
69075+:10CE500000000000000000000000000000000000D2
69076+:10CE600000000000000000000000000000000000C2
69077+:10CE700000000000000000000000000000000000B2
69078+:10CE800000000000000000000000000000000000A2
69079+:10CE90000000000000000000000000000000000092
69080+:10CEA0000000000000000000000000000000000082
69081+:10CEB0000000000000000000000000000000000072
69082+:10CEC0000000000000000000000000000000000062
69083+:10CED0000000000000000000000000000000000052
69084+:10CEE0000000000000000000000000000000000042
69085+:10CEF0000000000000000000000000000000000032
69086+:10CF00000000000000000000000000000000000021
69087+:10CF10000000000000000000000000000000000011
69088+:10CF20000000000000000000000000000000000001
69089+:10CF300000000000000000000000000000000000F1
69090+:10CF400000000000000000000000000000000000E1
69091+:10CF500000000000000000000000000000000000D1
69092+:10CF600000000000000000000000000000000000C1
69093+:10CF700000000000000000000000000000000000B1
69094+:10CF800000000000000000000000000000000000A1
69095+:10CF90000000000000000000000000000000000091
69096+:10CFA0000000000000000000000000000000000081
69097+:10CFB0000000000000000000000000000000000071
69098+:10CFC0000000000000000000000000000000000061
69099+:10CFD0000000000000000000000000000000000051
69100+:10CFE0000000000000000000000000000000000041
69101+:10CFF0000000000000000000000000000000000031
69102+:10D000000000000000000000000000000000000020
69103+:10D010000000000000000000000000000000000010
69104+:10D020000000000000000000000000000000000000
69105+:10D0300000000000000000000000000000000000F0
69106+:10D0400000000000000000000000000000000000E0
69107+:10D0500000000000000000000000000000000000D0
69108+:10D0600000000000000000000000000000000000C0
69109+:10D0700000000000000000000000000000000000B0
69110+:10D0800000000000000000000000000000000000A0
69111+:10D090000000000000000000000000000000000090
69112+:10D0A0000000000000000000000000000000000080
69113+:10D0B0000000000000000000000000000000000070
69114+:10D0C0000000000000000000000000000000000060
69115+:10D0D0000000000000000000000000000000000050
69116+:10D0E0000000000000000000000000000000000040
69117+:10D0F0000000000000000000000000000000000030
69118+:10D10000000000000000000000000000000000001F
69119+:10D11000000000000000000000000000000000000F
69120+:10D1200000000000000000000000000000000000FF
69121+:10D1300000000000000000000000000000000000EF
69122+:10D1400000000000000000000000000000000000DF
69123+:10D1500000000000000000000000000000000000CF
69124+:10D1600000000000000000000000000000000000BF
69125+:10D1700000000000000000000000000000000000AF
69126+:10D18000000000000000000000000000000000009F
69127+:10D19000000000000000000000000000000000008F
69128+:10D1A000000000000000000000000000000000007F
69129+:10D1B000000000000000000000000000000000006F
69130+:10D1C000000000000000000000000000000000005F
69131+:10D1D000000000000000000000000000000000004F
69132+:10D1E000000000000000000000000000000000003F
69133+:10D1F000000000000000000000000000000000002F
69134+:10D20000000000000000000000000000000000001E
69135+:10D21000000000000000000000000000000000000E
69136+:10D2200000000000000000000000000000000000FE
69137+:10D2300000000000000000000000000000000000EE
69138+:10D2400000000000000000000000000000000000DE
69139+:10D2500000000000000000000000000000000000CE
69140+:10D2600000000000000000000000000000000000BE
69141+:10D2700000000000000000000000000000000000AE
69142+:10D28000000000000000000000000000000000009E
69143+:10D29000000000000000000000000000000000008E
69144+:10D2A000000000000000000000000000000000007E
69145+:10D2B000000000000000000000000000000000006E
69146+:10D2C000000000000000000000000000000000005E
69147+:10D2D000000000000000000000000000000000004E
69148+:10D2E000000000000000000000000000000000003E
69149+:10D2F000000000000000000000000000000000002E
69150+:10D30000000000000000000000000000000000001D
69151+:10D31000000000000000000000000000000000000D
69152+:10D3200000000000000000000000000000000000FD
69153+:10D3300000000000000000000000000000000000ED
69154+:10D3400000000000000000000000000000000000DD
69155+:10D3500000000000000000000000000000000000CD
69156+:10D3600000000000000000000000000000000000BD
69157+:10D3700000000000000000000000000000000000AD
69158+:10D38000000000000000000000000000000000009D
69159+:10D39000000000000000000000000000000000008D
69160+:10D3A000000000000000000000000000000000007D
69161+:10D3B000000000000000000000000000000000006D
69162+:10D3C000000000000000000000000000000000005D
69163+:10D3D000000000000000000000000000000000004D
69164+:10D3E000000000000000000000000000000000003D
69165+:10D3F000000000000000000000000000000000002D
69166+:10D40000000000000000000000000000000000001C
69167+:10D41000000000000000000000000000000000000C
69168+:10D4200000000000000000000000000000000000FC
69169+:10D4300000000000000000000000000000000000EC
69170+:10D4400000000000000000000000000000000000DC
69171+:10D4500000000000000000000000000000000000CC
69172+:10D4600000000000000000000000000000000000BC
69173+:10D4700000000000000000000000000000000000AC
69174+:10D48000000000000000000000000000000000009C
69175+:10D49000000000000000000000000000000000008C
69176+:10D4A000000000000000000000000000000000007C
69177+:10D4B000000000000000000000000000000000006C
69178+:10D4C000000000000000000000000000000000005C
69179+:10D4D000000000000000000000000000000000004C
69180+:10D4E000000000000000000000000000000000003C
69181+:10D4F000000000000000000000000000000000002C
69182+:10D50000000000000000000000000000000000001B
69183+:10D51000000000000000000000000000000000000B
69184+:10D5200000000000000000000000000000000000FB
69185+:10D5300000000000000000000000000000000000EB
69186+:10D5400000000000000000000000000000000000DB
69187+:10D5500000000000000000000000000000000000CB
69188+:10D5600000000000000000000000000000000000BB
69189+:10D5700000000000000000000000000000000000AB
69190+:10D58000000000000000000000000000000000009B
69191+:10D59000000000000000000000000000000000008B
69192+:10D5A000000000000000000000000000000000007B
69193+:10D5B000000000000000000000000000000000006B
69194+:10D5C000000000000000000000000000000000005B
69195+:10D5D000000000000000000000000000000000004B
69196+:10D5E000000000000000000000000000000000003B
69197+:10D5F000000000000000000000000000000000002B
69198+:10D60000000000000000000000000000000000001A
69199+:10D61000000000000000000000000000000000000A
69200+:10D6200000000000000000000000000000000000FA
69201+:10D6300000000000000000000000000000000000EA
69202+:10D6400000000000000000000000000000000000DA
69203+:10D6500000000000000000000000000000000000CA
69204+:10D6600000000000000000000000000000000000BA
69205+:10D6700000000000000000000000000000000000AA
69206+:10D68000000000000000000000000000000000009A
69207+:10D69000000000000000000000000000000000008A
69208+:10D6A000000000000000000000000000000000007A
69209+:10D6B000000000000000000000000000000000006A
69210+:10D6C000000000000000000000000000000000005A
69211+:10D6D000000000000000000000000000000000004A
69212+:10D6E000000000000000000000000000000000003A
69213+:10D6F000000000000000000000000000000000002A
69214+:10D700000000000000000000000000000000000019
69215+:10D710000000000000000000000000000000000009
69216+:10D7200000000000000000000000000000000000F9
69217+:10D7300000000000000000000000000000000000E9
69218+:10D7400000000000000000000000000000000000D9
69219+:10D7500000000000000000000000000000000000C9
69220+:10D7600000000000000000000000000000000000B9
69221+:10D7700000000000000000000000000000000000A9
69222+:10D780000000000000000000000000000000000099
69223+:10D790000000000000000000000000000000000089
69224+:10D7A0000000000000000000000000000000000079
69225+:10D7B0000000000000000000000000000000000069
69226+:10D7C0000000000000000000000000000000000059
69227+:10D7D0000000000000000000000000000000000049
69228+:10D7E0000000000000000000000000000000000039
69229+:10D7F0000000000000000000000000000000000029
69230+:10D800000000000000000000000000000000000018
69231+:10D810000000000000000000000000000000000008
69232+:10D8200000000000000000000000000000000000F8
69233+:10D8300000000000000000000000000000000000E8
69234+:10D8400000000000000000000000000000000000D8
69235+:10D8500000000000000000000000000000000000C8
69236+:10D8600000000000000000000000000000000000B8
69237+:10D8700000000000000000000000000000000000A8
69238+:10D880000000000000000000000000000000000098
69239+:10D890000000000000000000000000000000000088
69240+:10D8A0000000000000000000000000000000000078
69241+:10D8B0000000000000000000000000000000000068
69242+:10D8C0000000000000000000000000000000000058
69243+:10D8D0000000000000000000000000000000000048
69244+:10D8E0000000000000000000000000000000000038
69245+:10D8F0000000000000000000000000000000000028
69246+:10D900000000000000000000000000000000000017
69247+:10D910000000000000000000000000000000000007
69248+:10D9200000000000000000000000000000000000F7
69249+:10D9300000000000000000000000000000000000E7
69250+:10D9400000000000000000000000000000000000D7
69251+:10D9500000000000000000000000000000000000C7
69252+:10D9600000000000000000000000000000000000B7
69253+:10D9700000000000000000000000000000000000A7
69254+:10D980000000000000000000000000000000000097
69255+:10D990000000000000000000000000000000000087
69256+:10D9A0000000000000000000000000000000000077
69257+:10D9B0000000000000000000000000000000000067
69258+:10D9C0000000000000000000000000000000000057
69259+:10D9D0000000000000000000000000000000000047
69260+:10D9E0000000000000000000000000000000000037
69261+:10D9F0000000000000000000000000000000000027
69262+:10DA00000000000000000000000000000000000016
69263+:10DA10000000000000000000000000000000000006
69264+:10DA200000000000000000000000000000000000F6
69265+:10DA300000000000000000000000000000000000E6
69266+:10DA400000000000000000000000000000000000D6
69267+:10DA500000000000000000000000000000000000C6
69268+:10DA600000000000000000000000000000000000B6
69269+:10DA700000000000000000000000000000000000A6
69270+:10DA80000000000000000000000000000000000096
69271+:10DA90000000000000000000000000000000000086
69272+:10DAA0000000000000000000000000000000000076
69273+:10DAB0000000000000000000000000000000000066
69274+:10DAC0000000000000000000000000000000000056
69275+:10DAD0000000000000000000000000000000000046
69276+:10DAE0000000000000000000000000000000000036
69277+:10DAF0000000000000000000000000000000000026
69278+:10DB00000000000000000000000000000000000015
69279+:10DB10000000000000000000000000000000000005
69280+:10DB200000000000000000000000000000000000F5
69281+:10DB300000000000000000000000000000000000E5
69282+:10DB400000000000000000000000000000000000D5
69283+:10DB500000000000000000000000000000000000C5
69284+:10DB600000000000000000000000000000000000B5
69285+:10DB700000000000000000000000000000000000A5
69286+:10DB80000000000000000000000000000000000095
69287+:10DB90000000000000000000000000000000000085
69288+:10DBA0000000000000000000000000000000000075
69289+:10DBB0000000000000000000000000000000000065
69290+:10DBC0000000000000000000000000000000000055
69291+:10DBD0000000000000000000000000000000000045
69292+:10DBE0000000000000000000000000000000000035
69293+:10DBF0000000000000000000000000000000000025
69294+:10DC00000000000000000000000000000000000014
69295+:10DC10000000000000000000000000000000000004
69296+:10DC200000000000000000000000000000000000F4
69297+:10DC300000000000000000000000000000000000E4
69298+:10DC400000000000000000000000000000000000D4
69299+:10DC500000000000000000000000000000000000C4
69300+:10DC600000000000000000000000000000000000B4
69301+:10DC700000000000000000000000000000000000A4
69302+:10DC80000000000000000000000000000000000094
69303+:10DC90000000000000000000000000000000000084
69304+:10DCA0000000000000000000000000000000000074
69305+:10DCB0000000000000000000000000000000000064
69306+:10DCC0000000000000000000000000000000000054
69307+:10DCD0000000000000000000000000000000000044
69308+:10DCE0000000000000000000000000000000000034
69309+:10DCF0000000000000000000000000000000000024
69310+:10DD00000000000000000000000000000000000013
69311+:10DD10000000000000000000000000000000000003
69312+:10DD200000000000000000000000000000000000F3
69313+:10DD300000000000000000000000000000000000E3
69314+:10DD400000000000000000000000000000000000D3
69315+:10DD500000000000000000000000000000000000C3
69316+:10DD600000000000000000000000000000000000B3
69317+:10DD700000000000000000000000000000000000A3
69318+:10DD80000000000000000000000000000000000093
69319+:10DD90000000000000000000000000000000000083
69320+:10DDA0000000000000000000000000000000000073
69321+:10DDB0000000000000000000000000000000000063
69322+:10DDC0000000000000000000000000000000000053
69323+:10DDD0000000000000000000000000000000000043
69324+:10DDE0000000000000000000000000000000000033
69325+:10DDF0000000000000000000000000000000000023
69326+:10DE00000000000000000000000000000000000012
69327+:10DE10000000000000000000000000000000000002
69328+:10DE200000000000000000000000000000000000F2
69329+:10DE300000000000000000000000000000000000E2
69330+:10DE400000000000000000000000000000000000D2
69331+:10DE500000000000000000000000000000000000C2
69332+:10DE600000000000000000000000000000000000B2
69333+:10DE700000000000000000000000000000000000A2
69334+:10DE80000000000000000000000000000000000092
69335+:10DE90000000000000000000000000000000000082
69336+:10DEA0000000000000000000000000000000000072
69337+:10DEB0000000000000000000000000000000000062
69338+:10DEC0000000000000000000000000000000000052
69339+:10DED0000000000000000000000000000000000042
69340+:10DEE0000000000000000000000000000000000032
69341+:10DEF0000000000000000000000000000000000022
69342+:10DF00000000000000000000000000000000000011
69343+:10DF10000000000000000000000000000000000001
69344+:10DF200000000000000000000000000000000000F1
69345+:10DF300000000000000000000000000000000000E1
69346+:10DF400000000000000000000000000000000000D1
69347+:10DF500000000000000000000000000000000000C1
69348+:10DF600000000000000000000000000000000000B1
69349+:10DF700000000000000000000000000000000000A1
69350+:10DF80000000000000000000000000000000000091
69351+:10DF90000000000000000000000000000000000081
69352+:10DFA0000000000000000000000000000000000071
69353+:10DFB0000000000000000000000000000000000061
69354+:10DFC0000000000000000000000000000000000051
69355+:10DFD0000000000000000000000000000000000041
69356+:10DFE0000000000000000000000000000000000031
69357+:10DFF0000000000000000000000000000000000021
69358+:10E000000000000000000000000000000000000010
69359+:10E010000000000000000000000000000000000000
69360+:10E0200000000000000000000000000000000000F0
69361+:10E0300000000000000000000000000000000000E0
69362+:10E0400000000000000000000000000000000000D0
69363+:10E0500000000000000000000000000000000000C0
69364+:10E0600000000000000000000000000000000000B0
69365+:10E0700000000000000000000000000000000000A0
69366+:10E080000000000000000000000000000000000090
69367+:10E090000000000000000000000000000000000080
69368+:10E0A0000000000000000000000000000000000070
69369+:10E0B0000000000000000000000000000000000060
69370+:10E0C0000000000000000000000000000000000050
69371+:10E0D0000000000000000000000000000000000040
69372+:10E0E0000000000000000000000000000000000030
69373+:10E0F0000000000000000000000000000000000020
69374+:10E10000000000000000000000000000000000000F
69375+:10E1100000000000000000000000000000000000FF
69376+:10E1200000000000000000000000000000000000EF
69377+:10E1300000000000000000000000000000000000DF
69378+:10E1400000000000000000000000000000000000CF
69379+:10E1500000000000000000000000000000000000BF
69380+:10E1600000000000000000000000000000000000AF
69381+:10E17000000000000000000000000000000000009F
69382+:10E18000000000000000000000000000000000008F
69383+:10E19000000000000000000000000000000000007F
69384+:10E1A000000000000000000000000000000000006F
69385+:10E1B000000000000000000000000000000000005F
69386+:10E1C000000000000000000000000000000000004F
69387+:10E1D000000000000000000000000000000000003F
69388+:10E1E000000000000000000000000000000000002F
69389+:10E1F000000000000000000000000000000000809F
69390+:10E20000000000000000000000000000000000000E
69391+:10E2100000000000000000000000000000000000FE
69392+:10E220000000000A000000000000000000000000E4
69393+:10E2300010000003000000000000000D0000000DB1
69394+:10E240003C020801244295C03C030801246397FC6A
69395+:10E25000AC4000000043202B1480FFFD244200044A
69396+:10E260003C1D080037BD9FFC03A0F0213C100800B6
69397+:10E27000261032103C1C0801279C95C00E0012BECF
69398+:10E28000000000000000000D3C02800030A5FFFFF0
69399+:10E2900030C600FF344301803C0880008D0901B87E
69400+:10E2A0000520FFFE00000000AC6400002404000212
69401+:10E2B000A4650008A066000AA064000BAC67001803
69402+:10E2C0003C03100003E00008AD0301B83C0560000A
69403+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
69404+:10E2E0003C0310003C040200ACA44FC403E000084F
69405+:10E2F000ACA34FF89486000C00A050212488001491
69406+:10E3000000062B0200051080004448210109182B4B
69407+:10E310001060001100000000910300002C6400094F
69408+:10E320005080000991190001000360803C0D080134
69409+:10E3300025AD9258018D58218D67000000E000083E
69410+:10E340000000000091190001011940210109302B42
69411+:10E3500054C0FFF29103000003E000080000102108
69412+:10E360000A000CCC25080001910F0001240E000AC0
69413+:10E3700015EE00400128C8232F38000A1700003D81
69414+:10E38000250D00028D580000250F0006370E0100F4
69415+:10E39000AD4E0000910C000291AB000191A400026F
69416+:10E3A00091A60003000C2E00000B3C0000A71025D6
69417+:10E3B00000041A000043C8250326C025AD580004F8
69418+:10E3C000910E000691ED000191E7000291E5000336
69419+:10E3D000000E5E00000D6400016C30250007220075
69420+:10E3E00000C41025004518252508000A0A000CCC99
69421+:10E3F000AD430008910F000125040002240800022B
69422+:10E4000055E80001012020210A000CCC00804021A9
69423+:10E41000910C0001240B0003158B00160000000076
69424+:10E420008D580000910E000225080003370D0008EA
69425+:10E43000A14E00100A000CCCAD4D00009119000156
69426+:10E44000240F0004172F000B0000000091070002AA
69427+:10E45000910400038D43000000072A0000A410254A
69428+:10E460003466000425080004AD42000C0A000CCC00
69429+:10E47000AD46000003E000082402000127BDFFE8CC
69430+:10E48000AFBF0014AFB000100E00164E0080802108
69431+:10E490003C0480083485008090A600052403FFFE1C
69432+:10E4A0000200202100C310248FBF00148FB0001081
69433+:10E4B000A0A200050A00165827BD001827BDFFE8D6
69434+:10E4C000AFB00010AFBF00140E000FD40080802149
69435+:10E4D0003C06800834C5008090A40000240200504F
69436+:10E4E000308300FF106200073C09800002002021F9
69437+:10E4F0008FBF00148FB00010AD2001800A00108F74
69438+:10E5000027BD0018240801003C07800002002021DC
69439+:10E510008FBF00148FB00010ACE801800A00108F8C
69440+:10E5200027BD001827BDFF783C058008AFBE0080DE
69441+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
69442+:10E54000AFB60078AFB50074AFB40070AFB200687A
69443+:10E55000AFB0006034A600803C0580008CB201287A
69444+:10E5600090C400098CA701043C020001309100FF17
69445+:10E5700000E218240000B8210000F021106000071C
69446+:10E58000000098213C0908008D2931F02413000176
69447+:10E59000252800013C010800AC2831F0ACA0008423
69448+:10E5A00090CC0005000C5827316A0001154000721C
69449+:10E5B000AFA0005090CD00002406002031A400FF41
69450+:10E5C00010860018240E0050108E009300000000EA
69451+:10E5D0003C1008008E1000DC260F00013C010800F2
69452+:10E5E000AC2F00DC0E0016C7000000000040182110
69453+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
69454+:10E600008FB500748FB400708FB3006C8FB2006848
69455+:10E610008FB100648FB000600060102103E000083B
69456+:10E6200027BD00880000000D3C1F8000AFA0003017
69457+:10E6300097E501168FE201043C04002030B9FFFF8A
69458+:10E64000004438240007182B00033140AFA60030E7
69459+:10E650008FF5010437F80C003C1600400338802188
69460+:10E6600002B6A02434C40040128000479215000D69
69461+:10E6700032A800201500000234860080008030217E
69462+:10E6800014C0009FAFA600303C0D800835A6008066
69463+:10E6900090CC0008318B0040516000063C06800899
69464+:10E6A000240E0004122E00A8240F0012122F003294
69465+:10E6B0003C06800834C401003C0280009447011AE3
69466+:10E6C0009619000E909F00088E18000830E3FFFF97
69467+:10E6D00003F9B00432B40004AFB6005CAFA3005835
69468+:10E6E0008E1600041280002EAFB8005434C3008090
69469+:10E6F000906800083105004014A0002500000000CB
69470+:10E700008C70005002D090230640000500000000ED
69471+:10E710008C71003402D1A82306A201678EE20008A2
69472+:10E72000126000063C1280003C1508008EB531F4E2
69473+:10E7300026B600013C010800AC3631F4AE4000447E
69474+:10E74000240300018FBF00848FBE00808FB7007C40
69475+:10E750008FB600788FB500748FB400708FB3006CE3
69476+:10E760008FB200688FB100648FB00060006010212C
69477+:10E7700003E0000827BD00880E000D2800002021BE
69478+:10E780000A000D75004018210A000D9500C02021D7
69479+:10E790000E00171702C020211440FFE10000000006
69480+:10E7A0003C0B8008356400808C8A003402CA482300
69481+:10E7B0000520001D000000003C1E08008FDE310017
69482+:10E7C00027D700013C010800AC3731001260000679
69483+:10E7D000024020213C1408008E9431F42690000160
69484+:10E7E0003C010800AC3031F40E00164E3C1E80088F
69485+:10E7F00037CD008091B700250240202136EE00047D
69486+:10E800000E001658A1AE00250E000CAC02402021CF
69487+:10E810000A000DCA240300013C17080126F796C020
69488+:10E820000A000D843C1F80008C86003002C66023E5
69489+:10E830001980000C2419000C908F004F3C14080024
69490+:10E840008E94310032B500FC35ED0001268E0001BA
69491+:10E850003C010800AC2E3100A08D004FAFA0005845
69492+:10E860002419000CAFB900308C9800300316A02397
69493+:10E870001A80010B8FA300580074F82A17E0FFD309
69494+:10E88000000000001074002A8FA5005802D4B021A7
69495+:10E8900000B410233044FFFFAFA4005832A8000298
69496+:10E8A0001100002E32AB00103C15800836B00080FD
69497+:10E8B0009216000832D30040526000FB8EE200083E
69498+:10E8C0000E00164E02402021240A0018A20A000958
69499+:10E8D000921100052409FFFE024020210229902404
69500+:10E8E0000E001658A2120005240400390000282149
69501+:10E8F0000E0016F2240600180A000DCA24030001B7
69502+:10E9000092FE000C3C0A800835490080001EBB00C6
69503+:10E910008D27003836F10081024020213225F08118
69504+:10E920000E000C9B30C600FF0A000DC10000000065
69505+:10E930003AA7000130E300011460FFA402D4B02123
69506+:10E940000A000E1D00000000024020210E001734B6
69507+:10E95000020028210A000D75004018211160FF7087
69508+:10E960003C0F80083C0D800835EE00808DC40038D7
69509+:10E970008FA300548DA60004006660231D80FF68ED
69510+:10E98000000000000064C02307020001AFA400548F
69511+:10E990003C1F08008FFF31E433F9000113200015FC
69512+:10E9A0008FAC00583C07800094E3011A10600012FD
69513+:10E9B0003C0680080E00216A024020213C03080129
69514+:10E9C000906396F13064000214800145000000005D
69515+:10E9D000306C0004118000078FAC0058306600FBDB
69516+:10E9E0003C010801A02696F132B500FCAFA000580A
69517+:10E9F0008FAC00583C06800834D30080AFB40018B8
69518+:10EA0000AFB60010AFAC00143C088000950B01209D
69519+:10EA10008E6F0030966A005C8FA3005C8FBF003061
69520+:10EA20003169FFFF3144FFFF8FAE005401341021E4
69521+:10EA3000350540000064382B0045C82103E7C02598
69522+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
69523+:10EA5000AFA0002CAFAE0034926D000831B40008B6
69524+:10EA6000168000BB020020218EE200040040F8095D
69525+:10EA700027A400108FAF003031F300025660000170
69526+:10EA800032B500FE3C048008349F008093F90008F2
69527+:10EA900033380040530000138FA400248C850004F9
69528+:10EAA0008FA7005410A700D52404001432B0000131
69529+:10EAB0001200000C8FA400242414000C1234011A3C
69530+:10EAC0002A2D000D11A001022413000E240E000AAD
69531+:10EAD000522E0001241E00088FAF002425E40001FF
69532+:10EAE000AFA400248FAA00143C0B80083565008079
69533+:10EAF000008A48218CB10030ACA9003090A4004EAF
69534+:10EB00008CA700303408FFFF0088180400E3F821C8
69535+:10EB1000ACBF00348FA600308FB900548FB8005CB2
69536+:10EB200030C200081040000B033898218CAC002044
69537+:10EB3000119300D330C600FF92EE000C8FA7003473
69538+:10EB400002402021000E6B0035B400800E000C9BAB
69539+:10EB50003285F0803C028008345000808E0F0030F7
69540+:10EB600001F1302318C00097264800803C070800B8
69541+:10EB70008CE731E42404FF80010418243118007F5D
69542+:10EB80003C1F80003C19800430F10001AFE300908D
69543+:10EB900012200006031928213C030801906396F116
69544+:10EBA00030690008152000C6306A00F73C10800864
69545+:10EBB00036040080908C004F318B000115600042BC
69546+:10EBC000000000003C0608008CC6319830CE0010D2
69547+:10EBD00051C0004230F9000190AF006B55E0003F9A
69548+:10EBE00030F9000124180001A0B8006B3C1180002E
69549+:10EBF0009622007A24470064A48700123C0D800806
69550+:10EC000035A5008090B40008329000401600000442
69551+:10EC10003C03800832AE000115C0008B00000000EC
69552+:10EC2000346400808C86002010D3000A3463010015
69553+:10EC30008C67000002C7782319E000978FBF00544B
69554+:10EC4000AC93002024130001AC760000AFB3005059
69555+:10EC5000AC7F000417C0004E000000008FA90050D8
69556+:10EC60001520000B000000003C030801906396F1A2
69557+:10EC7000306A00011140002E8FAB0058306400FE56
69558+:10EC80003C010801A02496F10A000D75000018212E
69559+:10EC90000E000CAC024020210A000F1300000000FF
69560+:10ECA0000A000E200000A0210040F80924040017EB
69561+:10ECB0000A000DCA240300010040F80924040016CC
69562+:10ECC0000A000DCA240300019094004F240DFFFE9A
69563+:10ECD000028D2824A085004F30F900011320000682
69564+:10ECE0003C0480083C030801906396F1307F0010DB
69565+:10ECF00017E00051306800EF34900080240A0001D2
69566+:10ED0000024020210E00164EA60A00129203002592
69567+:10ED100024090001AFA90050346200010240202103
69568+:10ED20000E001658A20200250A000EF93C0D8008BC
69569+:10ED30001160FE83000018218FA5003030AC000464
69570+:10ED40001180FE2C8FBF00840A000DCB240300012C
69571+:10ED500027A500380E000CB6AFA000385440FF4382
69572+:10ED60008EE200048FB40038329001005200FF3F61
69573+:10ED70008EE200048FA3003C8E6E0058006E682364
69574+:10ED800005A3FF39AE6300580A000E948EE200041A
69575+:10ED90000E00164E024020213C038008346800809B
69576+:10EDA000024020210E001658A11E000903C0302188
69577+:10EDB000240400370E0016F2000028210A000F116B
69578+:10EDC0008FA900508FAB00185960FF8D3C0D800853
69579+:10EDD0000E00164E02402021920C00252405000151
69580+:10EDE000AFA5005035820004024020210E001658C5
69581+:10EDF000A20200250A000EF93C0D800812240059D9
69582+:10EE00002A2300151060004D240900162408000C68
69583+:10EE10005628FF2732B000013C0A8008914C001BA5
69584+:10EE20002406FFBD241E000E01865824A14B001BA2
69585+:10EE30000A000EA532B000013C010801A02896F19D
69586+:10EE40000A000EF93C0D80088CB500308EFE0008DB
69587+:10EE50002404001826B6000103C0F809ACB600303F
69588+:10EE60003C030801906396F13077000116E0FF81C2
69589+:10EE7000306A00018FB200300A000D753243000481
69590+:10EE80003C1080009605011A50A0FF2B34C60010DC
69591+:10EE90000A000EC892EE000C8C6200001456FF6D42
69592+:10EEA000000000008C7800048FB9005403388823D8
69593+:10EEB0000621FF638FBF00540A000F0E0000000000
69594+:10EEC0003C010801A02A96F10A000F3030F9000138
69595+:10EED0001633FF028FAF00240A000EB0241E00106C
69596+:10EEE0000E00164E024020213C0B80083568008041
69597+:10EEF00091090025240A0001AFAA0050353300040F
69598+:10EF0000024020210E001658A11300253C050801DF
69599+:10EF100090A596F130A200FD3C010801A02296F1D7
69600+:10EF20000A000E6D004018212411000E53D1FEEA94
69601+:10EF3000241E00100A000EAF241E00165629FEDC07
69602+:10EF400032B000013C0A8008914C001B2406FFBD32
69603+:10EF5000241E001001865824A14B001B0A000EA598
69604+:10EF600032B000010A000EA4241E00123C038000EF
69605+:10EF70008C6201B80440FFFE24040800AC6401B8B0
69606+:10EF800003E000080000000030A5FFFF30C6FFFFCF
69607+:10EF90003C0780008CE201B80440FFFE34EA0180A7
69608+:10EFA000AD440000ACE400203C0480089483004899
69609+:10EFB0003068FFFF11000016AF88000824AB001274
69610+:10EFC000010B482B512000133C04800034EF01005A
69611+:10EFD00095EE00208F890000240D001A31CCFFFF30
69612+:10EFE00031274000A14D000B10E000362583FFFEC5
69613+:10EFF0000103C02B170000348F9900048F88000490
69614+:10F00000A5430014350700010A001003AF87000470
69615+:10F010003C04800024030003348201808F890000B7
69616+:10F020008F870004A043000B3C088000350C018052
69617+:10F03000A585000EA585001A8F85000C30EB800099
69618+:10F04000A5890010AD850028A58600081160000F75
69619+:10F050008F85001435190100972A00163158FFFCDE
69620+:10F06000270F000401E870218DCD400031A6FFFF7D
69621+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
69622+:10F0800000E83824AF8700048F8500142403BFFFF5
69623+:10F090003C04800000E3582434830180A46B0026E4
69624+:10F0A000AC69002C10A0000300054C02A465001000
69625+:10F0B000A46900263C071000AC8701B803E00008F3
69626+:10F0C000000000008F990004240AFFFE032A382460
69627+:10F0D0000A001003AF87000427BDFFE88FA20028B5
69628+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
69629+:10F0F000AF820014AF8000040E000FDBAF80000071
69630+:10F100008FBF001027BD001803E00008AF80001477
69631+:10F110003C06800034C4007034C701008C8A0000B3
69632+:10F1200090E500128F84000027BDFFF030A300FFA0
69633+:10F13000000318823082400010400037246500032D
69634+:10F140000005C8800326C0218F0E4000246F0004F4
69635+:10F15000000F6880AFAE000001A660218D8B4000DB
69636+:10F16000AFAB000494E900163128FFFC01063821FA
69637+:10F170008CE64000AFA600088FA9000800003021EF
69638+:10F18000000028213C07080024E701000A0010675E
69639+:10F19000240800089059000024A500012CAC000CA4
69640+:10F1A0000079C0210018788001E770218DCD000022
69641+:10F1B0001180000600CD302603A5102114A8FFF50C
69642+:10F1C00000051A005520FFF4905900003C0480000F
69643+:10F1D000348700703C0508008CA531048CE30000E6
69644+:10F1E0002CA2002010400009006A38230005488046
69645+:10F1F0003C0B0800256B3108012B402124AA00019B
69646+:10F20000AD0700003C010800AC2A310400C0102109
69647+:10F2100003E0000827BD0010308220001040000BE2
69648+:10F2200000055880016648218D24400024680004B0
69649+:10F2300000083880AFA4000000E618218C6540006B
69650+:10F24000AFA000080A001057AFA500040000000D91
69651+:10F250000A0010588FA9000827BDFFE03C07800076
69652+:10F2600034E60100AFBF001CAFB20018AFB100140C
69653+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
69654+:10F280002483000430E2400010400010AF830028C7
69655+:10F290003C09002000E940241100000D30EC800002
69656+:10F2A0008F8A0004240BBFFF00EB38243543100085
69657+:10F2B000AF87000030F220001640000B3C1900041C
69658+:10F2C000241FFFBF0A0010B7007F102430EC80001D
69659+:10F2D000158000423C0E002030F220001240FFF862
69660+:10F2E0008F8300043C19000400F9C0241300FFF5CB
69661+:10F2F000241FFFBF34620040AF82000430E20100EF
69662+:10F300001040001130F010008F83002C10600006B8
69663+:10F310003C0F80003C05002000E52024148000C044
69664+:10F320003C0800043C0F800035EE010095CD001E26
69665+:10F3300095CC001C31AAFFFF000C5C00014B482556
69666+:10F34000AF89000C30F010001200000824110001F9
69667+:10F3500030F100201620008B3C18100000F890249B
69668+:10F36000164000823C040C002411000130E801002A
69669+:10F370001500000B3C0900018F85000430A94000F6
69670+:10F38000152000073C0900013C0C1F0100EC58242B
69671+:10F390003C0A1000116A01183C1080003C09000171
69672+:10F3A00000E9302410C000173C0B10003C18080086
69673+:10F3B0008F1800243307000214E0014024030001E9
69674+:10F3C0008FBF001C8FB200188FB100148FB00010D7
69675+:10F3D0000060102103E0000827BD002000EE682433
69676+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
69677+:10F3F00036307FFF00F0382435E380000A0010A685
69678+:10F40000AF87000000EB102450400065AF8000245F
69679+:10F410008F8C002C3C0D0F0000ED18241580008807
69680+:10F42000AF83001030E8010011000086938F0010B8
69681+:10F430003C0A0200106A00833C1280003650010032
69682+:10F44000920500139789002A3626000230AF00FF8C
69683+:10F4500025EE0004000E19C03C0480008C9801B811
69684+:10F460000700FFFE34880180AD0300003C198008CE
69685+:10F47000AC830020973100483225FFFF10A0015CCB
69686+:10F48000AF8500082523001200A3F82B53E0015993
69687+:10F490008F850004348D010095AC00202402001AF1
69688+:10F4A00030E44000318BFFFFA102000B108001927D
69689+:10F4B0002563FFFE00A3502B154001908F8F0004A1
69690+:10F4C000A50300148F88000435050001AF850004F2
69691+:10F4D0003C08800035190180A729000EA729001AD1
69692+:10F4E0008F89000C30B18000A7270010AF290028B9
69693+:10F4F000A72600081220000E3C04800035020100FF
69694+:10F50000944C0016318BFFFC256400040088182100
69695+:10F510008C7F400033E6FFFF14C000053C048000F0
69696+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
69697+:10F53000240EBFFF00AE402434850180A4A800261D
69698+:10F54000ACA7002C3C071000AC8701B800001821C4
69699+:10F550008FBF001C8FB200188FB100148FB0001045
69700+:10F560000060102103E0000827BD00203C020BFFD3
69701+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
69702+:10F58000241100013C0608008CC6002C24C5000193
69703+:10F590003C010800AC25002C0A0010D42411000501
69704+:10F5A0008F85002410A0002FAF80001090A30000D2
69705+:10F5B000146000792419000310A0002A30E601002D
69706+:10F5C00010C000CC8F860010241F000210DF00C97D
69707+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
69708+:10F5E00014E0000201641824000018213C0D0800FA
69709+:10F5F00025AD0038006D1021904C00048F85002847
69710+:10F6000025830004000321C030A5FFFF3626000239
69711+:10F610000E000FDB000000000A00114D0000182151
69712+:10F6200000E8302414C0FF403C0F80000E00103D65
69713+:10F63000000000008F8700000A0010CAAF82000C93
69714+:10F64000938F00103C18080127189640000F90C0B7
69715+:10F6500002588021AF9000248F85002414A0FFD38E
69716+:10F66000AF8F00103C0480008C86400030C5010044
69717+:10F6700010A000BC322300043C0C08008D8C002438
69718+:10F6800024120004106000C23190000D3C04800080
69719+:10F690008C8D40003402FFFF11A201003231FFFBCC
69720+:10F6A0008C884000310A01005540000124110010EF
69721+:10F6B00030EE080011C000BE2419FFFB8F9800280F
69722+:10F6C0002F0F03EF51E000010219802430E90100FF
69723+:10F6D00011200014320800018F87002C14E000FB79
69724+:10F6E0008F8C000C3C05800034AB0100917F00132F
69725+:10F6F00033E300FF246A00042403FFFE0203802496
69726+:10F70000000A21C012000002023230253226FFFF1B
69727+:10F710000E000FDB9785002A1200FF290000182138
69728+:10F72000320800011100000D32180004240E0001FF
69729+:10F73000120E0002023230253226FFFF9785002A82
69730+:10F740000E000FDB00002021240FFFFE020F80249B
69731+:10F750001200FF1B00001821321800045300FF188C
69732+:10F760002403000102323025241200045612000145
69733+:10F770003226FFFF9785002A0E000FDB24040100CC
69734+:10F780002419FFFB021988241220FF0D0000182104
69735+:10F790000A0010E9240300011079009C00003021C8
69736+:10F7A00090AD00012402000211A200BE30EA004028
69737+:10F7B00090B90001241800011338007F30E900409F
69738+:10F7C0008CA600049785002A00C020210E000FDBC4
69739+:10F7D0003626000200004021010018218FBF001CC6
69740+:10F7E0008FB200188FB100148FB00010006010218C
69741+:10F7F00003E0000827BD0020360F010095EE000C45
69742+:10F8000031CD020015A0FEE63C0900013C1880083D
69743+:10F81000971200489789002A362600023248FFFFD7
69744+:10F82000AF8800083C0380008C7101B80620FFFE01
69745+:10F83000346A0180AD4000001100008E3C0F800052
69746+:10F84000253F0012011FC82B1320008B240E00033C
69747+:10F85000346C0100958B00202402001A30E4400033
69748+:10F860003163FFFFA142000B108000A72463FFFE5D
69749+:10F870000103682B15A000A52408FFFE34A5000194
69750+:10F88000A5430014AF8500043C0480002412BFFF90
69751+:10F8900000B2802434850180A4A9000EA4A9001A16
69752+:10F8A000A4A60008A4B00026A4A700103C071000DE
69753+:10F8B000AC8701B80A00114D000018213C038000FC
69754+:10F8C00034640100949F000E3C1908008F3900D861
69755+:10F8D0002404008033E5FFFF273100013C010800CC
69756+:10F8E000AC3100D80E000FDB240600030A00114DD6
69757+:10F8F00000001821240A000210CA00598F85002830
69758+:10F900003C0308008C6300D0240E0001106E005EE2
69759+:10F910002CCF000C24D2FFFC2E5000041600002136
69760+:10F9200000002021241800021078001B2CD9000CA4
69761+:10F9300024DFFFF82FE900041520FF330000202109
69762+:10F9400030EB020051600004000621C054C00022C8
69763+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
69764+:10F96000362600023C0908008D29002431300001B0
69765+:10F970005200FEF7000018219785002A3626000263
69766+:10F980000E000FDB000020210A00114D000018219D
69767+:10F990000A00119C241200021320FFE624DFFFF866
69768+:10F9A0000000202130A5FFFF0A00117D362600024D
69769+:10F9B0000A0011AC021980245120FF828CA6000499
69770+:10F9C0003C05080190A5964110A0FF7E2408000187
69771+:10F9D0000A0011F0010018210E000FDB3226000191
69772+:10F9E0008F8600108F8500280A00124F000621C064
69773+:10F9F0008F8500043C18800024120003371001801A
69774+:10FA0000A212000B0A00112E3C08800090A30001F6
69775+:10FA1000241100011071FF70240800012409000264
69776+:10FA20005069000430E60040240800010A0011F08B
69777+:10FA30000100182150C0FFFD240800013C0C80008B
69778+:10FA4000358B01009563001094A40002307FFFFF06
69779+:10FA5000509FFF62010018210A001284240800014F
69780+:10FA60002CA803EF1100FE56240300010A001239EE
69781+:10FA700000000000240E000335EA0180A14E000BB7
69782+:10FA80000A00121C3C04800011E0FFA2000621C005
69783+:10FA900030A5FFFF0A00117D362600020A0011A5DD
69784+:10FAA000241100201140FFC63C1280003650010096
69785+:10FAB000960F001094AE000231E80FFF15C8FFC08A
69786+:10FAC000000000000A0011E690B900013C060800A1
69787+:10FAD0008CC6003824C4FFFF14C00002018418241F
69788+:10FAE000000018213C0D080025AD0038006D1021E4
69789+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
69790+:10FB00000A00112C01EE28242408FFFE0A00121A14
69791+:10FB100000A8282427BDFFC8AFB00010AFBF003435
69792+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
69793+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
69794+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
69795+:10FB500001CF682435AC380C240B0003AE0C5000E8
69796+:10FB6000ACCB00083C010800AC2000200E001819A6
69797+:10FB7000000000003C0A0010354980513C06601628
69798+:10FB8000AE09537C8CC700003C0860148D0500A0B2
69799+:10FB90003C03FFFF00E320243C02535300051FC237
69800+:10FBA0001482000634C57C000003A08002869821E0
69801+:10FBB0008E7200043C116000025128218CBF007C31
69802+:10FBC0008CA200783C1E600037C420203C05080150
69803+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
69804+:10FBE0002406000A3C190001273996403C01080010
69805+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
69806+:10FC00002418FFF03C15570902F8B02412D502F56C
69807+:10FC100024040001AF80002C3C1480003697018042
69808+:10FC20003C1E080127DE9644369301008E900000AA
69809+:10FC30003205000310A0FFFD3207000110E000882C
69810+:10FC4000320600028E7100283C048000AE91002034
69811+:10FC50008E6500048E66000000A0382100C040219F
69812+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
69813+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
69814+:10FC80009675000E3C1208008E52002030AC4000E9
69815+:10FC900032AFFFFF264E000125ED00043C010800B5
69816+:10FCA000AC2E0020118000E8AF8D00283C18002009
69817+:10FCB00000B8B02412C000E530B980002408BFFFAE
69818+:10FCC00000A8382434C81000AF87000030E62000B8
69819+:10FCD00010C000E92409FFBF3C03000400E328240E
69820+:10FCE00010A00002010910243502004030EA010092
69821+:10FCF00011400010AF8200048F8B002C11600007B0
69822+:10FD00003C0D002000ED6024118000043C0F000435
69823+:10FD100000EF702411C00239000000009668001E38
69824+:10FD20009678001C3115FFFF0018B40002B690252C
69825+:10FD3000AF92000C30F910001320001324150001BD
69826+:10FD400030FF002017E0000A3C04100000E41024FB
69827+:10FD50001040000D3C0A0C003C090BFF00EA18247F
69828+:10FD60003525FFFF00A3302B10C0000830ED010047
69829+:10FD70003C0C08008D8C002C24150005258B0001FF
69830+:10FD80003C010800AC2B002C30ED010015A0000B4D
69831+:10FD90003C0500018F85000430AE400055C00007CF
69832+:10FDA0003C0500013C161F0100F690243C0F10009A
69833+:10FDB000124F01CE000000003C05000100E5302498
69834+:10FDC00010C000AF3C0C10003C1F08008FFF002447
69835+:10FDD00033E90002152000712403000100601021A6
69836+:10FDE000104000083C0680003C08800035180100E7
69837+:10FDF0008F0F00243C056020ACAF00140000000011
69838+:10FE00003C0680003C194000ACD9013800000000DD
69839+:10FE10005220001332060002262B0140262C0080BF
69840+:10FE2000240EFF80016E2024018E6824000D1940ED
69841+:10FE3000318A007F0004A9403172007F3C16200007
69842+:10FE400036C20002006A482502B2382500E2882541
69843+:10FE50000122F825ACDF0830ACD1083032060002B0
69844+:10FE600010C0FF723C188000370501408CA80000CC
69845+:10FE700024100040AF08002090AF000831E300706C
69846+:10FE8000107000D428790041532000082405006038
69847+:10FE9000241100201071000E3C0A40003C09800033
69848+:10FEA000AD2A01780A001304000000001465FFFB6E
69849+:10FEB0003C0A40000E001FFA000000003C0A40000F
69850+:10FEC0003C098000AD2A01780A00130400000000FC
69851+:10FED00090A90009241F00048CA70000312800FF0E
69852+:10FEE000111F01B22503FFFA2C7200061240001404
69853+:10FEF0003C0680008CA9000494A4000A310500FF90
69854+:10FF000000095E022D6A00083086FFFF15400002DE
69855+:10FF10002567000424070003240C000910AC01FA33
69856+:10FF200028AD000A11A001DE2410000A240E0008EA
69857+:10FF300010AE0028000731C000C038213C06800008
69858+:10FF40008CD501B806A0FFFE34D20180AE47000078
69859+:10FF500034CB0140916E0008240300023C0A4000AB
69860+:10FF600031C400FF00046A0001A86025A64C000807
69861+:10FF7000A243000B9562000A3C0810003C09800077
69862+:10FF8000A64200108D670004AE470024ACC801B83B
69863+:10FF9000AD2A01780A001304000000003C0A80002A
69864+:10FFA000354401009483000E3C0208008C4200D8C6
69865+:10FFB000240400803065FFFF245500013C01080047
69866+:10FFC000AC3500D80E000FDB240600030A001370C6
69867+:10FFD000000018210009320230D900FF2418000166
69868+:10FFE0001738FFD5000731C08F910020262200016D
69869+:10FFF000AF8200200A0013C800C0382100CB2024A3
69870+:020000021000EC
69871+:10000000AF85000010800008AF860004240D87FF34
69872+:1000100000CD6024158000083C0E006000AE302446
69873+:1000200010C00005000000000E000D42000000009E
69874+:100030000A001371000000000E0016050000000009
69875+:100040000A0013710000000030B980005320FF1F28
69876+:10005000AF8500003C02002000A2F82453E0FF1B03
69877+:10006000AF8500003C07FFFF34E47FFF00A4382485
69878+:100070000A00132B34C880000A001334010910242D
69879+:1000800000EC58245160005AAF8000248F8D002C62
69880+:100090003C0E0F0000EE182415A00075AF83001071
69881+:1000A00030EF010011E00073939800103C12020041
69882+:1000B000107200703C06800034D9010093280013B0
69883+:1000C0009789002A36A60002311800FF271600047F
69884+:1000D000001619C03C0480008C8501B804A0FFFE06
69885+:1000E00034880180AD0300003C158008AC830020FB
69886+:1000F00096BF004833E5FFFF10A001BCAF850008A4
69887+:100100002523001200A3102B504001B98F85000455
69888+:10011000348D010095AC0020240B001A30E440001F
69889+:10012000318AFFFFA10B000B108001BA2543FFFEAF
69890+:1001300000A3702B15C001B88F9600048F8F0004A8
69891+:10014000A503001435E50001AF8500043C088000DC
69892+:1001500035150180A6A9000EA6A9001A8F89000CEA
69893+:1001600030BF8000A6A70010AEA90028A6A60008F0
69894+:1001700013E0000F3C0F8000350C0100958B00163A
69895+:10018000316AFFFC25440004008818218C6240007D
69896+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
69897+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
69898+:1001B0002416BFFF00B6902435E50180A4B20026C6
69899+:1001C000ACA7002C3C071000ADE701B80A00137083
69900+:1001D000000018210E00165D000000003C0A4000DF
69901+:1001E0003C098000AD2A01780A00130400000000D9
69902+:1001F0008F85002410A00027AF80001090A300007E
69903+:10020000106000742409000310690101000030210E
69904+:1002100090AE0001240D000211CD014230EF0040EC
69905+:1002200090A90001241F0001113F000930E20040A5
69906+:100230008CA600049785002A00C020210E000FDB49
69907+:1002400036A60002000040210A00137001001821A8
69908+:100250005040FFF88CA600043C07080190E7964147
69909+:1002600010E0FFF4240800010A00137001001821B7
69910+:10027000939800103C1F080127FF96400018C8C043
69911+:10028000033F4021AF8800248F85002414A0FFDBAA
69912+:10029000AF9800103C0480008C86400030C50100FF
69913+:1002A00010A0008732AB00043C0C08008D8C0024A9
69914+:1002B00024160004156000033192000D241600027C
69915+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
69916+:1002D00032B5FFFB8C984000330F010055E0000160
69917+:1002E0002415001030E80800110000382409FFFB35
69918+:1002F0008F9F00282FF903EF53200001024990241B
69919+:1003000030E2010010400014325F00018F87002CA2
69920+:1003100014E0010E8F8C000C3C0480003486010038
69921+:1003200090C5001330AA00FF25430004000321C03C
69922+:100330002419FFFE025990241240000202B6302513
69923+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
69924+:1003500000001821325F000113E0000D3247000455
69925+:10036000240900011249000202B6302532A6FFFF1F
69926+:100370009785002A0E000FDB000020212402FFFEDB
69927+:10038000024290241240FE950000182132470004DA
69928+:1003900050E0FE922403000102B63025241600042A
69929+:1003A0005656000132A6FFFF9785002A0E000FDB8C
69930+:1003B000240401002403FFFB0243A82412A0FE87AB
69931+:1003C000000018210A001370240300010A0014B968
69932+:1003D0000249902410A0FFAF30E5010010A00017E3
69933+:1003E0008F8600102403000210C300148F84000CB9
69934+:1003F0003C0608008CC6003824CAFFFF14C0000267
69935+:10040000008A1024000010213C0E080025CE003880
69936+:10041000004E682191AC00048F850028258B0004D4
69937+:10042000000B21C030A5FFFF36A600020E000FDB37
69938+:10043000000000000A00137000001821240F0002C1
69939+:1004400010CF0088241600013C0308008C6300D004
69940+:100450001076008D8F85002824D9FFFC2F280004FA
69941+:100460001500006300002021241F0002107F005DA2
69942+:100470002CC9000C24C3FFF82C6200041440FFE9CF
69943+:100480000000202130EA020051400004000621C093
69944+:1004900054C0000530A5FFFF000621C030A5FFFFB6
69945+:1004A0000A00150436A600020E000FDB32A600017A
69946+:1004B0008F8600108F8500280A001520000621C0B5
69947+:1004C0003C0A08008D4A0024315200015240FE438C
69948+:1004D000000018219785002A36A600020E000FDBC7
69949+:1004E000000020210A001370000018219668000CFB
69950+:1004F000311802005700FE313C0500013C1F800806
69951+:1005000097F900489789002A36A600023328FFFF92
69952+:10051000AF8800083C0380008C7501B806A0FFFE80
69953+:100520003C04800034820180AC400000110000B621
69954+:1005300024180003252A0012010A182B106000B2AB
69955+:1005400000000000966F00203C0E8000240D001A71
69956+:1005500031ECFFFF35CA018030EB4000A14D000BAC
69957+:10056000116000B02583FFFE0103902B164000AE02
69958+:100570002416FFFE34A50001A5430014AF85000436
69959+:100580002419BFFF00B94024A6E9000EA6E9001A0D
69960+:10059000A6E60008A6E80026A6E700103C07100023
69961+:1005A000AE8701B80A001370000018213C048000D7
69962+:1005B0008C8201B80440FFFE349601802415001C93
69963+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
69964+:1005D0003C0A40003C098000AD2A01780A0013045F
69965+:1005E000000000005120FFA424C3FFF800002021D8
69966+:1005F00030A5FFFF0A00150436A600020E00103DCC
69967+:10060000000000008F8700000A001346AF82000C34
69968+:1006100090A30001241500011075FF0B24080001B0
69969+:10062000240600021066000430E2004024080001A5
69970+:100630000A001370010018215040FFFD240800013A
69971+:100640003C0C8000358B0100956A001094A40002D8
69972+:100650003143FFFF5083FDE1010018210A00158599
69973+:10066000240800018F8500282CB203EF1240FDDB27
69974+:10067000240300013C0308008C6300D02416000111
69975+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
69976+:10069000000621C030A5FFFF0A00150436A600029F
69977+:1006A00010B00037240F000B14AFFE23000731C039
69978+:1006B000312600FF00065600000A4E0305220047BF
69979+:1006C00030C6007F0006F8C03C16080126D69640CA
69980+:1006D00003F68021A2000001A20000003C0F600090
69981+:1006E0008DF918202405000100C588040011302769
69982+:1006F0000326C024000731C000C03821ADF81820FF
69983+:100700000A0013C8A60000028F850020000731C030
69984+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
69985+:100720002415002011E0FECC3C1980003728010080
69986+:100730009518001094B6000233120FFF16D2FEC6B1
69987+:10074000000000000A00148290A900013C0B080080
69988+:100750008D6B0038256DFFFF15600002018D1024A0
69989+:10076000000010213C080800250800380048C0217E
69990+:10077000930F000425EE00040A0014C5000E21C0EA
69991+:1007800000065202241F00FF115FFDEB000731C07D
69992+:10079000000A20C03C0E080125CE9640008EA821FC
69993+:1007A000009E602100095C02240D00013C076000EE
69994+:1007B000A2AD0000AD860000A2AB00018CF21820B3
69995+:1007C00024030001014310040242B025ACF61820B6
69996+:1007D00000C038210A0013C8A6A900020A0015AA01
69997+:1007E000AF8000200A0012FFAF84002C8F85000428
69998+:1007F0003C1980002408000337380180A308000B4F
69999+:100800000A00144D3C088000A2F8000B0A00155A9B
70000+:100810002419BFFF8F9600042412FFFE0A00144B18
70001+:1008200002D228242416FFFE0A00155800B62824F8
70002+:100830003C038000346401008C85000030A2003E3F
70003+:100840001440000800000000AC6000488C870000E5
70004+:1008500030E607C010C0000500000000AC60004C8E
70005+:10086000AC60005003E0000824020001AC600054BA
70006+:10087000AC6000408C880000310438001080FFF923
70007+:10088000000000002402000103E00008AC60004406
70008+:100890003C0380008C6201B80440FFFE3467018095
70009+:1008A000ACE4000024080001ACE00004A4E500086A
70010+:1008B00024050002A0E8000A34640140A0E5000B12
70011+:1008C0009483000A14C00008A4E30010ACE00024E4
70012+:1008D0003C07800034E901803C041000AD20002872
70013+:1008E00003E00008ACE401B88C8600043C0410006E
70014+:1008F000ACE600243C07800034E90180AD200028EC
70015+:1009000003E00008ACE401B83C0680008CC201B8EA
70016+:100910000440FFFE34C7018024090002ACE400005B
70017+:10092000ACE40004A4E50008A0E9000A34C50140D5
70018+:10093000A0E9000B94A8000A3C041000A4E80010F1
70019+:10094000ACE000248CA30004ACE3002803E0000822
70020+:10095000ACC401B83C039000346200010082202541
70021+:100960003C038000AC6400208C65002004A0FFFEE6
70022+:100970000000000003E00008000000003C028000CE
70023+:10098000344300010083202503E00008AC4400202C
70024+:1009900027BDFFE03C098000AFBF0018AFB10014D5
70025+:1009A000AFB00010352801408D10000091040009FF
70026+:1009B0009107000891050008308400FF30E600FF31
70027+:1009C00000061A002C820081008330251040002A86
70028+:1009D00030A50080000460803C0D080125AD92B078
70029+:1009E000018D58218D6A00000140000800000000C0
70030+:1009F0003C038000346201409445000A14A0001EAC
70031+:100A00008F91FCC09227000530E6000414C0001A44
70032+:100A1000000000000E00164E02002021922A000560
70033+:100A200002002021354900040E001658A2290005B5
70034+:100A30009228000531040004148000020000000028
70035+:100A40000000000D922D0000240B002031AC00FFAF
70036+:100A5000158B00093C0580008CAE01B805C0FFFE77
70037+:100A600034B10180AE3000003C0F100024100005AE
70038+:100A7000A230000BACAF01B80000000D8FBF001812
70039+:100A80008FB100148FB0001003E0000827BD0020D4
70040+:100A90000200202100C028218FBF00188FB1001450
70041+:100AA0008FB00010240600010A00161D27BD00208B
70042+:100AB0000000000D0200202100C028218FBF001877
70043+:100AC0008FB100148FB00010000030210A00161DF5
70044+:100AD00027BD002014A0FFE8000000000200202134
70045+:100AE0008FBF00188FB100148FB0001000C02821F4
70046+:100AF0000A00163B27BD00203C0780008CEE01B8A1
70047+:100B000005C0FFFE34F00180241F0002A21F000B6D
70048+:100B100034F80140A60600089719000A3C0F10009F
70049+:100B2000A61900108F110004A6110012ACEF01B835
70050+:100B30000A0016998FBF001827BDFFE8AFBF00104D
70051+:100B40000E000FD4000000003C0280008FBF001098
70052+:100B500000002021AC4001800A00108F27BD001842
70053+:100B60003084FFFF30A5FFFF108000070000182130
70054+:100B7000308200011040000200042042006518216C
70055+:100B80001480FFFB0005284003E0000800601021EE
70056+:100B900010C00007000000008CA2000024C6FFFF68
70057+:100BA00024A50004AC82000014C0FFFB24840004D0
70058+:100BB00003E000080000000010A0000824A3FFFFCD
70059+:100BC000AC86000000000000000000002402FFFFCF
70060+:100BD0002463FFFF1462FFFA2484000403E000088A
70061+:100BE000000000003C03800027BDFFF83462018054
70062+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
70063+:100C00003C0B80008D6401B80480FFFE00000000F2
70064+:100C10008FA900008D6801288FAA00008FA700000F
70065+:100C20008FA400002405000124020002A085000A10
70066+:100C30008FA30000359940003C051000A062000B16
70067+:100C40008FB800008FAC00008FA600008FAF0000AF
70068+:100C500027BD0008AD280000AD400004AD80002491
70069+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
70070+:100C700003E00008AD6501B83C06800827BDFFE829
70071+:100C800034C50080AFBF001090A7000924020012F5
70072+:100C900030E300FF1062000B008030218CA8005070
70073+:100CA00000882023048000088FBF00108CAA003425
70074+:100CB000240400390000282100CA4823052000052B
70075+:100CC000240600128FBF00102402000103E0000878
70076+:100CD00027BD00180E0016F2000000008FBF0010A4
70077+:100CE0002402000103E0000827BD001827BDFFC84B
70078+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
70079+:100D000000A0802190A5000D30A6001010C000109A
70080+:100D1000008090213C0280088C4400048E0300086F
70081+:100D20001064000C30A7000530A6000510C0009329
70082+:100D3000240400018FBF00348FB200308FB1002C2B
70083+:100D40008FB000280080102103E0000827BD003884
70084+:100D500030A7000510E0000F30AB001210C00006F5
70085+:100D6000240400013C0980088E0800088D25000439
70086+:100D70005105009C240400388FBF00348FB200302E
70087+:100D80008FB1002C8FB000280080102103E00008F4
70088+:100D900027BD0038240A0012156AFFE6240400016A
70089+:100DA0000200202127A500100E000CB6AFA00010F5
70090+:100DB0001440007C3C19800837240080909800087B
70091+:100DC000331100081220000A8FA7001030FF010025
70092+:100DD00013E000A48FA300148C8600580066102333
70093+:100DE000044000043C0A8008AC8300588FA7001020
70094+:100DF0003C0A800835480080910900083124000829
70095+:100E00001480000224080003000040213C1F8008D9
70096+:100E100093F1001193F9001237E600808CCC005456
70097+:100E2000333800FF03087821322D00FF000F708057
70098+:100E300001AE282100AC582B1160006F00000000AB
70099+:100E400094CA005C8CC900543144FFFF0125102373
70100+:100E50000082182B14600068000000008CCB005446
70101+:100E60000165182330EC00041180006C000830800C
70102+:100E70008FA8001C0068102B1040006230ED0004A9
70103+:100E8000006610232C46008010C00002004088211C
70104+:100E9000241100800E00164E024020213C0D8008D7
70105+:100EA00035A6008024070001ACC7000C90C80008DC
70106+:100EB0000011484035A70100310C007FA0CC00088C
70107+:100EC0008E05000424AB0001ACCB0030A4D1005C43
70108+:100ED0008CCA003C9602000E01422021ACC40020C6
70109+:100EE0008CC3003C0069F821ACDF001C8E190004A3
70110+:100EF000ACF900008E180008ACF800048FB10010A7
70111+:100F0000322F000855E0004793A60020A0C0004EF5
70112+:100F100090D8004E2411FFDFA0F8000890CF000801
70113+:100F200001F17024A0CE00088E0500083C0B80085B
70114+:100F300035690080AD2500388D6A00148D2200309F
70115+:100F40002419005001422021AD24003491230000D7
70116+:100F5000307F00FF13F90036264F01000E001658AF
70117+:100F60000240202124040038000028210E0016F23F
70118+:100F70002406000A0A001757240400010E000D2859
70119+:100F8000000020218FBF00348FB200308FB1002CC1
70120+:100F90008FB00028004020210080102103E00008CD
70121+:100FA00027BD00388E0E00083C0F800835F0008009
70122+:100FB000AE0E005402402021AE0000300E00164E4E
70123+:100FC00000000000920D00250240202135AC0020D9
70124+:100FD0000E001658A20C00250E000CAC0240202179
70125+:100FE000240400382405008D0E0016F22406001299
70126+:100FF0000A0017572404000194C5005C0A001792E8
70127+:1010000030A3FFFF2407021811A0FF9E00E6102363
70128+:101010008FAE001C0A00179A01C610230A0017970A
70129+:101020002C620218A0E600080A0017C48E0500080A
70130+:101030002406FF8001E6C0243C118000AE38002861
70131+:101040008E0D000831E7007F3C0E800C00EE602121
70132+:10105000AD8D00E08E080008AF8C00380A0017D074
70133+:10106000AD8800E4AC800058908500082403FFF7A9
70134+:1010700000A33824A08700080A0017758FA7001066
70135+:101080003C05080024A560A83C04080024846FF4F3
70136+:101090003C020800244260B0240300063C01080121
70137+:1010A000AC2596C03C010801AC2496C43C01080163
70138+:1010B000AC2296C83C010801A02396CC03E00008AE
70139+:1010C0000000000003E00008240200013C02800050
70140+:1010D000308800FF344701803C0680008CC301B893
70141+:1010E0000460FFFE000000008CC501282418FF806A
70142+:1010F0003C0D800A24AF010001F8702431EC007F20
70143+:10110000ACCE0024018D2021ACE50000948B00EAD8
70144+:101110003509600024080002316AFFFFACEA0004D0
70145+:1011200024020001A4E90008A0E8000BACE00024C0
70146+:101130003C071000ACC701B8AF84003803E00008DA
70147+:10114000AF85006C938800488F8900608F820038DB
70148+:1011500030C600FF0109382330E900FF01221821C1
70149+:1011600030A500FF2468008810C000020124382147
70150+:101170000080382130E400031480000330AA00030B
70151+:101180001140000D312B000310A0000900001021B8
70152+:1011900090ED0000244E000131C200FF0045602B9D
70153+:1011A000A10D000024E700011580FFF925080001CA
70154+:1011B00003E00008000000001560FFF300000000DD
70155+:1011C00010A0FFFB000010218CF80000245900043F
70156+:1011D000332200FF0045782BAD18000024E70004FF
70157+:1011E00015E0FFF92508000403E0000800000000F6
70158+:1011F00093850048938800588F8700600004320070
70159+:101200003103007F00E5102B30C47F001040000F39
70160+:10121000006428258F8400383C0980008C8A00EC0B
70161+:10122000AD2A00A43C03800000A35825AC6B00A0AD
70162+:101230008C6C00A00580FFFE000000008C6D00ACEF
70163+:10124000AC8D00EC03E000088C6200A80A00188254
70164+:101250008F840038938800593C0280000080502120
70165+:10126000310300FEA383005930ABFFFF30CC00FFF9
70166+:1012700030E7FFFF344801803C0980008D2401B82D
70167+:101280000480FFFE8F8D006C24180016AD0D000049
70168+:101290008D2201248F8D0038AD0200048D5900206D
70169+:1012A000A5070008240201C4A119000AA118000B17
70170+:1012B000952F01208D4E00088D4700049783005C18
70171+:1012C0008D59002401CF302100C7282100A32023FD
70172+:1012D0002418FFFFA504000CA50B000EA5020010AA
70173+:1012E000A50C0012AD190018AD18002495AF00E848
70174+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
70175+:101300008DAC0084AD0C002CAD2B01B88D460020B7
70176+:1013100000C7282403E00008AD4500208F8800386E
70177+:101320000080582130E7FFFF910900D63C02800081
70178+:1013300030A5FFFF312400FF00041A00006750258C
70179+:1013400030C600FF344701803C0980008D2C01B875
70180+:101350000580FFFE8F82006C240F0017ACE20000B6
70181+:101360008D390124ACF900048D780020A4EA00082E
70182+:10137000241901C4A0F8000AA0EF000B9523012056
70183+:101380008D6E00088D6D00049784005C01C35021B0
70184+:10139000014D602101841023A4E2000CA4E5000E9D
70185+:1013A000A4F90010A4E60012ACE000148D7800242B
70186+:1013B000240DFFFFACF800188D0F007CACEF001C73
70187+:1013C0008D0E00783C0F1000ACEE0020ACED002438
70188+:1013D000950A00BE240DFFF73146FFFFACE600285A
70189+:1013E000950C00809504008231837FFF0003CA00C2
70190+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
70191+:10140000950E00828D6A002000AE3021014D282407
70192+:10141000A506008203E00008AD6500203C028000C4
70193+:10142000344501803C0480008C8301B80460FFFED9
70194+:101430008F8A0044240600199549001C3128FFFFBB
70195+:10144000000839C0ACA70000A0A6000B3C051000A6
70196+:1014500003E00008AC8501B88F87004C0080402174
70197+:1014600030C400FF3C0680008CC201B80440FFFE7F
70198+:101470008F89006C9383006834996000ACA90000E8
70199+:10148000A0A300058CE20010240F00022403FFF744
70200+:10149000A4A20006A4B900088D180020A0B8000A74
70201+:1014A000A0AF000B8CEE0000ACAE00108CED000481
70202+:1014B000ACAD00148CEC001CACAC00248CEB002018
70203+:1014C000ACAB00288CEA002C3C071000ACAA002C26
70204+:1014D0008D090024ACA90018ACC701B88D05002007
70205+:1014E00000A3202403E00008AD0400208F8600380C
70206+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
70207+:1015000090C300D430A500FF3062002010400008D6
70208+:10151000008088218CCB00D02409FFDF256A0001E0
70209+:10152000ACCA00D090C800D401093824A0C700D4A8
70210+:1015300014A000403C0C80008F840038908700D4B9
70211+:101540002418FFBF2406FFEF30E3007FA08300D400
70212+:10155000979F005C8F8200608F8D003803E2C82364
70213+:10156000A799005CA5A000BC91AF00D401F870243D
70214+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
70215+:10158000A5400082AD4000EC914500D400A658244F
70216+:10159000A14B00D48F9000348F8400609786005C4C
70217+:1015A0000204282110C0000FAF850034A38000582A
70218+:1015B0003C0780008E2C000894ED01208E2B000447
70219+:1015C000018D5021014B8021020620233086FFFF30
70220+:1015D00030C8000F3909000131310001162000091F
70221+:1015E000A3880058938600488FBF00188FB100145D
70222+:1015F0008FB0001027BD0020AF85006403E0000815
70223+:10160000AF86006000C870238FBF00189386004823
70224+:101610008FB100148FB0001034EF0C00010F28219F
70225+:1016200027BD0020ACEE0084AF85006403E0000815
70226+:10163000AF86006035900180020028210E00190F4E
70227+:10164000240600828F840038908600D430C5004084
70228+:1016500050A0FFBAA38000688F85004C3C06800034
70229+:101660008CCD01B805A0FFFE8F89006C2408608234
70230+:1016700024070002AE090000A6080008A207000B1C
70231+:101680008CA300083C0E1000AE0300108CA2000CCE
70232+:10169000AE0200148CBF0014AE1F00188CB90018E5
70233+:1016A000AE1900248CB80024AE1800288CAF002896
70234+:1016B000AE0F002CACCE01B80A001948A380006818
70235+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
70236+:1016D0008F880060AFBF00189389003C954200BC22
70237+:1016E00030D100FF0109182B0080802130AC00FFB1
70238+:1016F0003047FFFF0000582114600003310600FF4F
70239+:1017000001203021010958239783005C0068202BB9
70240+:101710001480002700000000106800562419000102
70241+:101720001199006334E708803165FFFF0E0018C08F
70242+:10173000020020218F83006C3C07800034E601808A
70243+:101740003C0580008CAB01B80560FFFE240A001840
70244+:101750008F840038ACC30000A0CA000B948900BE7F
70245+:101760003C081000A4C90010ACC00030ACA801B8FF
70246+:101770009482008024430001A4830080949F008011
70247+:101780003C0608008CC6318833EC7FFF1186005E72
70248+:101790000000000002002021022028218FBF001835
70249+:1017A0008FB100148FB000100A00193427BD00203B
70250+:1017B000914400D42403FF8000838825A15100D4E4
70251+:1017C0009784005C3088FFFF51000023938C003C1D
70252+:1017D0008F8500382402EFFF008B782394AE00BC85
70253+:1017E0000168502B31E900FF01C26824A4AD00BCA0
70254+:1017F00051400039010058213C1F800037E60100AC
70255+:101800008CD800043C190001031940245500000144
70256+:1018100034E740008E0A00202403FFFB241100015E
70257+:1018200001432024AE0400201191002D34E78000F4
70258+:1018300002002021012030210E0018C03165FFFF79
70259+:101840009787005C8F890060A780005C0127802358
70260+:10185000AF900060938C003C8F8B00388FBF0018D6
70261+:101860008FB100148FB0001027BD002003E00008E6
70262+:10187000A16C00D73C0D800035AA01008D48000402
70263+:101880003C0900010109282454A0000134E740006C
70264+:101890008E0F00202418FFFB34E7800001F870242D
70265+:1018A00024190001AE0E00201599FF9F34E708802F
70266+:1018B000020020210E00188E3165FFFF020020215A
70267+:1018C000022028218FBF00188FB100148FB00010A4
70268+:1018D0000A00193427BD00200A0019F7000048212A
70269+:1018E00002002021012030210E00188E3165FFFFFB
70270+:1018F0009787005C8F890060A780005C01278023A8
70271+:101900000A001A0EAF900060948C0080241F8000A3
70272+:10191000019F3024A4860080908B0080908F0080EF
70273+:10192000316700FF0007C9C20019C027001871C045
70274+:1019300031ED007F01AE2825A08500800A0019DF67
70275+:1019400002002021938500682403000127BDFFE8E1
70276+:1019500000A330042CA20020AFB00010AFBF0014D1
70277+:1019600000C01821104000132410FFFE3C0708009F
70278+:101970008CE7319000E610243C088000350501809A
70279+:1019800014400005240600848F890038240A0004CE
70280+:101990002410FFFFA12A00FC0E00190F0000000018
70281+:1019A000020010218FBF00148FB0001003E0000868
70282+:1019B00027BD00183C0608008CC631940A001A574F
70283+:1019C00000C310248F87004427BDFFE0AFB200188A
70284+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
70285+:1019E00090E6000D00A088210080902130C5007F86
70286+:1019F000A0E5000D8F8500388E2300188CA200D042
70287+:101A00001062002E240A000E0E001A4AA38A0068F3
70288+:101A10002409FFFF104900222404FFFF5200002088
70289+:101A2000000020218E2600003C0C001000CC582421
70290+:101A3000156000393C0E000800CE682455A0003F18
70291+:101A4000024020213C18000200D880241200001F10
70292+:101A50003C0A00048F8700448CE200148CE30010E1
70293+:101A60008CE500140043F82303E5C82B1320000580
70294+:101A7000024020218E24002C8CF1001010910031A6
70295+:101A80000240202124020012A38200680E001A4A9C
70296+:101A90002412FFFF105200022404FFFF0000202147
70297+:101AA0008FBF001C8FB200188FB100148FB00010D0
70298+:101AB0000080102103E0000827BD002090A800D47A
70299+:101AC000350400200A001A80A0A400D400CA4824CB
70300+:101AD0001520000B8F8B00448F8D00448DAC0010BF
70301+:101AE0001580000B024020218E2E002C51C0FFECEF
70302+:101AF00000002021024020210A001A9B2402001726
70303+:101B00008D66001050C0FFE6000020210240202119
70304+:101B10000A001A9B24020011024020212402001511
70305+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
70306+:101B30002404FFFF0A001A8A8E2600000A001AC138
70307+:101B4000240200143C08000400C8382450E0FFD4EC
70308+:101B500000002021024020210A001A9B24020013C9
70309+:101B60008F85003827BDFFD8AFB3001CAFB2001877
70310+:101B7000AFB10014AFB00010AFBF002090A700D4E9
70311+:101B80008F90004C2412FFFF34E2004092060000C8
70312+:101B9000A0A200D48E0300100080982110720006CD
70313+:101BA00030D1003F2408000D0E001A4AA3880068B7
70314+:101BB000105200252404FFFF8F8A00388E09001878
70315+:101BC0008D4400D01124000702602021240C000E57
70316+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
70317+:101BE0002404FFFF24040020122400048F8D0038F9
70318+:101BF00091AF00D435EE0020A1AE00D48F85005403
70319+:101C000010A00019000000001224004A8F9800382C
70320+:101C10008F92FCC0971000809651000A5230004805
70321+:101C20008F9300403C1F08008FFF318C03E5C82BC9
70322+:101C30001720001E02602021000028210E0019A993
70323+:101C400024060001000020218FBF00208FB3001C5C
70324+:101C50008FB200188FB100148FB0001000801021D7
70325+:101C600003E0000827BD00285224002A8E05001436
70326+:101C70008F840038948A008025490001A48900805F
70327+:101C8000948800803C0208008C42318831077FFF35
70328+:101C900010E2000E00000000026020210E00193446
70329+:101CA000240500010A001B0B000020212402002D46
70330+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
70331+:101CC0002404FFFF0A001B0C8FBF002094990080A2
70332+:101CD000241F800024050001033FC024A498008035
70333+:101CE00090920080908E0080325100FF001181C2DE
70334+:101CF00000107827000F69C031CC007F018D582576
70335+:101D0000A08B00800E001934026020210A001B0BFA
70336+:101D1000000020212406FFFF54A6FFD68F84003840
70337+:101D2000026020210E001934240500010A001B0B5B
70338+:101D300000002021026020210A001B252402000A45
70339+:101D40002404FFFD0A001B0BAF9300608F8800384E
70340+:101D500027BDFFE8AFB00010AFBF0014910A00D458
70341+:101D60008F87004C00808021354900408CE60010B0
70342+:101D7000A10900D43C0208008C4231B030C53FFFBD
70343+:101D800000A2182B106000078F850050240DFF80E3
70344+:101D900090AE000D01AE6024318B00FF156000088D
70345+:101DA0000006C382020020212403000D8FBF00140F
70346+:101DB0008FB0001027BD00180A001A4AA3830068DC
70347+:101DC00033060003240F000254CFFFF70200202146
70348+:101DD00094A2001C8F85003824190023A4A200E8D7
70349+:101DE0008CE8000000081E02307F003F13F9003528
70350+:101DF0003C0A00838CE800188CA600D0110600086D
70351+:101E0000000000002405000E0E001A4AA385006899
70352+:101E10002407FFFF104700182404FFFF8F850038B8
70353+:101E200090A900D435240020A0A400D48F8C0044B5
70354+:101E3000918E000D31CD007FA18D000D8F83005458
70355+:101E40001060001C020020218F8400508C9800102C
70356+:101E50000303782B11E0000D241900180200202143
70357+:101E6000A39900680E001A4A2410FFFF10500002C8
70358+:101E70002404FFFF000020218FBF00148FB000104A
70359+:101E80000080102103E0000827BD00188C86001098
70360+:101E90008F9F00440200202100C31023AFE20010F6
70361+:101EA000240500010E0019A9240600010A001B9751
70362+:101EB000000020210E001934240500010A001B97A0
70363+:101EC00000002021010A5824156AFFD98F8C004494
70364+:101ED000A0A600FC0A001B84A386005A30A500FFC0
70365+:101EE0002406000124A9000100C9102B1040000C99
70366+:101EF00000004021240A000100A61823308B0001B5
70367+:101F000024C60001006A3804000420421160000267
70368+:101F100000C9182B010740251460FFF800A61823FC
70369+:101F200003E000080100102127BDFFD8AFB0001862
70370+:101F30008F90004CAFB1001CAFBF00202403FFFF07
70371+:101F40002411002FAFA30010920600002405000802
70372+:101F500026100001006620260E001BB0308400FF12
70373+:101F600000021E003C021EDC34466F410A001BD8F2
70374+:101F70000000102110A00009008018212445000154
70375+:101F800030A2FFFF2C4500080461FFFA0003204047
70376+:101F90000086202614A0FFF9008018210E001BB037
70377+:101FA000240500208FA300102629FFFF313100FFF8
70378+:101FB00000034202240700FF1627FFE20102182651
70379+:101FC00000035027AFAA0014AFAA00100000302170
70380+:101FD00027A8001027A7001400E6782391ED00033E
70381+:101FE00024CE000100C8602131C600FF2CCB0004C4
70382+:101FF0001560FFF9A18D00008FA200108FBF002097
70383+:102000008FB1001C8FB0001803E0000827BD002826
70384+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
70385+:10202000AFB50024AFB40020AFB20018AFB10014B8
70386+:102030003C0C80008D880128240FFF803C06800A1C
70387+:1020400025100100250B0080020F68243205007F57
70388+:10205000016F7024AD8E009000A62821AD8D002464
70389+:1020600090A600FC3169007F3C0A8004012A1821F7
70390+:10207000A386005A9067007C00809821AF830030CF
70391+:1020800030E20002AF88006CAF85003800A0182154
70392+:10209000144000022404003424040030A3840048C7
70393+:1020A0008C7200DC30D100FF24040004AF92006089
70394+:1020B00012240004A38000688E7400041680001EA1
70395+:1020C0003C0880009386005930C7000110E0000FE3
70396+:1020D0008F9300608CB000848CA800842404FF805F
70397+:1020E000020410240002F940310A007F03EA482567
70398+:1020F0003C0C2000012C902530CD00FE3C038000DC
70399+:10210000AC720830A38D00598F9300608FBF0028F8
70400+:102110008FB50024ACB300DC8FB400208FB3001C5B
70401+:102120008FB200188FB100148FB00010240200018C
70402+:1021300003E0000827BD00308E7F000895020120D3
70403+:102140008E67001003E2C8213326FFFF30D8000F4E
70404+:1021500033150001AF87003416A00058A39800582B
70405+:1021600035090C000309382100D81823AD03008479
70406+:10217000AF8700648E6A00043148FFFF1100007EC3
70407+:10218000A78A005C90AC00D42407FF8000EC3024C8
70408+:1021900030CB00FF1560004B9786005C938E005A91
70409+:1021A000240D000230D5FFFF11CD02A20000A021B6
70410+:1021B0008F85006002A5802B160000BC9388004824
70411+:1021C0003C11800096240120310400FF1485008812
70412+:1021D0008F8400648F9800343312000356400085CA
70413+:1021E00030A500FF8F900064310C00FF24060034FE
70414+:1021F00011860095AF90004C9204000414800118E1
70415+:102200008F8E0038A380003C8E0D00048DC800D84E
70416+:102210003C0600FF34CCFFFF01AC30240106182B34
70417+:1022200014600120AF8600548F8700609798005C8F
70418+:10223000AF8700400307402310C000C7A788005C99
70419+:102240008F91003030C3000300035823922A007C92
70420+:102250003171000302261021000A20823092000111
70421+:102260000012488000492821311FFFFF03E5C82BD9
70422+:10227000132001208F8800388F8500348F880064F8
70423+:102280001105025A3C0E3F018E0600003C0C250051
70424+:1022900000CE682411AC01638F84004C30E500FF50
70425+:1022A0000E00184A000030218F8800388F870060A8
70426+:1022B0008F8500340A001DB78F8600540A001C5613
70427+:1022C000AF87006490A400D400E48024320200FFB1
70428+:1022D000104000169386005990A6008890AE00D753
70429+:1022E00024A8008830D4003F2686FFE02CD10020AF
70430+:1022F000A38E003C1220000CAF88004C240B000180
70431+:1023000000CB20043095001916A0012B3C0680005C
70432+:1023100034CF0002008FC0241700022E3099002015
70433+:1023200017200234000000009386005930CB0001D2
70434+:102330001160000F9788005C8CBF00848CA900841A
70435+:10234000240AFF8003EA6024000C19403132007F28
70436+:10235000007238253C0D200000EDC82530D800FE65
70437+:102360003C0F8000ADF90830A39800599788005CB5
70438+:102370001500FF84000000008E630020306200041E
70439+:102380001040FF51938600592404FFFB0064802411
70440+:102390003C038000AE700020346601808C7301B86D
70441+:1023A0000660FFFE8F98006C347501003C1400013C
70442+:1023B000ACD800008C6B012424076085ACCB0004F2
70443+:1023C0008EAE000401D488245220000124076083CB
70444+:1023D00024190002A4C700083C0F1000A0D9000B6C
70445+:1023E0003C068000ACCF01B80A001C2B9386005934
70446+:1023F00030A500FF0E00184A240600018F88006CEB
70447+:102400003C05800034A90900250201889388004812
70448+:10241000304A0007304B00783C0340802407FF809F
70449+:102420000163C825014980210047F824310C00FFD1
70450+:1024300024060034ACBF0800AF90004CACB90810C3
70451+:102440005586FF6E920400048F8400388E11003090
70452+:10245000908E00D431CD001015A000108F83006045
70453+:102460002C6F000515E000E400000000909800D4F7
70454+:102470002465FFFC331200101640000830A400FF52
70455+:102480008F9F00648F99003413F90004388700018E
70456+:1024900030E20001144001C8000000000E001BC320
70457+:1024A000000000000A001DF8000000008F84006496
70458+:1024B00030C500FF0E00184A24060001939800481A
70459+:1024C000240B0034130B00A08F8500388F8600602A
70460+:1024D0009783005C306EFFFF00CE8823AF910060D1
70461+:1024E000A780005C1280FF90028018212414FFFD59
70462+:1024F0005474FFA28E6300208E6A00042403FFBF81
70463+:102500002408FFEF0155F823AE7F000490AC00D4FF
70464+:102510003189007FA0A900D48E7200208F8F0038EF
70465+:10252000A780005C364D0002AE6D0020A5E000BC27
70466+:1025300091E500D400A3C824A1F900D48F950038F8
70467+:10254000AEA000EC92B800D403085824A2AB00D48B
70468+:102550000A001CD78F8500388F910034AF8000604F
70469+:1025600002275821AF8B0034000020212403FFFFF5
70470+:10257000108301B48F8500388E0C00103C0D0800CC
70471+:102580008DAD31B09208000031843FFF008D802B6B
70472+:1025900012000023310D003F3C1908008F3931A88B
70473+:1025A0008F9F006C000479802408FF80033F202166
70474+:1025B000008FC821938500590328F8243C06008029
70475+:1025C0003C0F800034D80001001F91403331007F60
70476+:1025D0008F8600380251502535EE0940332B0078A4
70477+:1025E000333000073C0310003C02800C017890253A
70478+:1025F000020E48210143C0250222382134AE0001D9
70479+:10260000ADFF0804AF890050ADF20814AF87004455
70480+:10261000ADFF0028ACD90084ADF80830A38E005976
70481+:102620009383005A24070003106700272407000142
70482+:102630001467FFAC8F8500382411002311B1008589
70483+:1026400000000000240E000B026020210E001A4A38
70484+:10265000A38E00680040A0210A001D328F8500383B
70485+:1026600002602021240B000C0E001A4AA38B006884
70486+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
70487+:10268000A380003C8E0D00048DC800D83C0600FFDE
70488+:1026900034CCFFFF01AC30240106182B1060FEE2A1
70489+:1026A000AF86005402602021241200190E001A4A3D
70490+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
70491+:1026C0000A001C838F86005425A3FFE02C74002091
70492+:1026D0001280FFDD240E000B000328803C1108014E
70493+:1026E000263194B400B148218D2D000001A00008CE
70494+:1026F000000000008F85003400A710219385003C66
70495+:10270000AF82003402251821A383003C951F00BC32
70496+:102710000226282137F91000A51900BC5240FF926B
70497+:10272000AF850060246A0004A38A003C950900BCC0
70498+:1027300024A40004AF84006035322000A51200BC40
70499+:102740000A001D54000020218F8600602CC800055F
70500+:102750001500FF609783005C3065FFFF00C5C8234C
70501+:102760002F2F000511E00003306400FF24CDFFFC93
70502+:1027700031A400FF8F8900648F920034113200046D
70503+:10278000389F000133EC0001158001380000000083
70504+:102790008F840038908700D434E60010A08600D4DF
70505+:1027A0008F8500388F8600609783005CACA000ECBA
70506+:1027B0000A001D2F306EFFFF8CB500848CB400849E
70507+:1027C0003C04100002A7302400068940328E007FAE
70508+:1027D000022E8025020410253C08800024050001FB
70509+:1027E00002602021240600010E0019A9AD02083064
70510+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
70511+:102800000260202124090005A38900680E001A4AED
70512+:102810002411FFFF1451FE782404FFFF0A001D5508
70513+:102820002403FFFF8F8F004C8F8800388DF8000045
70514+:10283000AD1800888DE70010AD0700988F87006005
70515+:102840000A001DB78F8600542406FFFF118600057D
70516+:10285000000000000E001B4C026020210A001D8FAA
70517+:102860000040A0210E001AD1026020210A001D8F15
70518+:102870000040A0218F90004C3C0208008C4231B0F7
70519+:102880008E110010322C3FFF0182282B10A0000C6B
70520+:10289000240BFF808F85005090A3000D01637024EE
70521+:1028A00031CA00FF1140000702602021001143825D
70522+:1028B000310600032418000110D8010600000000B2
70523+:1028C000026020212403000D0E001A4AA383006831
70524+:1028D000004020218F8500380A001D320080A02191
70525+:1028E0008F90004C3C0A08008D4A31B08F85005013
70526+:1028F0008E0400100000A0218CB1001430823FFF34
70527+:10290000004A602B8CB200205180FFEE0260202133
70528+:1029100090B8000D240BFF800178702431C300FFB4
70529+:102920005060FFE80260202100044382310600036A
70530+:1029300014C0FFE40260202194BF001C8F9900386E
70531+:102940008E060028A73F00E88CAF0010022F20233E
70532+:1029500014C4013A026020218F83005400C368210F
70533+:10296000022D382B14E00136240200188F8A00440F
70534+:102970008F820030024390218D4B00100163702341
70535+:10298000AD4E0010AD5200208C4C00740192282BEB
70536+:1029900014A0015F026020218F8400508E08002463
70537+:1029A0008C86002411060007026020212419001CD7
70538+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
70539+:1029C0002404FFFF8F8400448C87002424FF00012F
70540+:1029D000AC9F00241251012F8F8D00308DB10074F7
70541+:1029E0001232012C3C0B00808E0E000001CB5024D3
70542+:1029F00015400075000000008E0300142411FFFF35
70543+:102A0000107100073C0808003C0608008CC6319095
70544+:102A100000C8C0241300015202602021A380006876
70545+:102A20008E0300003C19000100792024108000135F
70546+:102A30003C1F0080007FA02416800009020028218E
70547+:102A4000026020212411001A0E001A4AA391006886
70548+:102A50002407FFFF1047FF9F2404FFFF02002821E7
70549+:102A6000026020210E001A6A240600012410FFFFD4
70550+:102A70001050FF982404FFFF241400018F8D0044A0
70551+:102A8000026020210280302195A900342405000134
70552+:102A9000253200010E0019A9A5B200340000202142
70553+:102AA0008F8500380A001D320080A0218F90004CD5
70554+:102AB0003C1408008E9431B08E07001030E53FFFC3
70555+:102AC00000B4C82B132000618F8600502412FF80B1
70556+:102AD00090C9000D0249682431A400FF5080005CB9
70557+:102AE000026020218F8C00541180000700078B8228
70558+:102AF0008F8500388F82FCC094BF0080944A000A02
70559+:102B0000515F00F78F8600403227000314E0006415
70560+:102B100000000000920E000211C000D8000000006A
70561+:102B20008E0B0024156000D902602021920400035E
70562+:102B300024190002308500FF14B90005308900FF18
70563+:102B40008F940054128000EA240D002C308900FF7D
70564+:102B5000392C00102D8400012D3200010244302553
70565+:102B6000020028210E001A6A026020212410FFFFB3
70566+:102B7000105000BF8F8500388F830054106000D341
70567+:102B8000240500013C0A08008D4A318C0143F82BD2
70568+:102B900017E000B22402002D02602021000028214D
70569+:102BA0000E0019A9240600018F85003800001821A5
70570+:102BB0000A001D320060A0210E0018750000000000
70571+:102BC0000A001DF800000000AC8000200A001E78FA
70572+:102BD0008E03001400002821026020210E0019A994
70573+:102BE000240600010A001CC38F8500380A001DB7A7
70574+:102BF0008F8800388CAA00848CAC00843C031000C1
70575+:102C00000147F824001F91403189007F024968255F
70576+:102C100001A32825ACC50830910700012405000157
70577+:102C2000026020210E0019A930E600010A001CC331
70578+:102C30008F850038938F00482403FFFD0A001D3460
70579+:102C4000AF8F00600A001D342403FFFF02602021C3
70580+:102C50002410000D0E001A4AA390006800401821AD
70581+:102C60008F8500380A001D320060A0210E00187503
70582+:102C7000000000009783005C8F86006000402021E8
70583+:102C80003070FFFF00D010232C4A00051140FE11C8
70584+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
70585+:102CA00090CF000D31E300085460FFA192040003AF
70586+:102CB00002602021240200100E001A4AA38200683C
70587+:102CC0002403FFFF5443FF9A920400030A001F12DB
70588+:102CD0008F85003890A4000D308F000811E000951A
70589+:102CE0008F990054572000A6026020218E1F000CEF
70590+:102CF0008CB4002057F40005026020218E0D0008DE
70591+:102D00008CA7002411A7003A026020212402002091
70592+:102D1000A38200680E001A4A2412FFFF1052FEED33
70593+:102D20002404FFFF8F9F00442402FFF73C14800E11
70594+:102D300093EA000D2419FF803C03800001423824EF
70595+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
70596+:102D50008F8C006C97F200788F870044012C302113
70597+:102D6000324D7FFF000D204000C4782131E5007F07
70598+:102D700000B4C02101F94024AC68002CA711000068
70599+:102D80008CEB0028256E0001ACEE00288CEA002CAC
70600+:102D90008E02002C01426021ACEC002C8E09002C2C
70601+:102DA000ACE900308E120014ACF2003494ED003A1D
70602+:102DB00025A40001A4E4003A97E600783C1108003D
70603+:102DC0008E3131B024C3000130707FFF1211005CDE
70604+:102DD000006030218F8F0030026020212405000127
70605+:102DE0000E001934A5E600780A001EA1000020217B
70606+:102DF0008E0900142412FFFF1132006B8F8A0038F5
70607+:102E00008E0200188D4C00D0144C00650260202109
70608+:102E10008E0B00248CAE0028116E005B2402002172
70609+:102E20000E001A4AA38200681452FFBE2404FFFF5A
70610+:102E30008F8500380A001D320080A0212402001F67
70611+:102E40000E001A4AA38200682409FFFF1049FEA160
70612+:102E50002404FFFF0A001E548F83005402602021C7
70613+:102E60000E001A4AA38200681450FF508F85003864
70614+:102E70002403FFFF0A001D320060A0218CD800242B
70615+:102E80008E0800241118FF29026020210A001F2744
70616+:102E90002402000F8E0900003C05008001259024CB
70617+:102EA0001640FF492402001A026020210E001A4A2F
70618+:102EB000A3820068240CFFFF144CFECF2404FFFF04
70619+:102EC0008F8500380A001D320080A0210E001934C1
70620+:102ED000026020218F8500380A001EE500001821BD
70621+:102EE0002403FFFD0060A0210A001D32AF860060B0
70622+:102EF000026020210E001A4AA38D00682403FFFF00
70623+:102F00001043FF588F8500380A001ECC920400033E
70624+:102F10002418001D0E001A4AA39800682403FFFF1E
70625+:102F20001443FE9D2404FFFF8F8500380A001D32E4
70626+:102F30000080A021026020210A001F3D24020024FD
70627+:102F4000240880000068C024330BFFFF000B73C20D
70628+:102F500031D000FF001088270A001F6E001133C017
70629+:102F6000240F001B0E001A4AA38F00681451FEACF8
70630+:102F70002404FFFF8F8500380A001D320080A02145
70631+:102F80000A001F3D240200278E0600288CA3002C77
70632+:102F900010C30008026020210A001F812402001FC4
70633+:102FA0000A001F812402000E026020210A001F81F6
70634+:102FB000240200258E04002C1080000D8F8F00301D
70635+:102FC0008DE800740104C02B5700000C0260202122
70636+:102FD0008CB900140086A0210334282B10A0FF52C6
70637+:102FE0008F9F0044026020210A001F8124020022DA
70638+:102FF000026020210A001F81240200230A001F8191
70639+:103000002402002627BDFFD8AFB3001CAFB10014C7
70640+:10301000AFBF0020AFB20018AFB000103C0280007C
70641+:103020008C5201408C4B01483C048000000B8C0208
70642+:10303000322300FF317300FF8C8501B804A0FFFE2E
70643+:1030400034900180AE1200008C8701442464FFF0AC
70644+:10305000240600022C830013AE070004A61100080A
70645+:10306000A206000BAE1300241060004F8FBF00209B
70646+:10307000000448803C0A0801254A9534012A402171
70647+:103080008D04000000800008000000003C030800E0
70648+:103090008C6331A831693FFF00099980007280215B
70649+:1030A000021370212405FF80264D0100264C00806C
70650+:1030B0003C02800031B1007F3198007F31CA007F2F
70651+:1030C0003C1F800A3C1980043C0F800C01C5202461
70652+:1030D00001A5302401853824014F1821AC46002475
70653+:1030E000023F402103194821AC470090AC4400281E
70654+:1030F000AF830044AF880038AF8900300E0019005C
70655+:10310000016080213C0380008C6B01B80560FFFEEC
70656+:103110008F8700448F8600383465018090E8000D69
70657+:10312000ACB20000A4B0000600082600000416039C
70658+:1031300000029027001227C21080008124C200885C
70659+:10314000241F6082A4BF0008A0A000052402000282
70660+:10315000A0A2000B8F8B0030000424003C08270045
70661+:1031600000889025ACB20010ACA00014ACA00024E4
70662+:10317000ACA00028ACA0002C8D6900382413FF807F
70663+:10318000ACA9001890E3000D02638024320500FF13
70664+:1031900010A000058FBF002090ED000D31AC007F26
70665+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
70666+:1031B0008FB100148FB000103C0A10003C0E80004C
70667+:1031C00027BD002803E00008ADCA01B8265F010052
70668+:1031D0002405FF8033F8007F3C06800003E5782457
70669+:1031E0003C19800A03192021ACCF0024908E00D412
70670+:1031F00000AE682431AC00FF11800024AF84003899
70671+:10320000248E008895CD00123C0C08008D8C31A8CE
70672+:1032100031AB3FFF01924821000B5180012A402130
70673+:1032200001052024ACC400283107007F3C06800C37
70674+:1032300000E620219083000D00A31024304500FFFC
70675+:1032400010A0FFD8AF8400449098000D330F0010F9
70676+:1032500015E0FFD58FBF00200E0019000000000010
70677+:103260003C0380008C7901B80720FFFE00000000BD
70678+:10327000AE1200008C7F0144AE1F0004A6110008AE
70679+:1032800024110002A211000BAE1300243C1308010C
70680+:10329000927396F0327000015200FFC38FBF00207E
70681+:1032A0000E002146024020210A0020638FBF00202B
70682+:1032B0003C1260008E452C083C03F0033462FFFF93
70683+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
70684+:1032D00003199825AE532C080A0020638FBF0020E5
70685+:1032E000264D010031AF007F3C10800A240EFF8084
70686+:1032F00001F0282101AE60243C0B8000AD6C00245D
70687+:103300001660FFA8AF85003824110003A0B100FCAF
70688+:103310000A0020638FBF002026480100310A007F89
70689+:103320003C0B800A2409FF80014B30210109202435
70690+:103330003C078000ACE400240A002062AF8600381D
70691+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
70692+:10335000241F608290D900D42418FF800319782498
70693+:1033600031EA00FF1140FF7700000000240700044D
70694+:10337000A0C700FC8F870044241160842406000D40
70695+:10338000A4B10008A0A600050A00204D24020002F6
70696+:103390003C040001248496DC24030014240200FE73
70697+:1033A0003C010800AC2431EC3C010800AC2331E8BE
70698+:1033B0003C010801A42296F83C040801248496F8F4
70699+:1033C0000000182100643021A0C300042463000120
70700+:1033D0002C6500FF54A0FFFC006430213C0708006E
70701+:1033E00024E7010003E00008AF87007800A058211F
70702+:1033F000008048210000102114A00012000050217C
70703+:103400000A002142000000003C010801A42096F8B7
70704+:103410003C05080194A596F88F8200783C0C0801C1
70705+:10342000258C96F800E2182100AC2021014B302BAE
70706+:10343000A089000400001021A460000810C0003919
70707+:10344000010048218F8600780009384000E94021BA
70708+:103450000008388000E6282190A8000B90B9000AE7
70709+:103460000008204000881021000218800066C0215A
70710+:10347000A319000A8F85007800E5782191EE000AF3
70711+:1034800091E6000B000E684001AE6021000C208028
70712+:1034900000851021A046000B3C030801906396F2C2
70713+:1034A000106000222462FFFF8F8300383C01080176
70714+:1034B000A02296F2906C00FF118000040000000032
70715+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
70716+:1034D000973996F8272300013078FFFF2F0F00FF60
70717+:1034E00011E0FFC9254A00013C010801A42396F818
70718+:1034F0003C05080194A596F88F8200783C0C0801E1
70719+:10350000258C96F800E2182100AC2021014B302BCD
70720+:10351000A089000400001021A460000814C0FFC9A5
70721+:103520000100482103E000080000000003E000085B
70722+:103530002402000227BDFFE0248501002407FF804C
70723+:10354000AFB00010AFBF0018AFB1001400A718242F
70724+:103550003C10800030A4007F3C06800A00862821B1
70725+:103560008E110024AE03002490A200FF1440000836
70726+:10357000AF850038A0A000098FBF0018AE1100244D
70727+:103580008FB100148FB0001003E0000827BD0020A9
70728+:1035900090A900FD90A800FF312400FF0E0020F448
70729+:1035A000310500FF8F8500388FBF0018A0A00009EB
70730+:1035B000AE1100248FB100148FB0001003E000089A
70731+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
70732+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
70733+:1035E0003C0980009533011635320C00952F011AE5
70734+:1035F0003271FFFF023280218E08000431EEFFFF9E
70735+:10360000248B0100010E6821240CFF8025A5FFFFFB
70736+:10361000016C50243166007F3C07800AAD2A0024EB
70737+:1036200000C73021AF850074AF8800703C010801ED
70738+:10363000A02096F190C300090200D02100809821BB
70739+:10364000306300FF2862000510400048AF86003854
70740+:10365000286400021480008E24140001240D00054B
70741+:103660003C010801A02D96D590CC00FD3C0108013D
70742+:10367000A02096D63C010801A02096D790CB000A46
70743+:10368000240AFF80318500FF014B4824312700FFC9
70744+:1036900010E0000C000058213C12800836510080D8
70745+:1036A0008E2F00308CD0005C01F0702305C0018E9D
70746+:1036B0008F87007090D4000A3284007FA0C4000A73
70747+:1036C0008F8600383C118008363000808E0F003025
70748+:1036D0008F87007000EF702319C000EE000000001B
70749+:1036E00090D4000924120002328400FF1092024795
70750+:1036F000000000008CC2005800E2F82327F9FFFF09
70751+:103700001B2001300000000090C5000924080004BF
70752+:1037100030A300FF10680057240A00013C01080193
70753+:10372000A02A96D590C900FF252700013C01080179
70754+:10373000A02796D43C030801906396D52406000583
70755+:103740001066006A2C780005130000C40000902168
70756+:103750000003F8803C0408012484958003E4C82118
70757+:103760008F25000000A0000800000000241800FFC2
70758+:103770001078005C0000000090CC000A90CA00099C
70759+:103780003C080801910896F13187008000EA48253D
70760+:103790003C010801A02996DC90C500FD3C140801FD
70761+:1037A000929496F2311100013C010801A02596DDAA
70762+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
70763+:1037C0003C010801A03296DF8CD900543C0108016D
70764+:1037D000AC3996E08CD000583C010801AC3096E43E
70765+:1037E0008CC3005C3C010801AC3496EC3C01080140
70766+:1037F000AC2396E8162000088FBF002C8FB4002859
70767+:103800008FB300248FB200208FB1001C8FB000183E
70768+:1038100003E0000827BD00303C1180009624010E13
70769+:103820000E000FD43094FFFF3C0B08018D6B96F413
70770+:103830000260382102802821AE2B01803C13080150
70771+:103840008E7396D401602021240600830E00102F71
70772+:10385000AFB300108FBF002C8FB400288FB30024AB
70773+:103860008FB200208FB1001C8FB0001803E0000859
70774+:1038700027BD00303C1808008F1831FC270F0001CD
70775+:103880003C010800AC2F31FC0A0021D700000000E9
70776+:103890001474FFB900000000A0C000FF3C05080040
70777+:1038A0008CA531E43C0308008C6331E03C02080045
70778+:1038B0008C4232048F99003834A80001241F000282
70779+:1038C0003C010801AC2396F43C010801A02896F0C5
70780+:1038D0003C010801A02296F3A33F00090A002190B1
70781+:1038E0008F8600380E002146000000000A0021D714
70782+:1038F0008F8600383C1F080193FF96D424190001DD
70783+:1039000013F902298F8700703C100801921096D895
70784+:103910003C06080190C696D610C000050200A02102
70785+:103920003C040801908496D9109001E48F870078B8
70786+:10393000001088408F9F0078023048210009C8801D
70787+:10394000033F702195D80008270F0001A5CF00087C
70788+:103950003C040801908496D93C05080190A596D6B0
70789+:103960000E0020F4000000008F8700780230202134
70790+:103970000004308000C720218C8500048F820074F1
70791+:1039800000A2402305020006AC8200048C8A0000DD
70792+:103990008F830070014310235C400001AC83000062
70793+:1039A0008F86003890CB00FF2D6C00025580002DD3
70794+:1039B000241400010230F821001F40800107282153
70795+:1039C00090B9000B8CAE00040019C0400319782197
70796+:1039D000000F1880006710218C4D000001AE882375
70797+:1039E0002630FFFF5E00001F241400018C440004F9
70798+:1039F0008CAA0000008A482319200019240E000414
70799+:103A00003C010801A02E96D590AD000B8CAB0004B4
70800+:103A1000000D8840022D80210010108000471021E9
70801+:103A20008C44000401646023058202009443000872
70802+:103A300090DF00FE90B9000B33E500FF54B900049D
70803+:103A40000107A021A0D400FE8F8700780107A021E4
70804+:103A50009284000B0E0020F4240500018F860038AC
70805+:103A600024140001125400962E500001160000424A
70806+:103A70003C08FFFF241900021659FF3F0000000018
70807+:103A8000A0C000FF8F860038A0D200090A0021D70D
70808+:103A90008F86003890C700092404000230E300FF3D
70809+:103AA0001064016F24090004106901528F880074AA
70810+:103AB0008CCE0054010E682325B10001062001754B
70811+:103AC000241800043C010801A03896D53C010801E7
70812+:103AD000A02096D490D400FD90D200FF2E4F00027B
70813+:103AE00015E0FF14328400FF000438408F8900780D
70814+:103AF00090DF00FF00E41021000220800089C8212F
70815+:103B00002FE500029324000B14A0FF0A24070002F3
70816+:103B100000041840006480210010588001692821A9
70817+:103B20008CAC0004010C50230540FF020000000093
70818+:103B30003C030801906396D614600005246F0001D1
70819+:103B40003C010801A02496D93C010801A02796D782
70820+:103B50003C010801A02F96D690CE00FF24E700017B
70821+:103B600031CD00FF01A7882B1220FFE990A4000BA4
70822+:103B70000A0021C6000000003C0508018CA596D46F
70823+:103B80003C12000400A8F82413F2000624020005E9
70824+:103B90003C090801912996D5152000022402000352
70825+:103BA000240200053C010801A02296F190C700FF05
70826+:103BB00014E0012024020002A0C200090A0021D75B
70827+:103BC0008F86003890CC00FF1180FEDA240A0001B5
70828+:103BD0008F8C00748F890078240F00030180682186
70829+:103BE0001160001E240E0002000540400105A021C6
70830+:103BF00000142080008990218E51000401918023BF
70831+:103C00000600FECC000000003C020801904296D65F
70832+:103C100014400005245800013C010801A02A96D751
70833+:103C20003C010801A02596D93C010801A03896D690
70834+:103C300090DF00FF010510210002C88033E500FF7E
70835+:103C4000254A00010329202100AA402B1500FEB9B6
70836+:103C50009085000B1560FFE50005404000054040E1
70837+:103C600001051821000310803C010801A02A96D408
70838+:103C70003C010801A02596D8004918218C64000455
70839+:103C800000E4F82327F9FFFF1F20FFE900000000F0
70840+:103C90008C63000000E358230560013A01A38823E8
70841+:103CA00010E301170184C0231B00FEA200000000E6
70842+:103CB0003C010801A02E96D50A002305240B000123
70843+:103CC000240E0004A0CE00093C0D08008DAD31F893
70844+:103CD0008F86003825A200013C010800AC2231F893
70845+:103CE0000A0021D7000000008CD9005C00F9C02335
70846+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
70847+:103D00008F8400748CC3005C008340232502000173
70848+:103D10001C40FF60000000008CC9005C248700018B
70849+:103D200000E9282B10A0FE943C0D80008DAB01040F
70850+:103D30003C0C0001016C50241140FE8F2402001045
70851+:103D40003C010801A02296F10A0021D700000000E2
70852+:103D50008F9100748F86003826220001ACC2005C6F
70853+:103D60000A002292241400018F8700382404FF8067
70854+:103D70000000882190E9000A241400010124302564
70855+:103D8000A0E6000A3C05080190A596D63C0408016F
70856+:103D9000908496D90E0020F4000000008F86003831
70857+:103DA0008F85007890C800FD310700FF0007404074
70858+:103DB0000107F821001FC0800305C8219323000BD1
70859+:103DC000A0C300FD8F8500788F8600380305602131
70860+:103DD000918F000B000F704001CF6821000D808093
70861+:103DE000020510218C4B0000ACCB00548D840004E4
70862+:103DF0008F83007400645023194000022482000164
70863+:103E00002462000101074821ACC2005C0009308037
70864+:103E100000C5402100E02021240500010E0020F40F
70865+:103E20009110000B8F86003890C500FF10A0FF0C8A
70866+:103E3000001070408F85007801D06821000D10803F
70867+:103E4000004558218D6400008F8C0074018450233C
70868+:103E50002547000104E0FF02263100013C03080170
70869+:103E6000906396D62E2F0002247800013C010801B1
70870+:103E7000A03896D63C010801A03496D711E0FEF890
70871+:103E8000020038210A002365000740408F84003873
70872+:103E90008F8300748C85005800A340230502FE9A8E
70873+:103EA000AC8300580A00223B000000003C070801D8
70874+:103EB00090E796F2240200FF10E200BE8F860038E1
70875+:103EC0003C110801963196FA3C030801246396F8E8
70876+:103ED000262500013230FFFF30ABFFFF02036021D7
70877+:103EE0002D6A00FF1540008D918700043C010801F8
70878+:103EF000A42096FA8F88003800074840012728211F
70879+:103F0000911800FF000530802405000127140001EE
70880+:103F1000A11400FF3C120801925296F28F8800789B
70881+:103F20008F8E0070264F000100C820213C0108013F
70882+:103F3000A02F96F2AC8E00008F8D0074A48500082F
70883+:103F4000AC8D00043C030801906396D414600077A4
70884+:103F5000000090213C010801A02596D4A087000B09
70885+:103F60008F8C007800CC5021A147000A8F82003846
70886+:103F7000A04700FD8F840038A08700FE8F860038A0
70887+:103F80008F9F0070ACDF00548F990074ACD900583B
70888+:103F90008F8D00780127C02100185880016DA02165
70889+:103FA000928F000A000F704001CF18210003888013
70890+:103FB000022D8021A207000B8F8600780166602108
70891+:103FC000918A000B000A1040004A2021000428803A
70892+:103FD00000A64021A107000A3C07800834E90080C0
70893+:103FE0008D2200308F860038ACC2005C0A0022921D
70894+:103FF0002414000190CA00FF1540FEAD8F880074A4
70895+:10400000A0C400090A0021D78F860038A0C000FD97
70896+:104010008F98003824060001A30000FE3C0108012F
70897+:10402000A02696D53C010801A02096D40A0021C6FE
70898+:104030000000000090CB00FF3C040801908496F340
70899+:10404000316C00FF0184502B1540000F2402000347
70900+:1040500024020004A0C200090A0021D78F8600387C
70901+:1040600090C3000A2410FF8002035824316C00FF23
70902+:104070001180FDC1000000003C010801A02096D580
70903+:104080000A0021C600000000A0C200090A0021D7D2
70904+:104090008F86003890D4000A2412FF8002544824EE
70905+:1040A000312800FF1500FFF4240200083C0108013C
70906+:1040B000A02296F10A0021D70000000000108840DD
70907+:1040C0008F8B0070023018210003688001A7202127
70908+:1040D000AC8B00008F8A0074240C0001A48C0008B3
70909+:1040E000AC8A00043C05080190A596D62402000184
70910+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
70911+:104100000184A0231A80FD8B000000003C010801FF
70912+:10411000A02E96D50A002305240B00013C010801BE
70913+:10412000A42596FA0A0023B78F880038240B0001D3
70914+:10413000106B00228F9800388F85003890BF00FFE9
70915+:1041400033F900FF1079002B000000003C1F08012C
70916+:1041500093FF96D8001FC840033FC0210018A080DD
70917+:104160000288782191EE000AA08E000A8F8D0078D7
70918+:104170003C030801906396D800CD88210A0023DD16
70919+:10418000A223000B263000010600003101A4902379
70920+:104190000640002B240200033C010801A02F96D505
70921+:1041A0000A002305240B00018F8900380A00223BF6
70922+:1041B000AD2700540A00229124120001931400FD3F
70923+:1041C000A094000B8F8800388F8F0078910E00FE2E
70924+:1041D00000CF6821A1AE000A8F910038A22700FD10
70925+:1041E0008F8300708F900038AE0300540A0023DEE6
70926+:1041F0008F8D007890B000FEA090000A8F8B003861
70927+:104200008F8C0078916A00FD00CC1021A04A000B31
70928+:104210008F840038A08700FE8F8600748F85003859
70929+:10422000ACA600580A0023DE8F8D007894B80008F1
70930+:10423000ACA40004030378210A002285A4AF00087F
70931+:104240003C010801A02296D50A0021C6000000000A
70932+:1042500090CF0009240D000431EE00FF11CDFD8543
70933+:10426000240200013C010801A02296D50A0021C6C3
70934+:1042700000000000080033440800334408003420E4
70935+:10428000080033F4080033D8080033280800332826
70936+:10429000080033280800334C8008010080080080A3
70937+:1042A000800800005F865437E4AC62CC50103A4579
70938+:1042B00036621985BF14C0E81BC27A1E84F4B55655
70939+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
70940+:1042D00008005AB808005A5C08005A5C08005A5C8A
70941+:1042E00008005A5C08005A7408005A5C08005A5CBE
70942+:1042F00008005AC008005A5C080059D408005A5CEB
70943+:1043000008005A5C08005AC008005A5C08005A5C51
70944+:1043100008005A5C08005A5C08005A5C08005A5CA5
70945+:1043200008005A5C08005A5C08005A5C08005A5C95
70946+:1043300008005A9408005A5C08005A9408005A5C15
70947+:1043400008005A5C08005A5C08005A9808005A9401
70948+:1043500008005A5C08005A5C08005A5C08005A5C65
70949+:1043600008005A5C08005A5C08005A5C08005A5C55
70950+:1043700008005A5C08005A5C08005A5C08005A5C45
70951+:1043800008005A5C08005A5C08005A5C08005A5C35
70952+:1043900008005A5C08005A5C08005A5C08005A5C25
70953+:1043A00008005A9808005A9808005A5C08005A9861
70954+:1043B00008005A5C08005A5C08005A5C08005A5C05
70955+:1043C00008005A5C08005A5C08005A5C08005A5CF5
70956+:1043D00008005A5C08005A5C08005A5C08005A5CE5
70957+:1043E00008005A5C08005A5C08005A5C08005A5CD5
70958+:1043F00008005A5C08005A5C08005A5C08005A5CC5
70959+:1044000008005A5C08005A5C08005A5C08005A5CB4
70960+:1044100008005A5C08005A5C08005A5C08005A5CA4
70961+:1044200008005A5C08005A5C08005A5C08005A5C94
70962+:1044300008005A5C08005A5C08005A5C08005A5C84
70963+:1044400008005A5C08005A5C08005A5C08005A5C74
70964+:1044500008005A5C08005A5C08005A5C08005A5C64
70965+:1044600008005A5C08005A5C08005A5C08005A5C54
70966+:1044700008005A5C08005A5C08005A5C08005A5C44
70967+:1044800008005A5C08005A5C08005A5C08005A5C34
70968+:1044900008005A5C08005A5C08005A5C08005A5C24
70969+:1044A00008005A5C08005A5C08005A5C08005A5C14
70970+:1044B00008005A5C08005A5C08005A5C08005A5C04
70971+:1044C00008005A5C08005A5C08005A5C08005ADC74
70972+:1044D0000800782C08007A900800783808007628C0
70973+:1044E00008007838080078C4080078380800762872
70974+:1044F0000800762808007628080076280800762824
70975+:104500000800762808007628080076280800762813
70976+:1045100008007628080078580800784808007628AF
70977+:1045200008007628080076280800762808007628F3
70978+:1045300008007628080076280800762808007628E3
70979+:1045400008007628080076280800762808007848B1
70980+:10455000080082FC08008188080082C40800818865
70981+:104560000800829408008070080081880800818813
70982+:1045700008008188080081880800818808008188F7
70983+:1045800008008188080081880800818808008188E7
70984+:104590000800818808008188080081B008008D34F7
70985+:1045A00008008E9008008E70080088D808008D4C96
70986+:1045B0000A00012400000000000000000000000DBF
70987+:1045C000747061362E322E31620000000602010145
70988+:1045D00000000000000000000000000000000000DB
70989+:1045E00000000000000000000000000000000000CB
70990+:1045F00000000000000000000000000000000000BB
70991+:1046000000000000000000000000000000000000AA
70992+:10461000000000000000000000000000000000009A
70993+:10462000000000000000000000000000000000008A
70994+:10463000000000000000000000000000000000007A
70995+:104640000000000010000003000000000000000D4A
70996+:104650000000000D3C020800244217203C03080023
70997+:1046600024632A10AC4000000043202B1480FFFD7F
70998+:10467000244200043C1D080037BD2FFC03A0F0219C
70999+:104680003C100800261004903C1C0800279C1720B2
71000+:104690000E000262000000000000000D2402FF80F6
71001+:1046A00027BDFFE000821024AFB00010AF42002011
71002+:1046B000AFBF0018AFB10014936500043084007FD1
71003+:1046C000034418213C0200080062182130A5002094
71004+:1046D000036080213C080111277B000814A0000220
71005+:1046E0002466005C2466005892020004974301048B
71006+:1046F000920400043047000F3063FFFF3084004015
71007+:10470000006728231080000900004821920200055C
71008+:1047100030420004104000050000000010A000031B
71009+:104720000000000024A5FFFC2409000492020005FB
71010+:1047300030420004104000120000000010A00010E1
71011+:10474000000000009602000200A72021010440257D
71012+:104750002442FFFEA7421016920300042402FF80A9
71013+:1047600000431024304200FF104000033C020400CC
71014+:104770000A000174010240258CC20000AF421018EB
71015+:104780008F4201780440FFFE2402000AA742014044
71016+:1047900096020002240400093042000700021023A0
71017+:1047A00030420007A7420142960200022442FFFE67
71018+:1047B000A7420144A740014697420104A74201488D
71019+:1047C0008F420108304200205040000124040001C3
71020+:1047D00092020004304200101440000234830010A2
71021+:1047E00000801821A743014A0000000000000000DB
71022+:1047F0000000000000000000AF48100000000000B2
71023+:104800000000000000000000000000008F421000C7
71024+:104810000441FFFE3102FFFF1040000700000000CE
71025+:1048200092020004304200401440000300000000E7
71026+:104830008F421018ACC20000960200063042FFFF03
71027+:10484000244200020002104300021040036288214B
71028+:10485000962200001120000D3044FFFF00A7102118
71029+:104860008F8300388F45101C0002108200021080D8
71030+:1048700000431021AC45000030A6FFFF0E00058D5F
71031+:1048800000052C0200402021A62200009203000413
71032+:104890002402FF8000431024304200FF1040001F1C
71033+:1048A0000000000092020005304200021040001B90
71034+:1048B000000000009742100C2442FFFEA742101691
71035+:1048C000000000003C02040034420030AF421000FF
71036+:1048D00000000000000000000000000000000000D8
71037+:1048E0008F4210000441FFFE000000009742100CB0
71038+:1048F0008F45101C3042FFFF24420030000210821E
71039+:1049000000021080005B1021AC45000030A6FFFFC4
71040+:104910000E00058D00052C02A62200009604000260
71041+:10492000248400080E0001E93084FFFF974401044D
71042+:104930000E0001F73084FFFF8FBF00188FB1001405
71043+:104940008FB000103C02100027BD002003E00008DB
71044+:10495000AF4201783084FFFF308200078F8500244A
71045+:1049600010400002248300073064FFF800A41021E7
71046+:1049700030421FFF03421821247B4000AF850028EE
71047+:10498000AF82002403E00008AF4200843084FFFFC0
71048+:104990003082000F8F85002C8F860034104000027B
71049+:1049A0002483000F3064FFF000A410210046182B70
71050+:1049B000AF8500300046202314600002AF82002C37
71051+:1049C000AF84002C8F82002C340480000342182115
71052+:1049D00000641821AF83003803E00008AF42008074
71053+:1049E0008F820014104000088F8200048F82FFDC49
71054+:1049F000144000058F8200043C02FFBF3442FFFFD9
71055+:104A0000008220248F82000430430006240200022A
71056+:104A10001062000F3C0201012C62000350400005AF
71057+:104A2000240200041060000F3C0200010A00023062
71058+:104A30000000000010620005240200061462000C51
71059+:104A40003C0201110A000229008210253C020011DB
71060+:104A500000821025AF421000240200010A0002303B
71061+:104A6000AF82000C00821025AF421000AF80000C16
71062+:104A700000000000000000000000000003E000084B
71063+:104A8000000000008F82000C1040000400000000B5
71064+:104A90008F4210000441FFFE0000000003E0000808
71065+:104AA000000000008F8200102443F800000231C291
71066+:104AB00024C2FFF02C6303011060000300021042C7
71067+:104AC0000A000257AC8200008F85001800C5102B29
71068+:104AD0001440000B0000182100C5102324470001DA
71069+:104AE0008F82001C00A210212442FFFF0046102BE1
71070+:104AF000544000042402FFFF0A000257AC87000064
71071+:104B00002402FFFF0A000260AC8200008C820000D9
71072+:104B10000002194000621821000318800062182169
71073+:104B2000000318803C0208002442175C0062182130
71074+:104B300003E000080060102127BDFFD8AFBF0020B0
71075+:104B4000AFB1001CAFB000183C0460088C8250006C
71076+:104B50002403FF7F3C066000004310243442380CDD
71077+:104B6000AC8250008CC24C1C3C1A80000002160221
71078+:104B70003042000F10400007AF82001C8CC34C1C59
71079+:104B80003C02001F3442FC0000621824000319C2DA
71080+:104B9000AF8300188F420008275B400034420001B9
71081+:104BA000AF420008AF8000243C02601CAF40008090
71082+:104BB000AF4000848C4500088CC308083402800094
71083+:104BC000034220212402FFF0006218243C020080EE
71084+:104BD0003C010800AC2204203C025709AF84003895
71085+:104BE00014620004AF850034240200010A0002921E
71086+:104BF000AF820014AF8000148F42000038420001E1
71087+:104C0000304200011440FFFC8F8200141040001657
71088+:104C10000000000097420104104000058F8300004F
71089+:104C2000146000072462FFFF0A0002A72C62000A3A
71090+:104C30002C620010504000048F83000024620001A9
71091+:104C4000AF8200008F8300002C62000A1440000332
71092+:104C50002C6200070A0002AEAF80FFDC10400002A9
71093+:104C600024020001AF82FFDC8F4301088F44010062
71094+:104C700030622000AF83000410400008AF840010B1
71095+:104C80003C0208008C42042C244200013C01080034
71096+:104C9000AC22042C0A00058A3C0240003065020068
71097+:104CA00014A0000324020F001482026024020D00ED
71098+:104CB00097420104104002C83C02400030624000AC
71099+:104CC000144000AD8F8200388C4400088F42017878
71100+:104CD0000440FFFE24020800AF42017824020008CD
71101+:104CE000A7420140A7400142974201048F8400047B
71102+:104CF0003051FFFF30820001104000070220802168
71103+:104D00002623FFFE240200023070FFFFA742014667
71104+:104D10000A0002DBA7430148A74001463C02080005
71105+:104D20008C42043C1440000D8F8300103082002020
71106+:104D30001440000224030009240300010060202124
71107+:104D40008F830010240209005062000134840004A3
71108+:104D5000A744014A0A0002F60000000024020F00E6
71109+:104D60001462000530820020144000062403000D68
71110+:104D70000A0002F524030005144000022403000980
71111+:104D800024030001A743014A3C0208008C4204208E
71112+:104D90003C0400480E00020C004420250E000235A1
71113+:104DA000000000008F82000C1040003E0000000058
71114+:104DB0008F4210003C0300200043102410400039B3
71115+:104DC0008F820004304200021040003600000000D4
71116+:104DD000974210141440003300000000974210085E
71117+:104DE0008F8800383042FFFF2442000600021882FC
71118+:104DF0000003388000E83021304300018CC40000FB
71119+:104E000010600004304200030000000D0A00033768
71120+:104E100000E81021544000103084FFFF3C05FFFFE4
71121+:104E200000852024008518260003182B0004102B71
71122+:104E300000431024104000050000000000000000A6
71123+:104E40000000000D00000000240002228CC20000BF
71124+:104E50000A000336004520253883FFFF0003182B86
71125+:104E60000004102B00431024104000050000000037
71126+:104E7000000000000000000D000000002400022BD4
71127+:104E80008CC200003444FFFF00E81021AC44000055
71128+:104E90003C0208008C420430244200013C0108001E
71129+:104EA000AC2204308F6200008F840038AF8200088B
71130+:104EB0008C8300003402FFFF1462000F00001021F9
71131+:104EC0003C0508008CA504543C0408008C84045064
71132+:104ED00000B0282100B0302B008220210086202144
71133+:104EE0003C010800AC2504543C010800AC240450EB
71134+:104EF0000A000580240400088C8200003042010072
71135+:104F00001040000F000010213C0508008CA5044C47
71136+:104F10003C0408008C84044800B0282100B0302BE9
71137+:104F200000822021008620213C010800AC25044C91
71138+:104F30003C010800AC2404480A0005802404000851
71139+:104F40003C0508008CA504443C0408008C84044003
71140+:104F500000B0282100B0302B0082202100862021C3
71141+:104F60003C010800AC2504443C010800AC2404408A
71142+:104F70000A000580240400088F6200088F62000088
71143+:104F800000021602304300F02402003010620005D7
71144+:104F900024020040106200E08F8200200A00058891
71145+:104FA0002442000114A000050000000000000000E1
71146+:104FB0000000000D00000000240002568F4201781E
71147+:104FC0000440FFFE000000000E00023D27A4001078
71148+:104FD0001440000500408021000000000000000D8A
71149+:104FE000000000002400025D8E0200001040000559
71150+:104FF00000000000000000000000000D00000000A4
71151+:10500000240002608F62000C0443000324020001AC
71152+:105010000A00042EAE000000AE0200008F820038AD
71153+:105020008C480008A20000078F65000C8F64000404
71154+:1050300030A3FFFF0004240200852023308200FFFC
71155+:105040000043102124420005000230832CC200815D
71156+:10505000A605000A14400005A20400040000000098
71157+:105060000000000D00000000240002788F85003849
71158+:105070000E0005AB260400148F6200048F43010864
71159+:10508000A60200083C02100000621824106000080C
71160+:105090000000000097420104920300072442FFEC45
71161+:1050A000346300023045FFFF0A0003C3A203000778
71162+:1050B000974201042442FFF03045FFFF96060008A6
71163+:1050C0002CC200135440000592030007920200070F
71164+:1050D00034420001A20200079203000724020001EB
71165+:1050E00010620005240200031062000B8F8200385A
71166+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
71167+:105100008C43000C0064182400651825AC43000C87
71168+:105110000A0003E030C6FFFF3C04FFFF8C43001091
71169+:105120000064182400651825AC43001030C6FFFF4A
71170+:1051300024C2000200021083A20200058F830038FF
71171+:10514000304200FF00021080004328218CA800009C
71172+:105150008CA2000024030004000217021443001272
71173+:1051600000000000974201043C03FFFF01031824E4
71174+:105170003042FFFF004610232442FFFE006240251C
71175+:10518000ACA8000092030005306200FF000210800E
71176+:1051900000501021904200143042000F00431021B3
71177+:1051A0000A000415A20200068CA400049742010420
71178+:1051B0009603000A3088FFFF3042FFFF00461023AD
71179+:1051C0002442FFD60002140001024025ACA80004CE
71180+:1051D000920200079204000524630028000318834C
71181+:1051E0000064182134420004A2030006A202000752
71182+:1051F0008F8200042403FFFB34420002004310248A
71183+:10520000AF820004920300068F87003800031880E5
71184+:10521000007010218C4400203C02FFF63442FFFF56
71185+:105220000082402400671821AE04000CAC68000C1A
71186+:10523000920500063C03FF7F8E02000C00052880CB
71187+:1052400000B020213463FFFF01033024948800263E
71188+:1052500000A7282100431024AE02000CAC860020D9
71189+:10526000AC880024ACA8001024020010A742014022
71190+:1052700024020002A7400142A7400144A742014680
71191+:10528000974201043C0400082442FFFEA742014863
71192+:10529000240200010E00020CA742014A9603000AF4
71193+:1052A0009202000400431021244200023042000711
71194+:1052B00000021023304200070E000235AE0200103B
71195+:1052C0008F6200003C0308008C6304442404001037
71196+:1052D000AF820008974201043042FFFF2442FFFEE4
71197+:1052E00000403821000237C33C0208008C420440D1
71198+:1052F000006718210067282B004610210045102167
71199+:105300003C010800AC2304443C010800AC220440EA
71200+:105310000A0005150000000014A0000500000000B0
71201+:10532000000000000000000D000000002400030A3F
71202+:105330008F4201780440FFFE000000000E00023D95
71203+:1053400027A4001414400005004080210000000044
71204+:105350000000000D00000000240003118E02000078
71205+:105360005440000692020007000000000000000DFB
71206+:10537000000000002400031C9202000730420004D9
71207+:10538000104000058F8200042403FFFB344200021A
71208+:1053900000431024AF8200048F620004044300081D
71209+:1053A00092020007920200068E03000CAE0000007D
71210+:1053B0000002108000501021AC4300209202000730
71211+:1053C00030420004544000099602000A920200058F
71212+:1053D0003C03000100021080005010218C46001890
71213+:1053E00000C33021AC4600189602000A9206000461
71214+:1053F000277100080220202100C2302124C60005A8
71215+:10540000260500140E0005AB00063082920400064B
71216+:105410008F6500043C027FFF000420800091202162
71217+:105420008C8300043442FFFF00A228240065182169
71218+:10543000AC8300049202000792040005920300046A
71219+:10544000304200041040001496070008308400FF2A
71220+:1054500000042080009120218C86000497420104E2
71221+:105460009605000A306300FF3042FFFF0043102121
71222+:105470000045102130E3FFFF004310232442FFD8F2
71223+:1054800030C6FFFF0002140000C23025AC860004C5
71224+:105490000A0004C992030007308500FF0005288038
71225+:1054A00000B128218CA4000097420104306300FF62
71226+:1054B0003042FFFF00431021004710233C03FFFF51
71227+:1054C000008320243042FFFF00822025ACA400008E
71228+:1054D0009203000724020001106200060000000091
71229+:1054E0002402000310620011000000000A0004EC16
71230+:1054F0008E03001097420104920300049605000AEF
71231+:105500008E24000C00431021004510212442FFF29C
71232+:105510003C03FFFF008320243042FFFF0082202550
71233+:10552000AE24000C0A0004EC8E0300109742010424
71234+:10553000920300049605000A8E24001000431021F7
71235+:10554000004510212442FFEE3C03FFFF008320248E
71236+:105550003042FFFF00822025AE2400108E03001091
71237+:105560002402000AA7420140A74301429603000A11
71238+:10557000920200043C04004000431021A742014471
71239+:10558000A740014697420104A742014824020001B6
71240+:105590000E00020CA742014A0E0002350000000076
71241+:1055A0008F6200009203000400002021AF820008F7
71242+:1055B000974201049606000A3042FFFF006218215C
71243+:1055C000006028213C0308008C6304443C0208006E
71244+:1055D0008C42044000651821004410210065382BDE
71245+:1055E000004710213C010800AC2304443C010800A2
71246+:1055F000AC22044092040004008620212484000A86
71247+:105600003084FFFF0E0001E9000000009744010410
71248+:105610003084FFFF0E0001F7000000003C02100084
71249+:10562000AF4201780A0005878F820020148200278C
71250+:105630003062000697420104104000673C024000BF
71251+:105640003062400010400005000000000000000033
71252+:105650000000000D00000000240004208F420178AB
71253+:105660000440FFFE24020800AF4201782402000833
71254+:10567000A7420140A74001428F82000497430104E2
71255+:1056800030420001104000073070FFFF2603FFFE8C
71256+:1056900024020002A7420146A74301480A00053F31
71257+:1056A0002402000DA74001462402000DA742014A32
71258+:1056B0008F62000024040008AF8200080E0001E998
71259+:1056C000000000000A0005190200202110400042DD
71260+:1056D0003C02400093620000304300F024020010BE
71261+:1056E0001062000524020070106200358F820020D5
71262+:1056F0000A000588244200018F62000097430104DC
71263+:105700003050FFFF3071FFFF8F4201780440FFFEF1
71264+:105710003202000700021023304200072403000A6F
71265+:105720002604FFFEA7430140A7420142A7440144CB
71266+:10573000A7400146A75101488F420108304200208E
71267+:10574000144000022403000924030001A743014A76
71268+:105750000E00020C3C0400400E0002350000000068
71269+:105760003C0708008CE70444021110212442FFFE8C
71270+:105770003C0608008CC604400040182100E3382194
71271+:10578000000010218F65000000E3402B00C2302193
71272+:105790002604000800C830213084FFFFAF850008D0
71273+:1057A0003C010800AC2704443C010800AC2604403E
71274+:1057B0000E0001E9000000000A0005190220202166
71275+:1057C0000E00013B000000008F82002024420001F7
71276+:1057D000AF8200203C024000AF4201380A00029232
71277+:1057E000000000003084FFFF30C6FFFF00052C00E2
71278+:1057F00000A628253882FFFF004510210045282BF0
71279+:105800000045102100021C023042FFFF004310211E
71280+:1058100000021C023042FFFF004310213842FFFF0C
71281+:1058200003E000083042FFFF3084FFFF30A5FFFF98
71282+:1058300000001821108000070000000030820001E5
71283+:105840001040000200042042006518210A0005A152
71284+:105850000005284003E000080060102110C0000689
71285+:1058600024C6FFFF8CA2000024A50004AC82000027
71286+:105870000A0005AB2484000403E0000800000000D7
71287+:1058800010A0000824A3FFFFAC8600000000000069
71288+:10589000000000002402FFFF2463FFFF1462FFFAF0
71289+:1058A0002484000403E00008000000000000000160
71290+:1058B0000A00002A00000000000000000000000DA7
71291+:1058C000747870362E322E3162000000060201001C
71292+:1058D00000000000000001360000EA600000000047
71293+:1058E00000000000000000000000000000000000B8
71294+:1058F00000000000000000000000000000000000A8
71295+:105900000000000000000000000000000000000097
71296+:105910000000001600000000000000000000000071
71297+:105920000000000000000000000000000000000077
71298+:105930000000000000000000000000000000000067
71299+:1059400000000000000000000000138800000000BC
71300+:10595000000005DC00000000000000001000000353
71301+:10596000000000000000000D0000000D3C020800D7
71302+:1059700024423D683C0308002463401CAC40000006
71303+:105980000043202B1480FFFD244200043C1D08002E
71304+:1059900037BD7FFC03A0F0213C100800261000A8B2
71305+:1059A0003C1C0800279C3D680E00044E00000000CF
71306+:1059B0000000000D27BDFFB4AFA10000AFA200049E
71307+:1059C000AFA30008AFA4000CAFA50010AFA6001451
71308+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
71309+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
71310+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
71311+:105A0000AFBF00480E000591000000008FBF0048A6
71312+:105A10008FBC00448FB900408FB8003C8FAF003876
71313+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
71314+:105A30008FAA00248FA900208FA8001C8FA7001810
71315+:105A40008FA600148FA500108FA4000C8FA3000850
71316+:105A50008FA200048FA1000027BD004C3C1B6004F6
71317+:105A60008F7A5030377B502803400008AF7A00000F
71318+:105A70008F86003C3C0390003C0280000086282575
71319+:105A800000A32025AC4400203C0380008C6700204C
71320+:105A900004E0FFFE0000000003E00008000000003A
71321+:105AA0000A000070240400018F85003C3C04800043
71322+:105AB0003483000100A3102503E00008AC8200201D
71323+:105AC00003E00008000010213084FFFF30A5FFFF35
71324+:105AD00010800007000018213082000110400002F1
71325+:105AE00000042042006518211480FFFB00052840B7
71326+:105AF00003E000080060102110C000070000000053
71327+:105B00008CA2000024C6FFFF24A50004AC82000084
71328+:105B100014C0FFFB2484000403E000080000000020
71329+:105B200010A0000824A3FFFFAC86000000000000C6
71330+:105B3000000000002402FFFF2463FFFF1462FFFA4D
71331+:105B40002484000403E000080000000090AA003153
71332+:105B50008FAB00108CAC00403C0300FF8D6800044C
71333+:105B6000AD6C00208CAD004400E060213462FFFF8A
71334+:105B7000AD6D00248CA700483C09FF000109C0243A
71335+:105B8000AD6700288CAE004C0182C824031978252B
71336+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
71337+:105BA000AD6D001C94A900323128FFFFAD680010D4
71338+:105BB00090A70030A5600002A1600004A16700006A
71339+:105BC00090A30032306200FF0002198210600005CD
71340+:105BD000240500011065000E0000000003E000082D
71341+:105BE000A16A00018CD80028354A0080AD780018E1
71342+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
71343+:105C00008CC4002CA16A000103E00008AD64000C04
71344+:105C10008CCD001CAD6D00188CC90014AD6900144A
71345+:105C20008CC80024AD6800088CC70020AD67000C4C
71346+:105C30008CC200148C8300700043C82B1320000713
71347+:105C4000000000008CC20014144CFFE400000000AF
71348+:105C5000354A008003E00008A16A00018C820070D0
71349+:105C60000A0000E6000000009089003027BDFFF820
71350+:105C70008FA8001CA3A900008FA300003C0DFF808B
71351+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
71352+:105C9000A100000400C05821A7A000028D06000446
71353+:105CA00000A048210167C8218FA500000080502175
71354+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
71355+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
71356+:105CD00000EDC02400C27824000C1DC003236825F9
71357+:105CE00001F87025AD0D0000AD0E00048D240024D8
71358+:105CF000AFAD0000AD0400088D2C00202404FFFF90
71359+:105D0000AD0C000C9547003230E6FFFFAD060010E9
71360+:105D10009145004830A200FF000219C25060000106
71361+:105D20008D240034AD0400148D4700388FAA00186C
71362+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
71363+:105D4000AD00002CAD00001803E00008AD000020FD
71364+:105D500027BDFFE0AFB20018AFB10014AFB0001024
71365+:105D6000AFBF001C9098003000C088213C0D00FFA0
71366+:105D7000330F007FA0CF0000908E003135ACFFFFC5
71367+:105D80003C0AFF00A0CE000194A6001EA220000441
71368+:105D90008CAB00148E29000400A08021016C282403
71369+:105DA000012A40240080902101052025A62600021A
71370+:105DB000AE24000426050020262400080E000092D0
71371+:105DC00024060002924700302605002826240014ED
71372+:105DD00000071E000003160324060004044000030D
71373+:105DE0002403FFFF965900323323FFFF0E00009279
71374+:105DF000AE230010262400248FBF001C8FB2001891
71375+:105E00008FB100148FB00010240500030000302172
71376+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
71377+:105E2000AFB00018AFBF002090A9003024020001DD
71378+:105E300000E050213123003F00A040218FB00040FE
71379+:105E40000080882100C04821106200148FA700380C
71380+:105E5000240B000500A0202100C02821106B001396
71381+:105E6000020030210E000128000000009225007C75
71382+:105E700030A400021080000326030030AE00003082
71383+:105E8000260300348FBF00208FB1001C8FB0001894
71384+:105E90000060102103E0000827BD00280E0000A7C5
71385+:105EA000AFB000100A00016F000000008FA3003C9B
71386+:105EB000010020210120282101403021AFA3001042
71387+:105EC0000E0000EEAFB000140A00016F00000000E9
71388+:105ED0003C06800034C20E008C4400108F850044C4
71389+:105EE000ACA400208C43001803E00008ACA30024FD
71390+:105EF0003C06800034C20E008C4400148F850044A0
71391+:105F0000ACA400208C43001C03E00008ACA30024D8
71392+:105F10009382000C1040001B2483000F2404FFF028
71393+:105F20000064382410E00019978B00109784000E4D
71394+:105F30009389000D3C0A601C0A0001AC01644023F7
71395+:105F400001037021006428231126000231C2FFFFE3
71396+:105F500030A2FFFF0047302B50C0000E00E4482164
71397+:105F60008D4D000C31A3FFFF00036400000C2C03D7
71398+:105F700004A1FFF30000302130637FFF0A0001A479
71399+:105F80002406000103E00008000000009784000ED2
71400+:105F900000E448213123FFFF3168FFFF0068382B00
71401+:105FA00054E0FFF8A783000E938A000D114000050E
71402+:105FB000240F0001006BC023A380000D03E0000844
71403+:105FC000A798000E006BC023A38F000D03E000080C
71404+:105FD000A798000E03E000080000000027BDFFE8BE
71405+:105FE000AFB000103C10800036030140308BFFFF43
71406+:105FF00093AA002BAFBF0014A46B000436040E005C
71407+:106000009488001630C600FF8FA90030A4680006EF
71408+:10601000AC650008A0660012A46A001AAC670020F4
71409+:106020008FA5002CA4690018012020210E000198E2
71410+:10603000AC6500143C021000AE0201788FBF001462
71411+:106040008FB0001003E0000827BD00188F85000006
71412+:106050002484000727BDFFF83084FFF83C06800049
71413+:1060600094CB008A316AFFFFAFAA00008FA900001D
71414+:10607000012540232507FFFF30E31FFF0064102B9D
71415+:106080001440FFF700056882000D288034CC4000E2
71416+:1060900000AC102103E0000827BD00088F8200003B
71417+:1060A0002486000730C5FFF800A2182130641FFFC6
71418+:1060B00003E00008AF8400008F87003C8F84004419
71419+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
71420+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
71421+:1060E000AFB20030AFB000283C0B80008C8600249B
71422+:1060F000AD6700808C8A002035670E00356901008D
71423+:10610000ACEA00108C8800248D2500040000B82122
71424+:10611000ACE800188CE3001000A688230000A02142
71425+:10612000ACE300148CE20018ACE2001C122000FE6C
71426+:1061300000E0B021936C0008118000F40000000022
71427+:10614000976F001031EEFFFF022E682B15A000EFB5
71428+:1061500000000000977200103250FFFFAED0000028
71429+:106160003C0380008C740000329300081260FFFD35
71430+:106170000000000096D800088EC700043305FFFF1A
71431+:1061800030B5000112A000E4000000000000000D86
71432+:1061900030BFA0402419004013F9011B30B4A00007
71433+:1061A000128000DF000000009373000812600008F6
71434+:1061B00000000000976D001031ACFFFF00EC202BB9
71435+:1061C0001080000330AE004011C000D50000000078
71436+:1061D000A7850040AF87003893630008022028217C
71437+:1061E000AFB10020146000F527B40020AF60000CB0
71438+:1061F000978F004031F14000162000022403001662
71439+:106200002403000E24054007A363000AAF650014B1
71440+:10621000938A00428F70001431550001001512401E
71441+:1062200002024825AF690014979F00408F78001440
71442+:1062300033F9001003194025AF680014979200400D
71443+:106240003247000810E0016E000000008F67001464
71444+:106250003C1210003C11800000F27825AF6F001452
71445+:1062600036230E00946E000A3C0D81002406000EB9
71446+:1062700031CCFFFF018D2025AF640004A36600022E
71447+:106280009373000A3406FFFC266B0004A36B000A1C
71448+:1062900097980040330820001100015F00000000C3
71449+:1062A0003C05800034A90E00979900409538000CF9
71450+:1062B00097870040001940423312C00031030003A9
71451+:1062C00000127B0330F11000006F6825001172038B
71452+:1062D00001AE6025000C20C0A76400129793004017
71453+:1062E000936A000A001359823175003C02AA1021FA
71454+:1062F0002450003CA3700009953F000C33F93FFF88
71455+:10630000A779001097700012936900090130F821F5
71456+:1063100027E5000230B900070019C0233308000741
71457+:10632000A368000B9371000997720012976F001019
71458+:10633000322700FF8F910038978D004000F218211E
71459+:10634000006F702101C6602131A6004010C0000519
71460+:106350003185FFFF00B1102B3C1280001040001768
71461+:10636000000098210225A82B56A0013E8FA50020F1
71462+:106370003C048000348A0E008D5300143C068000DB
71463+:10638000AD5300108D4B001CAD4B0018AD45000007
71464+:106390008CCD000031AC00081180FFFD34CE0E0022
71465+:1063A00095C3000800A0882100009021A783004029
71466+:1063B0008DC6000424130001AF860038976F0010CB
71467+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
71468+:1063D000AE85000093620008144000DD000000005C
71469+:1063E0000E0001E7240400108F900048004028218F
71470+:1063F0003C023200320600FF000654000142F8253C
71471+:1064000026090001AF890048ACBF0000937900095C
71472+:1064100097780012936F000A332800FF3303FFFFC1
71473+:106420000103382100076C0031EE00FF01AE60254A
71474+:10643000ACAC00048F840048978B0040316A200088
71475+:106440001140010AACA4000897640012308BFFFFD2
71476+:1064500006400108ACAB000C978E004031C5000827
71477+:1064600014A0000226280006262800023C1F8000F7
71478+:1064700037E70E0094F900148CE5001C8F670004C8
71479+:10648000937800023324FFFF330300FFAFA3001013
71480+:106490008F6F0014AFA800180E0001CBAFAF00142F
71481+:1064A000240400100E0001FB000000008E9200008A
71482+:1064B00016400005000000008F7800142403FFBF81
71483+:1064C0000303A024AF7400148F67000C00F5C821EB
71484+:1064D000AF79000C9375000816A0000800000000BA
71485+:1064E00012600006000000008F6800143C0AEFFFF5
71486+:1064F0003549FFFE0109F824AF7F0014A37300089B
71487+:106500008FA500200A00034F02202021AED10000F9
71488+:106510000A00022D3C03800014E0FF1E30BFA040A3
71489+:106520000E0001900000A0212E9100010237B0253D
71490+:1065300012C000188FBF00488F87003C24170F003F
71491+:1065400010F700D43C0680008CD901780720FFFEAC
71492+:10655000241F0F0010FF00F634CA0E008D560014E1
71493+:1065600034C7014024080240ACF600048D49001CE9
71494+:106570003C141000ACE90008A0E00012A4E0001AEE
71495+:10658000ACE00020A4E00018ACE80014ACD4017822
71496+:106590008FBF00488FB700448FB600408FB5003CD6
71497+:1065A0008FB400388FB300348FB200308FB1002C1D
71498+:1065B0008FB0002803E0000827BD00508F910038FD
71499+:1065C000978800403C1280000220A821310700403B
71500+:1065D00014E0FF7C00009821977900108F9200381A
71501+:1065E0003338FFFF131200A8000020210080A021F3
71502+:1065F000108000F300A088211620FECE00000000CD
71503+:106600000A00031F2E9100013C0380008C62017878
71504+:106610000440FFFE240808008F860000AC68017863
71505+:106620003C038000946D008A31ACFFFF0186582343
71506+:10663000256AFFFF31441FFF2C8900081520FFF950
71507+:10664000000000008F8F0048347040008F83003CB2
71508+:1066500000E0A021240E0F0025E70001AF870048CD
71509+:1066600000D03021023488233C08800031F500FF3F
71510+:10667000106E0005240700019398004233130001B7
71511+:106680000013924036470001001524003C0A010027
71512+:10669000008A4825ACC900008F82004830BF003610
71513+:1066A00030B90008ACC200041320009900FF9825FF
71514+:1066B00035120E009650000A8F8700003C0F8100B3
71515+:1066C0003203FFFF24ED000835060140006F60250E
71516+:1066D0003C0E100031AB1FFF269200062405000E71
71517+:1066E000ACCC0020026E9825A4C5001AAF8B000028
71518+:1066F000A4D20018162000083C1080008F89003CAE
71519+:1067000024020F00512200022417000136730040BA
71520+:106710000E0001883C10800036060E008CCB001461
71521+:10672000360A014002402021AD4B00048CC5001CFC
71522+:10673000AD450008A1550012AD5300140E0001989C
71523+:106740003C151000AE1501780A000352000000004D
71524+:10675000936F0009976E0012936D000B31E500FFF7
71525+:1067600000AE202131AC00FF008C80212602000AFF
71526+:106770003050FFFF0E0001E7020020218F86004805
71527+:106780003C0341003C05800024CB0001AF8B004856
71528+:10679000936A00099769001230C600FF315F00FF5D
71529+:1067A0003128FFFF03E8382124F900020006C40065
71530+:1067B0000319782501E37025AC4E00008F6D000CA5
71531+:1067C00034A40E00948B001401B26025AC4C00047C
71532+:1067D0008C85001C8F670004936A00023164FFFF00
71533+:1067E000314900FFAFA900108F680014AFB1001845
71534+:1067F0000E0001CBAFA800140A0002FD0200202108
71535+:10680000AF600004A36000029798004033082000A6
71536+:106810001500FEA300003021A760001297840040FD
71537+:10682000936B000A3C10800030931F0000135183CB
71538+:10683000014BA82126A20028A362000936090E00F8
71539+:10684000953F000C0A000295A77F00108F7000147E
71540+:10685000360900400E000188AF6900140A0002C921
71541+:10686000000000000A00034F000020210641FEFA4C
71542+:10687000ACA0000C8CAC000C3C0D8000018D902570
71543+:106880000A0002EAACB2000C000090210A0002C526
71544+:1068900024130001128000073C028000344B0E00DC
71545+:1068A0009566000830D300401260004900000000E7
71546+:1068B0003C0680008CD001780600FFFE34C50E0037
71547+:1068C00094B500103C03050034CC014032B8FFFF02
71548+:1068D00003039025AD92000C8CAF0014240D200012
71549+:1068E0003C041000AD8F00048CAE001CAD8E00087F
71550+:1068F000A1800012A580001AAD800020A58000189C
71551+:10690000AD8D0014ACC401780A0003263C0680005B
71552+:106910008F9F0000351801402692000227F90008D9
71553+:1069200033281FFFA71200180A000391AF88000048
71554+:106930003C02800034450140ACA0000C1280001BDA
71555+:1069400034530E0034510E008E370010ACB70004E3
71556+:106950008E2400183C0B8000ACA400083570014068
71557+:1069600024040040A20000128FBF0048A600001AB5
71558+:106970008FB70044AE0000208FB60040A60000187C
71559+:106980008FB5003CAE0400148FB400388FB30034D0
71560+:106990008FB200308FB1002C8FB000283C02100065
71561+:1069A00027BD005003E00008AD6201788E66001438
71562+:1069B000ACA600048E64001C0A00042A3C0B800074
71563+:1069C0000E0001902E9100010A0003200237B0252D
71564+:1069D000000000000000000D00000000240003691A
71565+:1069E0000A0004013C06800027BDFFD8AFBF00208D
71566+:1069F0003C0980003C1F20FFAFB200183C0760003C
71567+:106A000035320E002402001037F9FFFDACE23008E9
71568+:106A1000AFB3001CAFB10014AFB00010AE5900000E
71569+:106A20000000000000000000000000000000000066
71570+:106A3000000000003C1800FF3713FFFDAE530000BC
71571+:106A40003C0B60048D7050002411FF7F3C0E00024F
71572+:106A50000211782435EC380C35CD0109ACED4C1819
71573+:106A6000240A0009AD6C50008CE80438AD2A0008F7
71574+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
71575+:106A800000051E023062000F2486C0B310400007CC
71576+:106A9000AF8200088CE54C1C3C09001F3528FC0027
71577+:106AA00000A81824000321C2AF8400048CF1080858
71578+:106AB0003C0F57092412F0000232702435F0001008
71579+:106AC00001D0602601CF68262DAA00012D8B000180
71580+:106AD000014B382550E00009A380000C3C1F601CCE
71581+:106AE0008FF8000824190001A399000C33137C00CF
71582+:106AF000A7930010A780000EA380000DAF80004870
71583+:106B000014C00003AF8000003C066000ACC0442C01
71584+:106B10000E0005B93C1080000E000F1A361101005E
71585+:106B20003C12080026523DD03C13080026733E500C
71586+:106B30008E03000038640001308200011440FFFC25
71587+:106B40003C0B800A8E2600002407FF8024C90240E7
71588+:106B5000312A007F014B402101272824AE06002066
71589+:106B6000AF880044AE0500243C048000AF86003CA2
71590+:106B70008C8C01780580FFFE24180800922F0008F5
71591+:106B8000AC980178A38F0042938E004231CD000172
71592+:106B900011A0000F24050D0024DFF8002FF90301D8
71593+:106BA0001320001C000629C224A4FFF00004104298
71594+:106BB000000231400E00020200D2D8213C02400007
71595+:106BC0003C068000ACC201380A0004A000000000AE
71596+:106BD00010C50023240D0F0010CD00273C1F800896
71597+:106BE00037F9008093380000240E0050330F00FF67
71598+:106BF00015EEFFF33C0240000E000A3600000000D4
71599+:106C00003C0240003C068000ACC201380A0004A0EF
71600+:106C1000000000008F83000400A3402B1500000B30
71601+:106C20008F8B0008006B50212547FFFF00E5482BA4
71602+:106C30001520000600A36023000C19400E0002027C
71603+:106C40000073D8210A0004C43C0240000000000D7B
71604+:106C50000E000202000000000A0004C43C024000D2
71605+:106C60003C1B0800277B3F500E0002020000000082
71606+:106C70000A0004C43C0240003C1B0800277B3F7014
71607+:106C80000E000202000000000A0004C43C024000A2
71608+:106C90003C0660043C09080025290104ACC9502CBD
71609+:106CA0008CC850003C0580003C0200023507008083
71610+:106CB000ACC750003C040800248415A43C03080021
71611+:106CC0002463155CACA50008ACA2000C3C010800D4
71612+:106CD000AC243D603C010800AC233D6403E00008A7
71613+:106CE0002402000100A030213C1C0800279C3D68C4
71614+:106CF0003C0C04003C0B0002008B3826008C402624
71615+:106D00002CE200010007502B2D050001000A4880ED
71616+:106D10003C03080024633D60004520250123182121
71617+:106D20001080000300001021AC6600002402000166
71618+:106D300003E00008000000003C1C0800279C3D68A0
71619+:106D40003C0B04003C0A0002008A3026008B3826E7
71620+:106D50002CC200010006482B2CE5000100094080F0
71621+:106D60003C03080024633D600045202501031821F1
71622+:106D700010800005000010213C0C0800258C155CDB
71623+:106D8000AC6C00002402000103E0000800000000D9
71624+:106D90003C0900023C08040000883026008938269F
71625+:106DA0002CC30001008028212CE400010083102561
71626+:106DB0001040000B000030213C1C0800279C3D685F
71627+:106DC0003C0A80008D4E00082406000101CA682597
71628+:106DD000AD4D00088D4C000C01855825AD4B000CC5
71629+:106DE00003E0000800C010213C1C0800279C3D68FF
71630+:106DF0003C0580008CA6000C000420272402000122
71631+:106E000000C4182403E00008ACA3000C3C020002FC
71632+:106E10001082000B3C0560003C0704001087000353
71633+:106E20000000000003E00008000000008CA908D06A
71634+:106E3000240AFFFD012A402403E00008ACA808D082
71635+:106E40008CA408D02406FFFE0086182403E0000866
71636+:106E5000ACA308D03C05601A34A600108CC3008097
71637+:106E600027BDFFF88CC50084AFA3000093A40000E9
71638+:106E70002402000110820003AFA5000403E0000813
71639+:106E800027BD000893A7000114E0001497AC00028E
71640+:106E900097B800023C0F8000330EFFFC01CF682141
71641+:106EA000ADA50000A3A000003C0660008CC708D080
71642+:106EB0002408FFFE3C04601A00E82824ACC508D072
71643+:106EC0008FA300048FA200003499001027BD000892
71644+:106ED000AF22008003E00008AF2300843C0B800059
71645+:106EE000318AFFFC014B48218D2800000A00057DF6
71646+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
71647+:106F0000279C3D683C0580008CA4000C8CA20004EA
71648+:106F10003C0300020044282410A0000A00A3182407
71649+:106F20003C0604003C0400021460000900A6102482
71650+:106F30001440000F3C0404000000000D3C1C08003D
71651+:106F4000279C3D688FBF001003E0000827BD001894
71652+:106F50003C0208008C423D600040F809000000003F
71653+:106F60003C1C0800279C3D680A0005A68FBF001046
71654+:106F70003C0208008C423D640040F809000000001B
71655+:106F80000A0005AC00000000000411C003E0000886
71656+:106F9000244202403C04080024843FB42405001A23
71657+:106FA0000A00009C0000302127BDFFE0AFB00010B8
71658+:106FB0003C108000AFBF0018AFB1001436110100C3
71659+:106FC000922200090E0005B63044007F8E3F00007B
71660+:106FD0008F89003C3C0F008003E26021258800403F
71661+:106FE0000049F821240DFF80310E00783198007897
71662+:106FF00035F9000135F100020319382501D1482582
71663+:10700000010D302403ED5824018D2824240A00406A
71664+:1070100024040080240300C0AE0B0024AE0008103E
71665+:10702000AE0A0814AE040818AE03081CAE05080426
71666+:10703000AE070820AE060808AE0908243609090084
71667+:107040009539000C3605098033ED007F3338FFFF9A
71668+:10705000001889C0AE110800AE0F0828952C000C4E
71669+:107060008FBF00188FB10014318BFFFF000B51C090
71670+:10707000AE0A002C8CA400508FB000108CA3003CF2
71671+:107080008D2700048CA8001C8CA600383C0E800ABA
71672+:1070900001AE102127BD0020AF820044AF84005014
71673+:1070A000AF830054AF87004CAF88005C03E000085A
71674+:1070B000AF8600603C09080091293FD924A800024E
71675+:1070C0003C05110000093C0000E8302500C51825EA
71676+:1070D00024820008AC83000003E00008AC800004B8
71677+:1070E0003C098000352309009128010B906A0011AA
71678+:1070F0002402002800804821314700FF00A07021B1
71679+:1071000000C068213108004010E20002340C86DD26
71680+:10711000240C08003C0A800035420A9A944700007B
71681+:10712000354B0A9C35460AA030F9FFFFAD39000007
71682+:107130008D780000354B0A8024040001AD3800042E
71683+:107140008CCF0000AD2F00089165001930A300031B
71684+:107150001064009028640002148000AF240500022F
71685+:107160001065009E240F0003106F00B435450AA47B
71686+:10717000240A0800118A0048000000005100003D68
71687+:107180003C0B80003C0480003483090090670012AF
71688+:1071900030E200FF004D7821000FC8802724000155
71689+:1071A0003C0A8000354F090091E50019354C0980F3
71690+:1071B0008D87002830A300FF0003150000475825E5
71691+:1071C0000004C4003C19600001793025370806FF2F
71692+:1071D000AD260000AD2800048DEA002C25280028EB
71693+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
71694+:1071F000AD2500108DE400383C05800034AC093C1E
71695+:10720000AD2400148DE3001CAD2300188DE7002091
71696+:10721000AD27001C8DE20024AD2200208DF900284E
71697+:1072200034A20100AD3900248D830000AD0E0004AE
71698+:1072300034B90900AD0300008C47000C250200148E
71699+:10724000AD070008932B00123C04080090843FD83F
71700+:10725000AD000010317800FF030D302100064F0013
71701+:1072600000047C00012F702535CDFFFC03E00008F1
71702+:10727000AD0D000C35780900930600123C0508009E
71703+:1072800094A53FC830C800FF010D5021000A60805E
71704+:107290000A00063C018520211500005B000000006B
71705+:1072A0003C08080095083FCE3C06080094C63FC83D
71706+:1072B000010610213C0B800035790900933800113C
71707+:1072C000932A001935660A80330800FF94CF002AFC
71708+:1072D00000086082314500FF978A0058000C1E00AC
71709+:1072E000000524003047FFFF006410250047C0253B
71710+:1072F00001EA30213C0B4000030B402500066400EE
71711+:10730000AD280000AD2C0004932500183C030006B6
71712+:107310002528001400053E0000E31025AD220008DA
71713+:107320008F24002C3C05800034AC093CAD24000CBB
71714+:107330008F38001C34A20100254F0001AD38001029
71715+:107340008D830000AD0E000431EB7FFFAD03000024
71716+:107350008C47000C34B90900A78B0058AD07000812
71717+:10736000932B00123C04080090843FD8250200149F
71718+:10737000317800FF030D302100064F0000047C002F
71719+:10738000012F702535CDFFFCAD00001003E0000893
71720+:10739000AD0D000C3C02080094423FD23C050800B1
71721+:1073A00094A53FC835440AA43C07080094E73FC4AD
71722+:1073B000948B00000045C8210327C023000B1C004C
71723+:1073C0002706FFF200665025AD2A000CAD20001004
71724+:1073D000AD2C00140A00063025290018354F0AA4E8
71725+:1073E00095E50000956400280005140000043C00A9
71726+:1073F0003459810000EC5825AD39000CAD2B00103C
71727+:107400000A000630252900143C0C0800958C3FCE5C
71728+:107410000A000681258200015460FF56240A0800F4
71729+:1074200035580AA49706000000061C00006C502581
71730+:10743000AD2A000C0A000630252900103C03080084
71731+:1074400094633FD23C07080094E73FC83C0F080014
71732+:1074500095EF3FC494A4000095790028006710219F
71733+:10746000004F582300041C00001934002578FFEE5B
71734+:1074700000D87825346A8100AD2A000CAD2F0010A9
71735+:10748000AD200014AD2C00180A0006302529001C80
71736+:1074900003E00008240207D027BDFFE0AFB20018C8
71737+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
71738+:1074B000008088218F8800548F87004C3C0580080D
71739+:1074C00034B20080011128213C1080002402008089
71740+:1074D000240300C000A72023AE0208183C06800841
71741+:1074E000AE03081C18800004AF850054ACC500042E
71742+:1074F0008CC90004AF89004C1220000936040980B1
71743+:107500000E0006F800000000924C00278E0B00745D
71744+:1075100001825004014B3021AE46000C3604098034
71745+:107520008C8E001C8F8F005C01CF682319A0000493
71746+:107530008FBF001C8C90001CAF90005C8FBF001CA4
71747+:107540008FB200188FB100148FB000100A00007EB7
71748+:1075500027BD00208F8600508F8300548F82004CFF
71749+:107560003C05800834A40080AC860050AC83003C0D
71750+:1075700003E00008ACA200043C0308008C63005444
71751+:1075800027BDFFF8308400FF2462000130A500FF12
71752+:107590003C010800AC22005430C600FF3C078000CC
71753+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
71754+:1075B0008FAA0000358BFFFF014B4824000627C02F
71755+:1075C00001244025AFA8000034E201009043000AE6
71756+:1075D000A3A000023C1980FFA3A300018FAF00000D
71757+:1075E00030AE007F3738FFFF01F86024000E6E00D8
71758+:1075F0003C0A002034E50140018D58253549200022
71759+:107600002406FF803C04100027BD0008ACAB000C32
71760+:10761000ACA90014A4A00018A0A6001203E0000862
71761+:10762000ACE40178308800FF30A700FF3C03800005
71762+:107630008C6201780440FFFE3C0C8000358A0A0011
71763+:107640008D4B00203584014035850980AC8B0004CA
71764+:107650008D4900240007302B00061540AC89000836
71765+:10766000A088001090A3004CA083002D03E0000828
71766+:10767000A480001827BDFFE8308400FFAFBF0010D2
71767+:107680000E00075D30A500FF8F8300548FBF0010F0
71768+:107690003C06800034C50140344700402404FF907C
71769+:1076A0003C02100027BD0018ACA3000CA0A40012DF
71770+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
71771+:1076C0003C088008AFBF001CAFB20018AFB1001477
71772+:1076D000AFB00010351000808E0600183C07800007
71773+:1076E000309200FF00C72025AE0400180E00007C79
71774+:1076F00030B100FF92030005346200080E00007EE6
71775+:10770000A2020005024020210E000771022028215C
71776+:10771000024020218FBF001C8FB200188FB10014CF
71777+:107720008FB0001024050005240600010A0007326E
71778+:1077300027BD00203C05800034A309809066000826
71779+:1077400030C200081040000F3C0A01013549080A08
71780+:10775000AC8900008CA80074AC8800043C070800C9
71781+:1077600090E73FD830E5001050A00008AC8000083A
71782+:107770003C0D800835AC00808D8B0058AC8B000828
71783+:107780002484000C03E00008008010210A0007B5E3
71784+:107790002484000C27BDFFE83C098000AFB0001036
71785+:1077A000AFBF00143526098090C8000924020006E6
71786+:1077B00000A05821310300FF3527090000808021F7
71787+:1077C000240500041062007B2408000294CF005CB2
71788+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
71789+:1077E00090CA00083144002010800008000000000A
71790+:1077F00090C2004E3C1F010337F90300305800FFD0
71791+:107800000319302524050008AE06000490F9001184
71792+:1078100090E6001290E40011333800FF00187082E7
71793+:1078200030CF00FF01CF5021014B6821308900FF8C
71794+:1078300031AAFFFF39230028000A60801460002C61
71795+:10784000020C482390E400123C198000372F0100FD
71796+:10785000308C00FF018B1821000310800045F821B7
71797+:10786000001F8400360706FFAD270004373F0900DC
71798+:1078700093EC001193EE0012372609800005C082B8
71799+:107880008DE4000C8CC5003431CD00FF01AB10211C
71800+:107890000058182100A4F8230008840000033F00CA
71801+:1078A00000F0302533F9FFFF318F00FC00D970253F
71802+:1078B0000158202101E9682100045080ADAE000C80
71803+:1078C0000E00007C012A80213C088008240B000463
71804+:1078D000350500800E00007EA0AB000902001021DB
71805+:1078E0008FBF00148FB0001003E0000827BD001800
71806+:1078F00090EC001190E300193C18080097183FCE57
71807+:10790000318200FF0002F882307000FF001FCE00BD
71808+:1079100000103C000327302500D870253C0F4000A4
71809+:1079200001CF68253C198000AD2D0000373F0900CC
71810+:1079300093EC001193EE0012372F010037260980D7
71811+:107940000005C0828DE4000C8CC5003431CD00FFF1
71812+:1079500001AB10210058182100A4F823000884006E
71813+:1079600000033F0000F0302533F9FFFF318F00FCAA
71814+:1079700000D970250158202101E9682100045080B8
71815+:10798000ADAE000C0E00007C012A80213C0880086E
71816+:10799000240B0004350500800E00007EA0AB00091A
71817+:1079A000020010218FBF00148FB0001003E0000808
71818+:1079B00027BD00180A0007C72408001227BDFFD002
71819+:1079C0003C038000AFB60028AFB50024AFB4002060
71820+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
71821+:1079E000AFB000103467010090E6000B309400FF48
71822+:1079F00030B500FF30C200300000B02110400099C7
71823+:107A000000008821346409809088000800082E0056
71824+:107A100000051E03046000C0240400048F86005487
71825+:107A20003C010800A0243FD83C0C8000AD800048F9
71826+:107A30003C048000348E010091CD000B31A5002064
71827+:107A400010A000073C078000349309809272000860
71828+:107A50000012860000107E0305E000C43C1F800871
71829+:107A600034EC0100918A000B34EB09809169000825
71830+:107A7000314400400004402B3123000800C8982303
71831+:107A80001460000224120003000090213C108000CA
71832+:107A900036180A8036040900970E002C90830011D6
71833+:107AA0009089001293050018307F00FF312800FFF5
71834+:107AB000024810210002C880930D0018033F78216E
71835+:107AC00001F1302130B100FF00D11821A78E0058FC
71836+:107AD0003C010800A4263FCE3C010800A4233FD06F
71837+:107AE00015A00002000000000000000D920B010B29
71838+:107AF0003065FFFF3C010800A4233FD2316A0040FB
71839+:107B00003C010800A4203FC83C010800A4203FC459
71840+:107B10001140000224A4000A24A4000B3091FFFFAE
71841+:107B20000E0001E7022020219206010B3C0C080008
71842+:107B3000958C3FD2004020210006698231A70001C8
71843+:107B40000E00060101872821004020210260282123
71844+:107B50000E00060C024030210E0007A1004020213B
71845+:107B600016C00069004020219212010B32560040DD
71846+:107B700012C000053C0500FF8C93000034AEFFFFEF
71847+:107B8000026E8024AC9000000E0001FB0220202138
71848+:107B90003C0F080091EF3FD831F10003122000168E
71849+:107BA0003C1380088F8200543C09800835280080EF
71850+:107BB000245F0001AD1F003C3C0580088CB9000427
71851+:107BC00003E02021033FC0231B000002AF9F0054AD
71852+:107BD0008CA400040E0006F8ACA400043C0780004E
71853+:107BE0008CEB00743C04800834830080004B5021EF
71854+:107BF000AC6A000C3C1380083670008002802021A3
71855+:107C000002A02821A200006B0E00075D3C1480003A
71856+:107C10008F920054368C0140AD92000C8F86004844
71857+:107C20003C151000344D000624D60001AF960048E4
71858+:107C30008FBF002CA18600128FB60028AD8D0014D6
71859+:107C40008FB3001CAE9501788FB200188FB5002459
71860+:107C50008FB400208FB100148FB0001003E0000833
71861+:107C600027BD003034640980908F0008000F760033
71862+:107C7000000E6E0305A00033347F090093F8001B4B
71863+:107C8000241900103C010800A0393FD8331300022A
71864+:107C90001260FF678F8600548F8200601446FF6574
71865+:107CA0003C0480000E00007C000000003C048008C2
71866+:107CB0003485008090A8000924060016310300FFD7
71867+:107CC0001066000D0000000090AB00093C070800A2
71868+:107CD00090E73FD824090008316400FF34EA00012E
71869+:107CE0003C010800A02A3FD81089002F240C000A6C
71870+:107CF000108C00282402000C0E00007E0000000002
71871+:107D00000A0008608F8600540E0007B9024028213F
71872+:107D10000A0008AE004020213C0B8008356A008034
71873+:107D20008D4600548CE9000C1120FF3DAF860054B5
71874+:107D3000240700143C010800A0273FD80A00085F70
71875+:107D40003C0C800090910008241200023C010800C5
71876+:107D5000A0323FD8323000201200000B2416000160
71877+:107D60008F8600540A0008602411000837F800804C
71878+:107D70008F020038AFE200048FF90004AF19003C15
71879+:107D80000A00086C3C0780008F8600540A000860D7
71880+:107D900024110004A0A200090E00007E00000000D3
71881+:107DA0000A0008608F860054240200140A00093A71
71882+:107DB000A0A2000927BDFFE8AFB000103C10800072
71883+:107DC000AFBF001436020100904400090E00075DA9
71884+:107DD000240500013C0480089099000E3483008043
71885+:107DE000909F000F906F00269089000A33F800FFE3
71886+:107DF00000196E000018740031EC00FF01AE502530
71887+:107E0000000C5A00014B3825312800FF3603014091
71888+:107E10003445600000E830252402FF813C04100056
71889+:107E2000AC66000C8FBF0014AC650014A062001299
71890+:107E3000AE0401788FB0001003E0000827BD0018E1
71891+:107E400027BDFFE8308400FFAFBF00100E00075DC4
71892+:107E500030A500FF3C05800034A4014034470040B9
71893+:107E60002406FF92AC870014A08600128F83005472
71894+:107E70008FBF00103C02100027BD0018AC83000C1F
71895+:107E800003E00008ACA2017827BDFFD8AFB0001016
71896+:107E9000308400FF30B000FF3C058000AFB100141B
71897+:107EA000AFBF0020AFB3001CAFB20018000410C277
71898+:107EB00034A60100320300023051000114600007B3
71899+:107EC00090D200093C098008353300809268000593
71900+:107ED0003107000810E0000C308A00100240202119
71901+:107EE0000E00078302202821240200018FBF0020FA
71902+:107EF0008FB3001C8FB200188FB100148FB0001028
71903+:107F000003E0000827BD00281540003434A50A000E
71904+:107F10008CB800248CAF0008130F004B00003821F0
71905+:107F20003C0D800835B30080926C00682406000286
71906+:107F3000318B00FF116600843C06800034C20100D2
71907+:107F40009263004C90590009307F00FF53F9000400
71908+:107F50003213007C10E00069000000003213007C46
71909+:107F60005660005C0240202116200009320D0001FD
71910+:107F70003C0C800035840100358B0A008D6500249F
71911+:107F80008C86000414A6FFD900001021320D0001D8
71912+:107F900011A0000E024020213C1880003710010083
71913+:107FA0008E0F000C8F8E005011EE000800000000B4
71914+:107FB0000E000843022028218E19000C3C1F800867
71915+:107FC00037F00080AE190050024020210E000771EA
71916+:107FD000022028210A00098F240200013C05080024
71917+:107FE0008CA5006424A400013C010800AC240064BA
71918+:107FF0001600000D00000000022028210E0007716D
71919+:1080000002402021926E0068240C000231CD00FF56
71920+:1080100011AC0022024020210E00094100000000A6
71921+:108020000A00098F240200010E00007024040001E0
71922+:10803000926B0025020B30250E00007EA266002503
71923+:108040000A0009D3022028218E6200188CDF000468
71924+:108050008CB9002400021E0217F9FFB13065007FC1
71925+:108060009268004C264400013093007F1265004066
71926+:10807000310300FF1464FFAB3C0D8008264700016C
71927+:1080800030F1007F30E200FF1225000B24070001D1
71928+:10809000004090210A00099C2411000124050004DD
71929+:1080A0000E000732240600010E0009410000000006
71930+:1080B0000A00098F240200012405FF8002452024C4
71931+:1080C00000859026324200FF004090210A00099C62
71932+:1080D000241100010E00084302202821320700303D
71933+:1080E00010E0FFA132100082024020210E00078321
71934+:1080F000022028210A00098F240200018E6900183D
71935+:108100000240202102202821012640250E0009647A
71936+:10811000AE6800189264004C240500032406000198
71937+:108120000E000732308400FF0E00007024040001AE
71938+:1081300092710025021150250E00007EA26A0025D2
71939+:108140000A00098F240200018E6F00183C1880007D
71940+:108150000240202101F87025022028210E0007711D
71941+:10816000AE6E00189264004C0A000A1B240500043D
71942+:10817000324A0080394900801469FF6A3C0D80084A
71943+:108180000A0009F42647000127BDFFC0AFB0001860
71944+:108190003C108000AFBF0038AFB70034AFB600303E
71945+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
71946+:1081B0000E0005BEAFB1001C360201009045000B59
71947+:1081C0000E00097690440008144000E78FBF003885
71948+:1081D0003C08800835070080A0E0006B3606098067
71949+:1081E00090C50000240300503C17080026F73F907C
71950+:1081F00030A400FF3C13080026733FA01083000347
71951+:108200003C1080000000B82100009821241F0010BD
71952+:108210003611010036120A00361509808E580024E6
71953+:108220008E3400048EAF00208F8C00543C01080077
71954+:10823000A03F3FD836190A80972B002C8EF60000FD
71955+:10824000932A00180298702301EC68233C0108006F
71956+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
71957+:10826000AC2C3FDCA78B005802C0F809315400FF4A
71958+:1082700030490002152000E930420001504000C49E
71959+:108280009227000992A90008312800081500000271
71960+:10829000241500030000A8213C0A80003543090092
71961+:1082A00035440A008C8D00249072001190700012E9
71962+:1082B000907F0011325900FF321100FF02B11021EE
71963+:1082C0000002C08033EF00FF0319B021028F70213C
71964+:1082D00002D4602125CB00103C010800A4363FCE1B
71965+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
71966+:1082F0003C010800A42B3FCC3556010035540980C1
71967+:1083000035510E008F8700548F89005C8E850020C8
71968+:1083100024080006012730233C010800AC283FD484
71969+:1083200000A7282304C000B50000902104A000B3DA
71970+:1083300000C5502B114000B5000000003C010800B2
71971+:10834000AC263FB88E6200000040F8090000000033
71972+:108350003046000214C0007400408021304B000100
71973+:10836000556000118E6200043C0D08008DAD3FBCCD
71974+:108370003C0EC0003C04800001AE6025AE2C000025
71975+:108380008C980000330F000811E0FFFD0000000092
71976+:10839000963F000824120001A79F00408E39000478
71977+:1083A000AF9900388E6200040040F8090000000018
71978+:1083B0000202802532030002146000B300000000B6
71979+:1083C0003C09080095293FC43C06080094C63FD0EC
71980+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
71981+:1083E000012670213C0308008C633FE03C08080034
71982+:1083F00095083FDA01CA20218ED9000C00E9282116
71983+:10840000249F000200A878210067C02133E4FFFF09
71984+:10841000AF9900503C010800AC383FE03C01080037
71985+:10842000A42F3FC83C010800A42E3FD20E0001E754
71986+:10843000000000008F8D0048004020213C01080012
71987+:10844000A02D3FD98E62000825AC0001AF8C0048FA
71988+:108450000040F809000000008F85005402A0302180
71989+:108460000E00060C004020210E0007A10040202134
71990+:108470008E6B000C0160F809004020213C0A0800C6
71991+:10848000954A3FD23C06080094C63FC601464821A3
71992+:10849000252800020E0001FB3104FFFF3C05080007
71993+:1084A0008CA53FB43C0708008CE73FBC00A7202305
71994+:1084B0003C010800AC243FB414800006000000001A
71995+:1084C0003C0208008C423FD4344B00403C01080081
71996+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
71997+:1084E0008F920044AE4D00208E2C0018AE4C00241C
71998+:1084F0003C04080094843FC80E0006FA0000000007
71999+:108500008F9F00548E6700103C010800AC3F3FDC99
72000+:1085100000E0F809000000003C1908008F393FB462
72001+:108520001720FF798F870054979300583C11800ED5
72002+:10853000321601000E000729A633002C16C0004594
72003+:10854000320300105460004C8EE5000432080040F5
72004+:108550005500001D8EF000088EE4000C0080F80924
72005+:10856000000000008FBF00388FB700348FB6003096
72006+:108570008FB5002C8FB400288FB300248FB2002059
72007+:108580008FB1001C8FB0001803E0000827BD004029
72008+:108590008F86003C36110E0000072E0000A6202515
72009+:1085A000AE0400808E4300208E500024AFA3001044
72010+:1085B000AE2300148FB20010AE320010AE30001C9B
72011+:1085C0000A000A75AE3000180200F8090000000029
72012+:1085D0008EE4000C0080F809000000000A000B2E59
72013+:1085E0008FBF003824180001240F0001A5C000200F
72014+:1085F000A5D800220A000B10ADCF00243C010800D2
72015+:10860000AC203FB80A000AA68E6200003C010800B8
72016+:10861000AC253FB80A000AA68E6200009224000929
72017+:108620000E000771000028218FBF00388FB700347B
72018+:108630008FB600308FB5002C8FB400288FB3002484
72019+:108640008FB200208FB1001C8FB0001803E000082B
72020+:1086500027BD00403C1480009295010900002821AC
72021+:108660000E00084332A400FF320300105060FFB830
72022+:10867000320800408EE5000400A0F8090000000068
72023+:108680000A000B28320800405240FFA89793005878
72024+:108690008E3400148F930044AE7400208E35001C7D
72025+:1086A000AE7500240A000B1F979300588F820014A8
72026+:1086B0000004218003E00008008210213C078008AC
72027+:1086C00034E200809043006900804021106000097E
72028+:1086D0003C0401003C0708008CE73FDC8F8300303E
72029+:1086E00000E32023048000089389001C14E30003A6
72030+:1086F0000100202103E00008008010213C0401005B
72031+:1087000003E00008008010211120000B00673823CF
72032+:108710003C0D800035AC0980918B007C316A0002F1
72033+:10872000114000202409003400E9702B15C0FFF12E
72034+:108730000100202100E938232403FFFC00A3C82402
72035+:1087400000E3C02400F9782B15E0FFEA030820219C
72036+:1087500030C400030004102314C000143049000387
72037+:108760000000302100A9782101E6702100EE682B7D
72038+:1087700011A0FFE03C0401002D3800010006C82BC9
72039+:10878000010548210319382414E0FFDA2524FFFCF1
72040+:108790002402FFFC00A218240068202103E0000846
72041+:1087A000008010210A000B9E240900303C0C800040
72042+:1087B0003586098090CB007C316A00041540FFE9C2
72043+:1087C000240600040A000BAD000030213C03080021
72044+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
72045+:1087E000AFB1001410620005AFB00010000329C043
72046+:1087F00024A40280AF840014AF8300183C108000D2
72047+:1088000036020A0094450032361101000E000B7F3B
72048+:1088100030A43FFF8E240000241FFF803C11008005
72049+:108820000082C021031F60243309007F000CC9406F
72050+:1088300003294025330E0078362F00033C0D10002D
72051+:10884000010D502501CF5825AE0C002836080980AF
72052+:10885000AE0C080CAE0B082CAE0A08309103006970
72053+:108860003C06800C0126382110600006AF870034DA
72054+:108870008D09003C8D03006C0123382318E0008231
72055+:10888000000000003C0B8008356A00803C1080002E
72056+:10889000A1400069360609808CC200383C06800081
72057+:1088A00034C50A0090A8003C310C00201180001A49
72058+:1088B000AF820030240D00013C0E800035D10A004B
72059+:1088C000A38D001CAF8000248E2400248F850024FB
72060+:1088D000240D0008AF800020AF8000283C01080074
72061+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
72062+:1088F000000030219228003C8FBF00188FB1001477
72063+:108900008FB0001000086142AF82002C27BD00200C
72064+:1089100003E000083182000190B80032240E00010B
72065+:10892000330F00FF000F2182108E00412419000236
72066+:108930001099006434C40AC03C03800034640A0007
72067+:108940008C8F002415E0001E34660900909F0030D3
72068+:108950002418000533F9003F1338004E24030001AA
72069+:108960008F860020A383001CAF860028AF860024DA
72070+:108970003C0E800035D10A008E2400248F8500240F
72071+:10898000240D00083C010800A42D3FC63C0108004E
72072+:10899000A4203FDA0E000B83000000009228003C68
72073+:1089A0008FBF00188FB100148FB000100008614213
72074+:1089B000AF82002C27BD002003E0000831820001B7
72075+:1089C0008C8A00088C8B00248CD000643C0E8000C4
72076+:1089D00035D10A00014B2823AF900024A380001C4E
72077+:1089E000AF8500288E2400248F8600208F850024E8
72078+:1089F000240D00083C010800A42D3FC63C010800DE
72079+:108A0000A4203FDA0E000B83000000009228003CF7
72080+:108A10008FBF00188FB100148FB0001000086142A2
72081+:108A2000AF82002C27BD002003E000083182000146
72082+:108A300090A200303051003F5224002834C50AC0B3
72083+:108A40008CB000241600002234CB09008CA600480C
72084+:108A50003C0A7FFF3545FFFF00C510243C0E800017
72085+:108A6000AF82002035C509008F8800208CAD0060E2
72086+:108A7000010D602B15800002010020218CA40060F4
72087+:108A80000A000C22AF8400208D02006C0A000BFC4F
72088+:108A90003C0680008C8200488F8600203C097FFFC6
72089+:108AA0003527FFFF004788243C0480082403000189
72090+:108AB000AF910028AC80006CA383001C0A000C302E
72091+:108AC000AF8600248C9F00140A000C22AF9F002068
72092+:108AD0008D6200680A000C6C3C0E800034C4098072
72093+:108AE0008C8900708CA300140123382B10E0000443
72094+:108AF000000000008C8200700A000C6C3C0E8000AC
72095+:108B00008CA200140A000C6C3C0E80008F8500249F
72096+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
72097+:108B2000AFB000103C04800034870A0090E60030AB
72098+:108B30002402000530C3003F106200B934840900EC
72099+:108B40008F91002000A080213C048000348E0A0018
72100+:108B50008DCD00043C0608008CC63FB831A73FFF0E
72101+:108B600000E6602B5580000100E03021938F001C4F
72102+:108B700011E0007800D0282B349F098093F9007C05
72103+:108B800033380002130000792403003400C3102B93
72104+:108B9000144000D90000000000C3302300D0282B6F
72105+:108BA0003C010800A4233FC414A0006E0200182159
72106+:108BB0003C0408008C843FB40064402B5500000145
72107+:108BC000006020213C05800034A90A00912A003C65
72108+:108BD0003C010800AC243FBC31430020146000037A
72109+:108BE0000000482134AB0E008D6900188F88002CDE
72110+:108BF0000128202B1080005F000000003C050800C9
72111+:108C00008CA53FBC00A96821010D602B1180005C80
72112+:108C100000B0702B0109382300E028213C01080036
72113+:108C2000AC273FBC12000003240AFFFC10B0008DEB
72114+:108C30003224000300AA18243C010800A4203FDAD3
72115+:108C40003C010800AC233FBC006028218F84002435
72116+:108C5000120400063C0B80088D6C006C0200202181
72117+:108C6000AF91002025900001AD70006C8F8D002821
72118+:108C700000858823AF91002401A52023AF8400281C
72119+:108C80001220000224070018240700103C18800856
72120+:108C90003706008090CF00683C010800A0273FD82D
72121+:108CA0002407000131EE00FF11C70047000000005B
72122+:108CB00014800018000028213C06800034D109806F
72123+:108CC00034CD010091A600098E2C001824C40001A7
72124+:108CD000000C86023205007F308B007F1165007F1B
72125+:108CE0002407FF803C19800837290080A124004C0C
72126+:108CF0003C0808008D083FD4241800023C010800FD
72127+:108D0000A0384019350F00083C010800AC2F3FD4B3
72128+:108D1000240500103C02800034440A009083003C8B
72129+:108D2000307F002013E0000500A02021240A00016C
72130+:108D30003C010800AC2A3FBC34A400018FBF0018DE
72131+:108D40008FB100148FB000100080102103E00008E4
72132+:108D500027BD00203C010800A4203FC410A0FF94C0
72133+:108D6000020018210A000CC000C018210A000CB72C
72134+:108D7000240300303C0508008CA53FBC00B0702BDC
72135+:108D800011C0FFA8000000003C19080097393FC43B
72136+:108D90000325C0210307782B11E000072CAA00044B
72137+:108DA0003C0360008C625404305F003F17E0FFE337
72138+:108DB000240400422CAA00041140FF9A240400421B
72139+:108DC0000A000D248FBF00181528FFB9000000000D
72140+:108DD0008CCA00183C1F800024020002015F182585
72141+:108DE000ACC3001837F90A00A0C200689329003C00
72142+:108DF0002404000400A01021312800203C010800B8
72143+:108E0000A0244019110000022405001024020001D2
72144+:108E10003C010800AC223FB40A000D1A3C0280005D
72145+:108E20008F8800288C8900600109282B14A000027B
72146+:108E3000010088218C9100603C048000348B0E007E
72147+:108E40008D640018240A000102202821022030210C
72148+:108E5000A38A001C0E000B83022080210A000CA6AE
72149+:108E6000AF82002C00045823122000073164000355
72150+:108E70003C0E800035C7098090ED007C31AC0004C9
72151+:108E800015800019248F00043C010800A4243FDA57
72152+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
72153+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
72154+:108EB0002404004230A200031440000200A2182340
72155+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
72156+:108ED000A4203FDA0A000CE70060282100C77024B4
72157+:108EE0000A000D0D01C720263C010800A42F3FDA1F
72158+:108EF0000A000D78000000003C010800AC203FBCD7
72159+:108F00000A000D23240400428F8300283C058000C2
72160+:108F100034AA0A00146000060000102191470030B6
72161+:108F20002406000530E400FF108600030000000066
72162+:108F300003E0000800000000914B0048316900FF89
72163+:108F4000000941C21500FFFA3C0680083C040800F5
72164+:108F500094843FC43C0308008C633FDC3C19080048
72165+:108F60008F393FBC3C0F080095EF3FDA0064C02109
72166+:108F70008CCD00040319702101CF602134AB0E00A9
72167+:108F8000018D282318A0001D00000000914F004C07
72168+:108F90008F8C0034956D001031EE00FF8D89000438
72169+:108FA00001AE30238D8A000030CEFFFF000E290075
72170+:108FB0000125C82100003821014720210325182B55
72171+:108FC0000083C021AD990004AD980000918F000A84
72172+:108FD00001CF6821A18D000A956500128F8A0034A7
72173+:108FE000A5450008954B003825690001A5490038C2
72174+:108FF0009148000D35070008A147000D03E0000867
72175+:109000000000000027BDFFD8AFB000189388001CF7
72176+:109010008FB000143C0A80003C197FFF8F8700242A
72177+:109020003738FFFFAFBF0020AFB1001C355F0A002B
72178+:109030000218182493EB003C00087FC03C02BFFFDD
72179+:10904000006F60252CF000013449FFFF3C1F080031
72180+:109050008FFF3FDC8F9900303C18080097183FD2F3
72181+:1090600001897824001047803C07EFFF3C05F0FFA2
72182+:1090700001E818253C1180003169002034E2FFFF2F
72183+:1090800034ADFFFF362E098027A50010240600020C
72184+:1090900003F96023270B0002354A0E0000621824F2
72185+:1090A0000080802115200002000040218D48001C16
72186+:1090B000A7AB0012058000392407000030E800FF4C
72187+:1090C00000083F00006758253C028008AFAB001441
72188+:1090D000344F008091EA00683C08080091083FD9AD
72189+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
72190+:1090F00094423FCCA3A80011016CC024001FCF40B4
72191+:10910000031918258FA70010AFA300143C0C08000A
72192+:10911000918C3FDBA7A200168FAB001400ED482412
72193+:109120003C0F01003C0A0FFF012FC82531980003B6
72194+:10913000355FFFFF016D40243C027000033F38247F
72195+:1091400000181E0000E2482501037825AFAF001487
72196+:10915000AFA9001091CC007C0E000092A3AC0015CA
72197+:10916000362D0A0091A6003C30C400201080000675
72198+:10917000260200083C11080096313FC8262EFFFF4A
72199+:109180003C010800A42E3FC88FBF00208FB1001CF7
72200+:109190008FB0001803E0000827BD00288F8B002C3B
72201+:1091A000010B502B5540FFC5240700010A000E0497
72202+:1091B00030E800FF9383001C3C02800027BDFFD8ED
72203+:1091C00034480A0000805021AFBF002034460AC056
72204+:1091D000010028211060000E3444098091070030FE
72205+:1091E000240B00058F89002030EC003F118B000B11
72206+:1091F00000003821AFA900103C0B80088D69006C7D
72207+:10920000AFAA00180E00015AAFA90014A380001CD9
72208+:109210008FBF002003E0000827BD00288D1F0048F5
72209+:109220003C1808008F183FBC8F9900283C027FFF34
72210+:109230008D0800443443FFFFAFA900103C0B8008A9
72211+:109240008D69006C03E370240319782101CF682332
72212+:1092500001A83821AFAA00180E00015AAFA90014C6
72213+:109260000A000E58A380001C3C05800034A60A00AA
72214+:1092700090C7003C3C06080094C63FDA3C02080058
72215+:109280008C423FD430E30020000624001060001E12
72216+:10929000004438253C0880083505008090A300680C
72217+:1092A00000004821240800010000282124040001B6
72218+:1092B0003C0680008CCD017805A0FFFE34CF014034
72219+:1092C000ADE800083C0208008C423FDCA5E5000444
72220+:1092D000A5E40006ADE2000C3C04080090843FD9F0
72221+:1092E0003C03800834790080A1E40012ADE700144B
72222+:1092F000A5E900189338004C3C0E1000A1F8002D91
72223+:1093000003E00008ACCE017834A90E008D28001CC3
72224+:109310003C0C08008D8C3FBC952B0016952A001440
72225+:10932000018648213164FFFF0A000E803145FFFFAE
72226+:109330003C04800034830A009065003C30A2002089
72227+:109340001040001934870E00000040210000382131
72228+:10935000000020213C0680008CC901780520FFFE1A
72229+:1093600034CA014034CF010091EB0009AD48000838
72230+:109370003C0E08008DCE3FDC240DFF91240C0040F4
72231+:109380003C081000A5440004A5470006AD4E000CA3
72232+:10939000A14D0012AD4C0014A5400018A14B002DAA
72233+:1093A00003E00008ACC801788CE8001894E60012CD
72234+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
72235+:1093C0003C04800034830A009065003C30A20020F9
72236+:1093D0001040002727BDFFF82409000100003821B4
72237+:1093E000240800013C0680008CCA01780540FFFE7D
72238+:1093F0003C0280FF34C40100908D00093C0C080041
72239+:10940000918C4019A3AD00038FAB00003185007F24
72240+:109410003459FFFF01665025AFAA00009083000A6F
72241+:10942000A3A0000200057E00A3A300018FB80000E6
72242+:1094300034CB0140240C30000319702401CF68257F
72243+:10944000AD6D000C27BD0008AD6C0014A5600018C0
72244+:10945000AD690008A56700042409FF80A56800061F
72245+:109460003C081000A169001203E00008ACC80178B4
72246+:1094700034870E008CE9001894E6001294E4001082
72247+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
72248+:10949000AFB100143C118000AFB00010AFBF001896
72249+:1094A00036380A00970F0032363001000E000B7F6D
72250+:1094B00031E43FFF8E0E0000240DFF803C042000AD
72251+:1094C00001C25821016D6024000C4940316A007FBF
72252+:1094D000012A4025010438253C048008AE270830C5
72253+:1094E0003486008090C500682403000230A200FF8B
72254+:1094F000104300048F9F00208F990024AC9F0068C8
72255+:10950000AC9900648FBF00188FB100148FB00010A9
72256+:1095100003E0000827BD00203C0A0800254A3A80E5
72257+:109520003C09080025293B103C08080025082F1C91
72258+:109530003C07080024E73BDC3C06080024C639044D
72259+:109540003C05080024A536583C0408002484325CFD
72260+:109550003C030800246339B83C0208002442375415
72261+:109560003C010800AC2A3F983C010800AC293F941C
72262+:109570003C010800AC283F903C010800AC273F9C10
72263+:109580003C010800AC263FAC3C010800AC253FA4E0
72264+:109590003C010800AC243FA03C010800AC233FB0D4
72265+:1095A0003C010800AC223FA803E0000800000000D6
72266+:1095B00080000940800009008008010080080080C8
72267+:1095C00080080000800E00008008008080080000F5
72268+:1095D00080000A8080000A00800009808000090065
72269+:00000001FF
72270diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
72271index 703342e..2b96b597 100644
72272--- a/fs/9p/vfs_inode.c
72273+++ b/fs/9p/vfs_inode.c
72274@@ -540,8 +540,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
72275 unlock_new_inode(inode);
72276 return inode;
72277 error:
72278- unlock_new_inode(inode);
72279- iput(inode);
72280+ iget_failed(inode);
72281 return ERR_PTR(retval);
72282
72283 }
72284@@ -1312,7 +1311,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
72285 void
72286 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
72287 {
72288- char *s = nd_get_link(nd);
72289+ const char *s = nd_get_link(nd);
72290
72291 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
72292 dentry, IS_ERR(s) ? "<error>" : s);
72293diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
72294index 9861c7c..4d3ecfb 100644
72295--- a/fs/9p/vfs_inode_dotl.c
72296+++ b/fs/9p/vfs_inode_dotl.c
72297@@ -149,8 +149,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
72298 unlock_new_inode(inode);
72299 return inode;
72300 error:
72301- unlock_new_inode(inode);
72302- iput(inode);
72303+ iget_failed(inode);
72304 return ERR_PTR(retval);
72305
72306 }
72307diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
72308index 2d0cbbd..a6d6149 100644
72309--- a/fs/Kconfig.binfmt
72310+++ b/fs/Kconfig.binfmt
72311@@ -103,7 +103,7 @@ config HAVE_AOUT
72312
72313 config BINFMT_AOUT
72314 tristate "Kernel support for a.out and ECOFF binaries"
72315- depends on HAVE_AOUT
72316+ depends on HAVE_AOUT && BROKEN
72317 ---help---
72318 A.out (Assembler.OUTput) is a set of formats for libraries and
72319 executables used in the earliest versions of UNIX. Linux used
72320diff --git a/fs/afs/inode.c b/fs/afs/inode.c
72321index e06f5a2..81d07ac 100644
72322--- a/fs/afs/inode.c
72323+++ b/fs/afs/inode.c
72324@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72325 struct afs_vnode *vnode;
72326 struct super_block *sb;
72327 struct inode *inode;
72328- static atomic_t afs_autocell_ino;
72329+ static atomic_unchecked_t afs_autocell_ino;
72330
72331 _enter("{%x:%u},%*.*s,",
72332 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
72333@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72334 data.fid.unique = 0;
72335 data.fid.vnode = 0;
72336
72337- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
72338+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
72339 afs_iget5_autocell_test, afs_iget5_set,
72340 &data);
72341 if (!inode) {
72342diff --git a/fs/aio.c b/fs/aio.c
72343index 480440f..623fd88 100644
72344--- a/fs/aio.c
72345+++ b/fs/aio.c
72346@@ -441,7 +441,7 @@ static int aio_setup_ring(struct kioctx *ctx)
72347 size += sizeof(struct io_event) * nr_events;
72348
72349 nr_pages = PFN_UP(size);
72350- if (nr_pages < 0)
72351+ if (nr_pages <= 0)
72352 return -EINVAL;
72353
72354 file = aio_private_file(ctx, nr_pages);
72355diff --git a/fs/attr.c b/fs/attr.c
72356index 6530ced..4a827e2 100644
72357--- a/fs/attr.c
72358+++ b/fs/attr.c
72359@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
72360 unsigned long limit;
72361
72362 limit = rlimit(RLIMIT_FSIZE);
72363+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
72364 if (limit != RLIM_INFINITY && offset > limit)
72365 goto out_sig;
72366 if (offset > inode->i_sb->s_maxbytes)
72367diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
72368index 35b755e..f4b9e0a 100644
72369--- a/fs/autofs4/waitq.c
72370+++ b/fs/autofs4/waitq.c
72371@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
72372 {
72373 unsigned long sigpipe, flags;
72374 mm_segment_t fs;
72375- const char *data = (const char *)addr;
72376+ const char __user *data = (const char __force_user *)addr;
72377 ssize_t wr = 0;
72378
72379 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
72380@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
72381 return 1;
72382 }
72383
72384+#ifdef CONFIG_GRKERNSEC_HIDESYM
72385+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
72386+#endif
72387+
72388 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72389 enum autofs_notify notify)
72390 {
72391@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72392
72393 /* If this is a direct mount request create a dummy name */
72394 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
72395+#ifdef CONFIG_GRKERNSEC_HIDESYM
72396+ /* this name does get written to userland via autofs4_write() */
72397+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
72398+#else
72399 qstr.len = sprintf(name, "%p", dentry);
72400+#endif
72401 else {
72402 qstr.len = autofs4_getpath(sbi, dentry, &name);
72403 if (!qstr.len) {
72404diff --git a/fs/befs/endian.h b/fs/befs/endian.h
72405index 2722387..56059b5 100644
72406--- a/fs/befs/endian.h
72407+++ b/fs/befs/endian.h
72408@@ -11,7 +11,7 @@
72409
72410 #include <asm/byteorder.h>
72411
72412-static inline u64
72413+static inline u64 __intentional_overflow(-1)
72414 fs64_to_cpu(const struct super_block *sb, fs64 n)
72415 {
72416 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72417@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
72418 return (__force fs64)cpu_to_be64(n);
72419 }
72420
72421-static inline u32
72422+static inline u32 __intentional_overflow(-1)
72423 fs32_to_cpu(const struct super_block *sb, fs32 n)
72424 {
72425 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72426@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
72427 return (__force fs32)cpu_to_be32(n);
72428 }
72429
72430-static inline u16
72431+static inline u16 __intentional_overflow(-1)
72432 fs16_to_cpu(const struct super_block *sb, fs16 n)
72433 {
72434 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72435diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
72436index 4c55668..eeae150 100644
72437--- a/fs/binfmt_aout.c
72438+++ b/fs/binfmt_aout.c
72439@@ -16,6 +16,7 @@
72440 #include <linux/string.h>
72441 #include <linux/fs.h>
72442 #include <linux/file.h>
72443+#include <linux/security.h>
72444 #include <linux/stat.h>
72445 #include <linux/fcntl.h>
72446 #include <linux/ptrace.h>
72447@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
72448 #endif
72449 # define START_STACK(u) ((void __user *)u.start_stack)
72450
72451+ memset(&dump, 0, sizeof(dump));
72452+
72453 fs = get_fs();
72454 set_fs(KERNEL_DS);
72455 has_dumped = 1;
72456@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
72457
72458 /* If the size of the dump file exceeds the rlimit, then see what would happen
72459 if we wrote the stack, but not the data area. */
72460+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
72461 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
72462 dump.u_dsize = 0;
72463
72464 /* Make sure we have enough room to write the stack and data areas. */
72465+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
72466 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
72467 dump.u_ssize = 0;
72468
72469@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
72470 rlim = rlimit(RLIMIT_DATA);
72471 if (rlim >= RLIM_INFINITY)
72472 rlim = ~0;
72473+
72474+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
72475 if (ex.a_data + ex.a_bss > rlim)
72476 return -ENOMEM;
72477
72478@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
72479
72480 install_exec_creds(bprm);
72481
72482+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72483+ current->mm->pax_flags = 0UL;
72484+#endif
72485+
72486+#ifdef CONFIG_PAX_PAGEEXEC
72487+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
72488+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
72489+
72490+#ifdef CONFIG_PAX_EMUTRAMP
72491+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
72492+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
72493+#endif
72494+
72495+#ifdef CONFIG_PAX_MPROTECT
72496+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
72497+ current->mm->pax_flags |= MF_PAX_MPROTECT;
72498+#endif
72499+
72500+ }
72501+#endif
72502+
72503 if (N_MAGIC(ex) == OMAGIC) {
72504 unsigned long text_addr, map_size;
72505 loff_t pos;
72506@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
72507 return error;
72508
72509 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
72510- PROT_READ | PROT_WRITE | PROT_EXEC,
72511+ PROT_READ | PROT_WRITE,
72512 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
72513 fd_offset + ex.a_text);
72514 if (error != N_DATADDR(ex))
72515diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
72516index cd46e41..244f778 100644
72517--- a/fs/binfmt_elf.c
72518+++ b/fs/binfmt_elf.c
72519@@ -35,6 +35,7 @@
72520 #include <linux/utsname.h>
72521 #include <linux/coredump.h>
72522 #include <linux/sched.h>
72523+#include <linux/xattr.h>
72524 #include <asm/uaccess.h>
72525 #include <asm/param.h>
72526 #include <asm/page.h>
72527@@ -48,7 +49,7 @@
72528
72529 static int load_elf_binary(struct linux_binprm *bprm);
72530 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
72531- int, int, unsigned long);
72532+ int, int, unsigned long) __intentional_overflow(-1);
72533
72534 #ifdef CONFIG_USELIB
72535 static int load_elf_library(struct file *);
72536@@ -66,6 +67,14 @@ static int elf_core_dump(struct coredump_params *cprm);
72537 #define elf_core_dump NULL
72538 #endif
72539
72540+#ifdef CONFIG_PAX_MPROTECT
72541+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
72542+#endif
72543+
72544+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72545+static void elf_handle_mmap(struct file *file);
72546+#endif
72547+
72548 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
72549 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
72550 #else
72551@@ -85,6 +94,15 @@ static struct linux_binfmt elf_format = {
72552 .load_binary = load_elf_binary,
72553 .load_shlib = load_elf_library,
72554 .core_dump = elf_core_dump,
72555+
72556+#ifdef CONFIG_PAX_MPROTECT
72557+ .handle_mprotect= elf_handle_mprotect,
72558+#endif
72559+
72560+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72561+ .handle_mmap = elf_handle_mmap,
72562+#endif
72563+
72564 .min_coredump = ELF_EXEC_PAGESIZE,
72565 };
72566
72567@@ -92,6 +110,8 @@ static struct linux_binfmt elf_format = {
72568
72569 static int set_brk(unsigned long start, unsigned long end)
72570 {
72571+ unsigned long e = end;
72572+
72573 start = ELF_PAGEALIGN(start);
72574 end = ELF_PAGEALIGN(end);
72575 if (end > start) {
72576@@ -100,7 +120,7 @@ static int set_brk(unsigned long start, unsigned long end)
72577 if (BAD_ADDR(addr))
72578 return addr;
72579 }
72580- current->mm->start_brk = current->mm->brk = end;
72581+ current->mm->start_brk = current->mm->brk = e;
72582 return 0;
72583 }
72584
72585@@ -161,12 +181,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72586 elf_addr_t __user *u_rand_bytes;
72587 const char *k_platform = ELF_PLATFORM;
72588 const char *k_base_platform = ELF_BASE_PLATFORM;
72589- unsigned char k_rand_bytes[16];
72590+ u32 k_rand_bytes[4];
72591 int items;
72592 elf_addr_t *elf_info;
72593 int ei_index = 0;
72594 const struct cred *cred = current_cred();
72595 struct vm_area_struct *vma;
72596+ unsigned long saved_auxv[AT_VECTOR_SIZE];
72597
72598 /*
72599 * In some cases (e.g. Hyper-Threading), we want to avoid L1
72600@@ -208,8 +229,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72601 * Generate 16 random bytes for userspace PRNG seeding.
72602 */
72603 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
72604- u_rand_bytes = (elf_addr_t __user *)
72605- STACK_ALLOC(p, sizeof(k_rand_bytes));
72606+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
72607+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
72608+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
72609+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
72610+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
72611+ u_rand_bytes = (elf_addr_t __user *) p;
72612 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
72613 return -EFAULT;
72614
72615@@ -324,9 +349,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72616 return -EFAULT;
72617 current->mm->env_end = p;
72618
72619+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
72620+
72621 /* Put the elf_info on the stack in the right place. */
72622 sp = (elf_addr_t __user *)envp + 1;
72623- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
72624+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
72625 return -EFAULT;
72626 return 0;
72627 }
72628@@ -515,14 +542,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
72629 an ELF header */
72630
72631 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72632- struct file *interpreter, unsigned long *interp_map_addr,
72633+ struct file *interpreter,
72634 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
72635 {
72636 struct elf_phdr *eppnt;
72637- unsigned long load_addr = 0;
72638+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
72639 int load_addr_set = 0;
72640 unsigned long last_bss = 0, elf_bss = 0;
72641- unsigned long error = ~0UL;
72642+ unsigned long error = -EINVAL;
72643 unsigned long total_size;
72644 int i;
72645
72646@@ -542,6 +569,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72647 goto out;
72648 }
72649
72650+#ifdef CONFIG_PAX_SEGMEXEC
72651+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
72652+ pax_task_size = SEGMEXEC_TASK_SIZE;
72653+#endif
72654+
72655 eppnt = interp_elf_phdata;
72656 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
72657 if (eppnt->p_type == PT_LOAD) {
72658@@ -565,8 +597,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72659 map_addr = elf_map(interpreter, load_addr + vaddr,
72660 eppnt, elf_prot, elf_type, total_size);
72661 total_size = 0;
72662- if (!*interp_map_addr)
72663- *interp_map_addr = map_addr;
72664 error = map_addr;
72665 if (BAD_ADDR(map_addr))
72666 goto out;
72667@@ -585,8 +615,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72668 k = load_addr + eppnt->p_vaddr;
72669 if (BAD_ADDR(k) ||
72670 eppnt->p_filesz > eppnt->p_memsz ||
72671- eppnt->p_memsz > TASK_SIZE ||
72672- TASK_SIZE - eppnt->p_memsz < k) {
72673+ eppnt->p_memsz > pax_task_size ||
72674+ pax_task_size - eppnt->p_memsz < k) {
72675 error = -ENOMEM;
72676 goto out;
72677 }
72678@@ -625,9 +655,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72679 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
72680
72681 /* Map the last of the bss segment */
72682- error = vm_brk(elf_bss, last_bss - elf_bss);
72683- if (BAD_ADDR(error))
72684- goto out;
72685+ if (last_bss > elf_bss) {
72686+ error = vm_brk(elf_bss, last_bss - elf_bss);
72687+ if (BAD_ADDR(error))
72688+ goto out;
72689+ }
72690 }
72691
72692 error = load_addr;
72693@@ -635,6 +667,336 @@ out:
72694 return error;
72695 }
72696
72697+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72698+#ifdef CONFIG_PAX_SOFTMODE
72699+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
72700+{
72701+ unsigned long pax_flags = 0UL;
72702+
72703+#ifdef CONFIG_PAX_PAGEEXEC
72704+ if (elf_phdata->p_flags & PF_PAGEEXEC)
72705+ pax_flags |= MF_PAX_PAGEEXEC;
72706+#endif
72707+
72708+#ifdef CONFIG_PAX_SEGMEXEC
72709+ if (elf_phdata->p_flags & PF_SEGMEXEC)
72710+ pax_flags |= MF_PAX_SEGMEXEC;
72711+#endif
72712+
72713+#ifdef CONFIG_PAX_EMUTRAMP
72714+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72715+ pax_flags |= MF_PAX_EMUTRAMP;
72716+#endif
72717+
72718+#ifdef CONFIG_PAX_MPROTECT
72719+ if (elf_phdata->p_flags & PF_MPROTECT)
72720+ pax_flags |= MF_PAX_MPROTECT;
72721+#endif
72722+
72723+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72724+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
72725+ pax_flags |= MF_PAX_RANDMMAP;
72726+#endif
72727+
72728+ return pax_flags;
72729+}
72730+#endif
72731+
72732+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
72733+{
72734+ unsigned long pax_flags = 0UL;
72735+
72736+#ifdef CONFIG_PAX_PAGEEXEC
72737+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
72738+ pax_flags |= MF_PAX_PAGEEXEC;
72739+#endif
72740+
72741+#ifdef CONFIG_PAX_SEGMEXEC
72742+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
72743+ pax_flags |= MF_PAX_SEGMEXEC;
72744+#endif
72745+
72746+#ifdef CONFIG_PAX_EMUTRAMP
72747+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
72748+ pax_flags |= MF_PAX_EMUTRAMP;
72749+#endif
72750+
72751+#ifdef CONFIG_PAX_MPROTECT
72752+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
72753+ pax_flags |= MF_PAX_MPROTECT;
72754+#endif
72755+
72756+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72757+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
72758+ pax_flags |= MF_PAX_RANDMMAP;
72759+#endif
72760+
72761+ return pax_flags;
72762+}
72763+#endif
72764+
72765+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72766+#ifdef CONFIG_PAX_SOFTMODE
72767+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
72768+{
72769+ unsigned long pax_flags = 0UL;
72770+
72771+#ifdef CONFIG_PAX_PAGEEXEC
72772+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
72773+ pax_flags |= MF_PAX_PAGEEXEC;
72774+#endif
72775+
72776+#ifdef CONFIG_PAX_SEGMEXEC
72777+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
72778+ pax_flags |= MF_PAX_SEGMEXEC;
72779+#endif
72780+
72781+#ifdef CONFIG_PAX_EMUTRAMP
72782+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72783+ pax_flags |= MF_PAX_EMUTRAMP;
72784+#endif
72785+
72786+#ifdef CONFIG_PAX_MPROTECT
72787+ if (pax_flags_softmode & MF_PAX_MPROTECT)
72788+ pax_flags |= MF_PAX_MPROTECT;
72789+#endif
72790+
72791+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72792+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
72793+ pax_flags |= MF_PAX_RANDMMAP;
72794+#endif
72795+
72796+ return pax_flags;
72797+}
72798+#endif
72799+
72800+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
72801+{
72802+ unsigned long pax_flags = 0UL;
72803+
72804+#ifdef CONFIG_PAX_PAGEEXEC
72805+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
72806+ pax_flags |= MF_PAX_PAGEEXEC;
72807+#endif
72808+
72809+#ifdef CONFIG_PAX_SEGMEXEC
72810+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
72811+ pax_flags |= MF_PAX_SEGMEXEC;
72812+#endif
72813+
72814+#ifdef CONFIG_PAX_EMUTRAMP
72815+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
72816+ pax_flags |= MF_PAX_EMUTRAMP;
72817+#endif
72818+
72819+#ifdef CONFIG_PAX_MPROTECT
72820+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
72821+ pax_flags |= MF_PAX_MPROTECT;
72822+#endif
72823+
72824+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72825+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
72826+ pax_flags |= MF_PAX_RANDMMAP;
72827+#endif
72828+
72829+ return pax_flags;
72830+}
72831+#endif
72832+
72833+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72834+static unsigned long pax_parse_defaults(void)
72835+{
72836+ unsigned long pax_flags = 0UL;
72837+
72838+#ifdef CONFIG_PAX_SOFTMODE
72839+ if (pax_softmode)
72840+ return pax_flags;
72841+#endif
72842+
72843+#ifdef CONFIG_PAX_PAGEEXEC
72844+ pax_flags |= MF_PAX_PAGEEXEC;
72845+#endif
72846+
72847+#ifdef CONFIG_PAX_SEGMEXEC
72848+ pax_flags |= MF_PAX_SEGMEXEC;
72849+#endif
72850+
72851+#ifdef CONFIG_PAX_MPROTECT
72852+ pax_flags |= MF_PAX_MPROTECT;
72853+#endif
72854+
72855+#ifdef CONFIG_PAX_RANDMMAP
72856+ if (randomize_va_space)
72857+ pax_flags |= MF_PAX_RANDMMAP;
72858+#endif
72859+
72860+ return pax_flags;
72861+}
72862+
72863+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
72864+{
72865+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
72866+
72867+#ifdef CONFIG_PAX_EI_PAX
72868+
72869+#ifdef CONFIG_PAX_SOFTMODE
72870+ if (pax_softmode)
72871+ return pax_flags;
72872+#endif
72873+
72874+ pax_flags = 0UL;
72875+
72876+#ifdef CONFIG_PAX_PAGEEXEC
72877+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
72878+ pax_flags |= MF_PAX_PAGEEXEC;
72879+#endif
72880+
72881+#ifdef CONFIG_PAX_SEGMEXEC
72882+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
72883+ pax_flags |= MF_PAX_SEGMEXEC;
72884+#endif
72885+
72886+#ifdef CONFIG_PAX_EMUTRAMP
72887+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
72888+ pax_flags |= MF_PAX_EMUTRAMP;
72889+#endif
72890+
72891+#ifdef CONFIG_PAX_MPROTECT
72892+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
72893+ pax_flags |= MF_PAX_MPROTECT;
72894+#endif
72895+
72896+#ifdef CONFIG_PAX_ASLR
72897+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
72898+ pax_flags |= MF_PAX_RANDMMAP;
72899+#endif
72900+
72901+#endif
72902+
72903+ return pax_flags;
72904+
72905+}
72906+
72907+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
72908+{
72909+
72910+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72911+ unsigned long i;
72912+
72913+ for (i = 0UL; i < elf_ex->e_phnum; i++)
72914+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
72915+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
72916+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
72917+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
72918+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
72919+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
72920+ return PAX_PARSE_FLAGS_FALLBACK;
72921+
72922+#ifdef CONFIG_PAX_SOFTMODE
72923+ if (pax_softmode)
72924+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
72925+ else
72926+#endif
72927+
72928+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
72929+ break;
72930+ }
72931+#endif
72932+
72933+ return PAX_PARSE_FLAGS_FALLBACK;
72934+}
72935+
72936+static unsigned long pax_parse_xattr_pax(struct file * const file)
72937+{
72938+
72939+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72940+ ssize_t xattr_size, i;
72941+ unsigned char xattr_value[sizeof("pemrs") - 1];
72942+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
72943+
72944+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
72945+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
72946+ return PAX_PARSE_FLAGS_FALLBACK;
72947+
72948+ for (i = 0; i < xattr_size; i++)
72949+ switch (xattr_value[i]) {
72950+ default:
72951+ return PAX_PARSE_FLAGS_FALLBACK;
72952+
72953+#define parse_flag(option1, option2, flag) \
72954+ case option1: \
72955+ if (pax_flags_hardmode & MF_PAX_##flag) \
72956+ return PAX_PARSE_FLAGS_FALLBACK;\
72957+ pax_flags_hardmode |= MF_PAX_##flag; \
72958+ break; \
72959+ case option2: \
72960+ if (pax_flags_softmode & MF_PAX_##flag) \
72961+ return PAX_PARSE_FLAGS_FALLBACK;\
72962+ pax_flags_softmode |= MF_PAX_##flag; \
72963+ break;
72964+
72965+ parse_flag('p', 'P', PAGEEXEC);
72966+ parse_flag('e', 'E', EMUTRAMP);
72967+ parse_flag('m', 'M', MPROTECT);
72968+ parse_flag('r', 'R', RANDMMAP);
72969+ parse_flag('s', 'S', SEGMEXEC);
72970+
72971+#undef parse_flag
72972+ }
72973+
72974+ if (pax_flags_hardmode & pax_flags_softmode)
72975+ return PAX_PARSE_FLAGS_FALLBACK;
72976+
72977+#ifdef CONFIG_PAX_SOFTMODE
72978+ if (pax_softmode)
72979+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
72980+ else
72981+#endif
72982+
72983+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
72984+#else
72985+ return PAX_PARSE_FLAGS_FALLBACK;
72986+#endif
72987+
72988+}
72989+
72990+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
72991+{
72992+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
72993+
72994+ pax_flags = pax_parse_defaults();
72995+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
72996+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
72997+ xattr_pax_flags = pax_parse_xattr_pax(file);
72998+
72999+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
73000+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
73001+ pt_pax_flags != xattr_pax_flags)
73002+ return -EINVAL;
73003+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
73004+ pax_flags = xattr_pax_flags;
73005+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
73006+ pax_flags = pt_pax_flags;
73007+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
73008+ pax_flags = ei_pax_flags;
73009+
73010+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
73011+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73012+ if ((__supported_pte_mask & _PAGE_NX))
73013+ pax_flags &= ~MF_PAX_SEGMEXEC;
73014+ else
73015+ pax_flags &= ~MF_PAX_PAGEEXEC;
73016+ }
73017+#endif
73018+
73019+ if (0 > pax_check_flags(&pax_flags))
73020+ return -EINVAL;
73021+
73022+ current->mm->pax_flags = pax_flags;
73023+ return 0;
73024+}
73025+#endif
73026+
73027 /*
73028 * These are the functions used to load ELF style executables and shared
73029 * libraries. There is no binary dependent code anywhere else.
73030@@ -648,6 +1010,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
73031 {
73032 unsigned long random_variable = 0;
73033
73034+#ifdef CONFIG_PAX_RANDUSTACK
73035+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
73036+ return stack_top - current->mm->delta_stack;
73037+#endif
73038+
73039 if ((current->flags & PF_RANDOMIZE) &&
73040 !(current->personality & ADDR_NO_RANDOMIZE)) {
73041 random_variable = (unsigned long) get_random_int();
73042@@ -667,7 +1034,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73043 unsigned long load_addr = 0, load_bias = 0;
73044 int load_addr_set = 0;
73045 char * elf_interpreter = NULL;
73046- unsigned long error;
73047+ unsigned long error = 0;
73048 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
73049 unsigned long elf_bss, elf_brk;
73050 int retval, i;
73051@@ -682,6 +1049,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73052 struct elfhdr interp_elf_ex;
73053 } *loc;
73054 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
73055+ unsigned long pax_task_size;
73056
73057 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
73058 if (!loc) {
73059@@ -840,6 +1208,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
73060 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
73061 may depend on the personality. */
73062 SET_PERSONALITY2(loc->elf_ex, &arch_state);
73063+
73064+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73065+ current->mm->pax_flags = 0UL;
73066+#endif
73067+
73068+#ifdef CONFIG_PAX_DLRESOLVE
73069+ current->mm->call_dl_resolve = 0UL;
73070+#endif
73071+
73072+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
73073+ current->mm->call_syscall = 0UL;
73074+#endif
73075+
73076+#ifdef CONFIG_PAX_ASLR
73077+ current->mm->delta_mmap = 0UL;
73078+ current->mm->delta_stack = 0UL;
73079+#endif
73080+
73081+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73082+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
73083+ send_sig(SIGKILL, current, 0);
73084+ goto out_free_dentry;
73085+ }
73086+#endif
73087+
73088+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
73089+ pax_set_initial_flags(bprm);
73090+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
73091+ if (pax_set_initial_flags_func)
73092+ (pax_set_initial_flags_func)(bprm);
73093+#endif
73094+
73095+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73096+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
73097+ current->mm->context.user_cs_limit = PAGE_SIZE;
73098+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
73099+ }
73100+#endif
73101+
73102+#ifdef CONFIG_PAX_SEGMEXEC
73103+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73104+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
73105+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
73106+ pax_task_size = SEGMEXEC_TASK_SIZE;
73107+ current->mm->def_flags |= VM_NOHUGEPAGE;
73108+ } else
73109+#endif
73110+
73111+ pax_task_size = TASK_SIZE;
73112+
73113+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
73114+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73115+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
73116+ put_cpu();
73117+ }
73118+#endif
73119+
73120+#ifdef CONFIG_PAX_ASLR
73121+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
73122+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
73123+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
73124+ }
73125+#endif
73126+
73127+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
73128+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73129+ executable_stack = EXSTACK_DISABLE_X;
73130+ current->personality &= ~READ_IMPLIES_EXEC;
73131+ } else
73132+#endif
73133+
73134 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
73135 current->personality |= READ_IMPLIES_EXEC;
73136
73137@@ -915,8 +1354,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
73138 if (current->flags & PF_RANDOMIZE)
73139 load_bias += arch_mmap_rnd();
73140 load_bias = ELF_PAGESTART(load_bias);
73141- total_size = total_mapping_size(elf_phdata,
73142- loc->elf_ex.e_phnum);
73143+
73144+#ifdef CONFIG_PAX_RANDMMAP
73145+ /* PaX: randomize base address at the default exe base if requested */
73146+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
73147+#ifdef CONFIG_SPARC64
73148+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
73149+#else
73150+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
73151+#endif
73152+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
73153+ elf_flags |= MAP_FIXED;
73154+ }
73155+#endif
73156+
73157+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
73158 if (!total_size) {
73159 retval = -EINVAL;
73160 goto out_free_dentry;
73161@@ -952,9 +1404,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
73162 * allowed task size. Note that p_filesz must always be
73163 * <= p_memsz so it is only necessary to check p_memsz.
73164 */
73165- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
73166- elf_ppnt->p_memsz > TASK_SIZE ||
73167- TASK_SIZE - elf_ppnt->p_memsz < k) {
73168+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
73169+ elf_ppnt->p_memsz > pax_task_size ||
73170+ pax_task_size - elf_ppnt->p_memsz < k) {
73171 /* set_brk can never work. Avoid overflows. */
73172 retval = -EINVAL;
73173 goto out_free_dentry;
73174@@ -990,16 +1442,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
73175 if (retval)
73176 goto out_free_dentry;
73177 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
73178- retval = -EFAULT; /* Nobody gets to see this, but.. */
73179- goto out_free_dentry;
73180+ /*
73181+ * This bss-zeroing can fail if the ELF
73182+ * file specifies odd protections. So
73183+ * we don't check the return value
73184+ */
73185 }
73186
73187+#ifdef CONFIG_PAX_RANDMMAP
73188+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
73189+ unsigned long start, size, flags;
73190+ vm_flags_t vm_flags;
73191+
73192+ start = ELF_PAGEALIGN(elf_brk);
73193+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
73194+ flags = MAP_FIXED | MAP_PRIVATE;
73195+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
73196+
73197+ down_write(&current->mm->mmap_sem);
73198+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
73199+ retval = -ENOMEM;
73200+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
73201+// if (current->personality & ADDR_NO_RANDOMIZE)
73202+// vm_flags |= VM_READ | VM_MAYREAD;
73203+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
73204+ retval = IS_ERR_VALUE(start) ? start : 0;
73205+ }
73206+ up_write(&current->mm->mmap_sem);
73207+ if (retval == 0)
73208+ retval = set_brk(start + size, start + size + PAGE_SIZE);
73209+ if (retval < 0)
73210+ goto out_free_dentry;
73211+ }
73212+#endif
73213+
73214 if (elf_interpreter) {
73215- unsigned long interp_map_addr = 0;
73216-
73217 elf_entry = load_elf_interp(&loc->interp_elf_ex,
73218 interpreter,
73219- &interp_map_addr,
73220 load_bias, interp_elf_phdata);
73221 if (!IS_ERR((void *)elf_entry)) {
73222 /*
73223@@ -1050,6 +1529,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73224 current->mm->end_data = end_data;
73225 current->mm->start_stack = bprm->p;
73226
73227+#ifndef CONFIG_PAX_RANDMMAP
73228 if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
73229 current->mm->brk = current->mm->start_brk =
73230 arch_randomize_brk(current->mm);
73231@@ -1057,6 +1537,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73232 current->brk_randomized = 1;
73233 #endif
73234 }
73235+#endif
73236
73237 if (current->personality & MMAP_PAGE_ZERO) {
73238 /* Why this, you ask??? Well SVr4 maps page 0 as read-only,
73239@@ -1225,7 +1706,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
73240 * Decide what to dump of a segment, part, all or none.
73241 */
73242 static unsigned long vma_dump_size(struct vm_area_struct *vma,
73243- unsigned long mm_flags)
73244+ unsigned long mm_flags, long signr)
73245 {
73246 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
73247
73248@@ -1263,7 +1744,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
73249 if (vma->vm_file == NULL)
73250 return 0;
73251
73252- if (FILTER(MAPPED_PRIVATE))
73253+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
73254 goto whole;
73255
73256 /*
73257@@ -1470,9 +1951,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
73258 {
73259 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
73260 int i = 0;
73261- do
73262+ do {
73263 i += 2;
73264- while (auxv[i - 2] != AT_NULL);
73265+ } while (auxv[i - 2] != AT_NULL);
73266 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
73267 }
73268
73269@@ -1481,7 +1962,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
73270 {
73271 mm_segment_t old_fs = get_fs();
73272 set_fs(KERNEL_DS);
73273- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
73274+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
73275 set_fs(old_fs);
73276 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
73277 }
73278@@ -2201,7 +2682,7 @@ static int elf_core_dump(struct coredump_params *cprm)
73279 vma = next_vma(vma, gate_vma)) {
73280 unsigned long dump_size;
73281
73282- dump_size = vma_dump_size(vma, cprm->mm_flags);
73283+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
73284 vma_filesz[i++] = dump_size;
73285 vma_data_size += dump_size;
73286 }
73287@@ -2309,6 +2790,167 @@ out:
73288
73289 #endif /* CONFIG_ELF_CORE */
73290
73291+#ifdef CONFIG_PAX_MPROTECT
73292+/* PaX: non-PIC ELF libraries need relocations on their executable segments
73293+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
73294+ * we'll remove VM_MAYWRITE for good on RELRO segments.
73295+ *
73296+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
73297+ * basis because we want to allow the common case and not the special ones.
73298+ */
73299+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
73300+{
73301+ struct elfhdr elf_h;
73302+ struct elf_phdr elf_p;
73303+ unsigned long i;
73304+ unsigned long oldflags;
73305+ bool is_textrel_rw, is_textrel_rx, is_relro;
73306+
73307+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
73308+ return;
73309+
73310+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
73311+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
73312+
73313+#ifdef CONFIG_PAX_ELFRELOCS
73314+ /* possible TEXTREL */
73315+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
73316+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
73317+#else
73318+ is_textrel_rw = false;
73319+ is_textrel_rx = false;
73320+#endif
73321+
73322+ /* possible RELRO */
73323+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
73324+
73325+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
73326+ return;
73327+
73328+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73329+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73330+
73331+#ifdef CONFIG_PAX_ETEXECRELOCS
73332+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73333+#else
73334+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
73335+#endif
73336+
73337+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73338+ !elf_check_arch(&elf_h) ||
73339+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73340+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73341+ return;
73342+
73343+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73344+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73345+ return;
73346+ switch (elf_p.p_type) {
73347+ case PT_DYNAMIC:
73348+ if (!is_textrel_rw && !is_textrel_rx)
73349+ continue;
73350+ i = 0UL;
73351+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
73352+ elf_dyn dyn;
73353+
73354+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
73355+ break;
73356+ if (dyn.d_tag == DT_NULL)
73357+ break;
73358+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
73359+ gr_log_textrel(vma);
73360+ if (is_textrel_rw)
73361+ vma->vm_flags |= VM_MAYWRITE;
73362+ else
73363+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
73364+ vma->vm_flags &= ~VM_MAYWRITE;
73365+ break;
73366+ }
73367+ i++;
73368+ }
73369+ is_textrel_rw = false;
73370+ is_textrel_rx = false;
73371+ continue;
73372+
73373+ case PT_GNU_RELRO:
73374+ if (!is_relro)
73375+ continue;
73376+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
73377+ vma->vm_flags &= ~VM_MAYWRITE;
73378+ is_relro = false;
73379+ continue;
73380+
73381+#ifdef CONFIG_PAX_PT_PAX_FLAGS
73382+ case PT_PAX_FLAGS: {
73383+ const char *msg_mprotect = "", *msg_emutramp = "";
73384+ char *buffer_lib, *buffer_exe;
73385+
73386+ if (elf_p.p_flags & PF_NOMPROTECT)
73387+ msg_mprotect = "MPROTECT disabled";
73388+
73389+#ifdef CONFIG_PAX_EMUTRAMP
73390+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
73391+ msg_emutramp = "EMUTRAMP enabled";
73392+#endif
73393+
73394+ if (!msg_mprotect[0] && !msg_emutramp[0])
73395+ continue;
73396+
73397+ if (!printk_ratelimit())
73398+ continue;
73399+
73400+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
73401+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
73402+ if (buffer_lib && buffer_exe) {
73403+ char *path_lib, *path_exe;
73404+
73405+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
73406+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
73407+
73408+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
73409+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
73410+
73411+ }
73412+ free_page((unsigned long)buffer_exe);
73413+ free_page((unsigned long)buffer_lib);
73414+ continue;
73415+ }
73416+#endif
73417+
73418+ }
73419+ }
73420+}
73421+#endif
73422+
73423+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
73424+
73425+extern int grsec_enable_log_rwxmaps;
73426+
73427+static void elf_handle_mmap(struct file *file)
73428+{
73429+ struct elfhdr elf_h;
73430+ struct elf_phdr elf_p;
73431+ unsigned long i;
73432+
73433+ if (!grsec_enable_log_rwxmaps)
73434+ return;
73435+
73436+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73437+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73438+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
73439+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73440+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73441+ return;
73442+
73443+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73444+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73445+ return;
73446+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
73447+ gr_log_ptgnustack(file);
73448+ }
73449+}
73450+#endif
73451+
73452 static int __init init_elf_binfmt(void)
73453 {
73454 register_binfmt(&elf_format);
73455diff --git a/fs/block_dev.c b/fs/block_dev.c
73456index c7e4163..6939003 100644
73457--- a/fs/block_dev.c
73458+++ b/fs/block_dev.c
73459@@ -732,7 +732,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
73460 else if (bdev->bd_contains == bdev)
73461 return true; /* is a whole device which isn't held */
73462
73463- else if (whole->bd_holder == bd_may_claim)
73464+ else if (whole->bd_holder == (void *)bd_may_claim)
73465 return true; /* is a partition of a device that is being partitioned */
73466 else if (whole->bd_holder != NULL)
73467 return false; /* is a partition of a held device */
73468diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
73469index 0f11ebc..1bf3321 100644
73470--- a/fs/btrfs/ctree.c
73471+++ b/fs/btrfs/ctree.c
73472@@ -1180,9 +1180,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
73473 free_extent_buffer(buf);
73474 add_root_to_dirty_list(root);
73475 } else {
73476- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
73477- parent_start = parent->start;
73478- else
73479+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
73480+ if (parent)
73481+ parent_start = parent->start;
73482+ else
73483+ parent_start = 0;
73484+ } else
73485 parent_start = 0;
73486
73487 WARN_ON(trans->transid != btrfs_header_generation(parent));
73488diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
73489index a2ae427..53c2e98 100644
73490--- a/fs/btrfs/delayed-inode.c
73491+++ b/fs/btrfs/delayed-inode.c
73492@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
73493
73494 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
73495 {
73496- int seq = atomic_inc_return(&delayed_root->items_seq);
73497+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
73498 if ((atomic_dec_return(&delayed_root->items) <
73499 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
73500 waitqueue_active(&delayed_root->wait))
73501@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
73502
73503 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
73504 {
73505- int val = atomic_read(&delayed_root->items_seq);
73506+ int val = atomic_read_unchecked(&delayed_root->items_seq);
73507
73508 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
73509 return 1;
73510@@ -1437,7 +1437,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
73511 int seq;
73512 int ret;
73513
73514- seq = atomic_read(&delayed_root->items_seq);
73515+ seq = atomic_read_unchecked(&delayed_root->items_seq);
73516
73517 ret = btrfs_wq_run_delayed_node(delayed_root, fs_info, 0);
73518 if (ret)
73519diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
73520index f70119f..ab5894d 100644
73521--- a/fs/btrfs/delayed-inode.h
73522+++ b/fs/btrfs/delayed-inode.h
73523@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
73524 */
73525 struct list_head prepare_list;
73526 atomic_t items; /* for delayed items */
73527- atomic_t items_seq; /* for delayed items */
73528+ atomic_unchecked_t items_seq; /* for delayed items */
73529 int nodes; /* for delayed nodes */
73530 wait_queue_head_t wait;
73531 };
73532@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
73533 struct btrfs_delayed_root *delayed_root)
73534 {
73535 atomic_set(&delayed_root->items, 0);
73536- atomic_set(&delayed_root->items_seq, 0);
73537+ atomic_set_unchecked(&delayed_root->items_seq, 0);
73538 delayed_root->nodes = 0;
73539 spin_lock_init(&delayed_root->lock);
73540 init_waitqueue_head(&delayed_root->wait);
73541diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
73542index 9e66f5e..f7caaf0 100644
73543--- a/fs/btrfs/super.c
73544+++ b/fs/btrfs/super.c
73545@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
73546 function, line, errstr);
73547 return;
73548 }
73549- ACCESS_ONCE(trans->transaction->aborted) = errno;
73550+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
73551 /* Wake up anybody who may be waiting on this transaction */
73552 wake_up(&root->fs_info->transaction_wait);
73553 wake_up(&root->fs_info->transaction_blocked_wait);
73554diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
73555index e8a4c86..f8c22ae 100644
73556--- a/fs/btrfs/sysfs.c
73557+++ b/fs/btrfs/sysfs.c
73558@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
73559 for (set = 0; set < FEAT_MAX; set++) {
73560 int i;
73561 struct attribute *attrs[2];
73562- struct attribute_group agroup = {
73563+ attribute_group_no_const agroup = {
73564 .name = "features",
73565 .attrs = attrs,
73566 };
73567diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
73568index 2299bfd..4098e72 100644
73569--- a/fs/btrfs/tests/free-space-tests.c
73570+++ b/fs/btrfs/tests/free-space-tests.c
73571@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73572 * extent entry.
73573 */
73574 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
73575- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73576+ pax_open_kernel();
73577+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73578+ pax_close_kernel();
73579
73580 /*
73581 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
73582@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73583 if (ret)
73584 return ret;
73585
73586- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73587+ pax_open_kernel();
73588+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73589+ pax_close_kernel();
73590 __btrfs_remove_free_space_cache(cache->free_space_ctl);
73591
73592 return 0;
73593diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
73594index 6916a78..4598936 100644
73595--- a/fs/btrfs/tree-log.h
73596+++ b/fs/btrfs/tree-log.h
73597@@ -45,7 +45,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
73598 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
73599 struct btrfs_trans_handle *trans)
73600 {
73601- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
73602+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
73603 }
73604
73605 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
73606diff --git a/fs/buffer.c b/fs/buffer.c
73607index c7a5602..18eabd1 100644
73608--- a/fs/buffer.c
73609+++ b/fs/buffer.c
73610@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
73611 bh_cachep = kmem_cache_create("buffer_head",
73612 sizeof(struct buffer_head), 0,
73613 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
73614- SLAB_MEM_SPREAD),
73615+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
73616 NULL);
73617
73618 /*
73619diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
73620index 6af790f..ec4c1e6 100644
73621--- a/fs/cachefiles/bind.c
73622+++ b/fs/cachefiles/bind.c
73623@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
73624 args);
73625
73626 /* start by checking things over */
73627- ASSERT(cache->fstop_percent >= 0 &&
73628- cache->fstop_percent < cache->fcull_percent &&
73629+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
73630 cache->fcull_percent < cache->frun_percent &&
73631 cache->frun_percent < 100);
73632
73633- ASSERT(cache->bstop_percent >= 0 &&
73634- cache->bstop_percent < cache->bcull_percent &&
73635+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
73636 cache->bcull_percent < cache->brun_percent &&
73637 cache->brun_percent < 100);
73638
73639diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
73640index f601def..b2cf704 100644
73641--- a/fs/cachefiles/daemon.c
73642+++ b/fs/cachefiles/daemon.c
73643@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
73644 if (n > buflen)
73645 return -EMSGSIZE;
73646
73647- if (copy_to_user(_buffer, buffer, n) != 0)
73648+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
73649 return -EFAULT;
73650
73651 return n;
73652@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
73653 if (test_bit(CACHEFILES_DEAD, &cache->flags))
73654 return -EIO;
73655
73656- if (datalen < 0 || datalen > PAGE_SIZE - 1)
73657+ if (datalen > PAGE_SIZE - 1)
73658 return -EOPNOTSUPP;
73659
73660 /* drag the command string into the kernel so we can parse it */
73661@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
73662 if (args[0] != '%' || args[1] != '\0')
73663 return -EINVAL;
73664
73665- if (fstop < 0 || fstop >= cache->fcull_percent)
73666+ if (fstop >= cache->fcull_percent)
73667 return cachefiles_daemon_range_error(cache, args);
73668
73669 cache->fstop_percent = fstop;
73670@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
73671 if (args[0] != '%' || args[1] != '\0')
73672 return -EINVAL;
73673
73674- if (bstop < 0 || bstop >= cache->bcull_percent)
73675+ if (bstop >= cache->bcull_percent)
73676 return cachefiles_daemon_range_error(cache, args);
73677
73678 cache->bstop_percent = bstop;
73679diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
73680index 8c52472..c4e3a69 100644
73681--- a/fs/cachefiles/internal.h
73682+++ b/fs/cachefiles/internal.h
73683@@ -66,7 +66,7 @@ struct cachefiles_cache {
73684 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
73685 struct rb_root active_nodes; /* active nodes (can't be culled) */
73686 rwlock_t active_lock; /* lock for active_nodes */
73687- atomic_t gravecounter; /* graveyard uniquifier */
73688+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
73689 unsigned frun_percent; /* when to stop culling (% files) */
73690 unsigned fcull_percent; /* when to start culling (% files) */
73691 unsigned fstop_percent; /* when to stop allocating (% files) */
73692@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
73693 * proc.c
73694 */
73695 #ifdef CONFIG_CACHEFILES_HISTOGRAM
73696-extern atomic_t cachefiles_lookup_histogram[HZ];
73697-extern atomic_t cachefiles_mkdir_histogram[HZ];
73698-extern atomic_t cachefiles_create_histogram[HZ];
73699+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73700+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73701+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
73702
73703 extern int __init cachefiles_proc_init(void);
73704 extern void cachefiles_proc_cleanup(void);
73705 static inline
73706-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
73707+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
73708 {
73709 unsigned long jif = jiffies - start_jif;
73710 if (jif >= HZ)
73711 jif = HZ - 1;
73712- atomic_inc(&histogram[jif]);
73713+ atomic_inc_unchecked(&histogram[jif]);
73714 }
73715
73716 #else
73717diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
73718index ab857ab..ff8d593 100644
73719--- a/fs/cachefiles/namei.c
73720+++ b/fs/cachefiles/namei.c
73721@@ -309,7 +309,7 @@ try_again:
73722 /* first step is to make up a grave dentry in the graveyard */
73723 sprintf(nbuffer, "%08x%08x",
73724 (uint32_t) get_seconds(),
73725- (uint32_t) atomic_inc_return(&cache->gravecounter));
73726+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
73727
73728 /* do the multiway lock magic */
73729 trap = lock_rename(cache->graveyard, dir);
73730diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
73731index eccd339..4c1d995 100644
73732--- a/fs/cachefiles/proc.c
73733+++ b/fs/cachefiles/proc.c
73734@@ -14,9 +14,9 @@
73735 #include <linux/seq_file.h>
73736 #include "internal.h"
73737
73738-atomic_t cachefiles_lookup_histogram[HZ];
73739-atomic_t cachefiles_mkdir_histogram[HZ];
73740-atomic_t cachefiles_create_histogram[HZ];
73741+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73742+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73743+atomic_unchecked_t cachefiles_create_histogram[HZ];
73744
73745 /*
73746 * display the latency histogram
73747@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
73748 return 0;
73749 default:
73750 index = (unsigned long) v - 3;
73751- x = atomic_read(&cachefiles_lookup_histogram[index]);
73752- y = atomic_read(&cachefiles_mkdir_histogram[index]);
73753- z = atomic_read(&cachefiles_create_histogram[index]);
73754+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
73755+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
73756+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
73757 if (x == 0 && y == 0 && z == 0)
73758 return 0;
73759
73760diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
73761index 4248307..f41e44e 100644
73762--- a/fs/ceph/dir.c
73763+++ b/fs/ceph/dir.c
73764@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
73765 struct dentry *dentry, *last;
73766 struct ceph_dentry_info *di;
73767 int err = 0;
73768+ char d_name[DNAME_INLINE_LEN];
73769+ const unsigned char *name;
73770
73771 /* claim ref on last dentry we returned */
73772 last = fi->dentry;
73773@@ -190,7 +192,12 @@ more:
73774
73775 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
73776 dentry, dentry, d_inode(dentry));
73777- if (!dir_emit(ctx, dentry->d_name.name,
73778+ name = dentry->d_name.name;
73779+ if (name == dentry->d_iname) {
73780+ memcpy(d_name, name, dentry->d_name.len);
73781+ name = d_name;
73782+ }
73783+ if (!dir_emit(ctx, name,
73784 dentry->d_name.len,
73785 ceph_translate_ino(dentry->d_sb, d_inode(dentry)->i_ino),
73786 d_inode(dentry)->i_mode >> 12)) {
73787@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
73788 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
73789 struct ceph_mds_client *mdsc = fsc->mdsc;
73790 unsigned frag = fpos_frag(ctx->pos);
73791- int off = fpos_off(ctx->pos);
73792+ unsigned int off = fpos_off(ctx->pos);
73793 int err;
73794 u32 ftype;
73795 struct ceph_mds_reply_info_parsed *rinfo;
73796diff --git a/fs/ceph/super.c b/fs/ceph/super.c
73797index 4e99053..a7e2a5f 100644
73798--- a/fs/ceph/super.c
73799+++ b/fs/ceph/super.c
73800@@ -885,7 +885,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
73801 /*
73802 * construct our own bdi so we can control readahead, etc.
73803 */
73804-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
73805+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
73806
73807 static int ceph_register_bdi(struct super_block *sb,
73808 struct ceph_fs_client *fsc)
73809@@ -902,7 +902,7 @@ static int ceph_register_bdi(struct super_block *sb,
73810 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
73811
73812 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
73813- atomic_long_inc_return(&bdi_seq));
73814+ atomic_long_inc_return_unchecked(&bdi_seq));
73815 if (!err)
73816 sb->s_bdi = &fsc->backing_dev_info;
73817 return err;
73818diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
73819index 7febcf2..62a5721 100644
73820--- a/fs/cifs/cifs_debug.c
73821+++ b/fs/cifs/cifs_debug.c
73822@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73823
73824 if (strtobool(&c, &bv) == 0) {
73825 #ifdef CONFIG_CIFS_STATS2
73826- atomic_set(&totBufAllocCount, 0);
73827- atomic_set(&totSmBufAllocCount, 0);
73828+ atomic_set_unchecked(&totBufAllocCount, 0);
73829+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73830 #endif /* CONFIG_CIFS_STATS2 */
73831 spin_lock(&cifs_tcp_ses_lock);
73832 list_for_each(tmp1, &cifs_tcp_ses_list) {
73833@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73834 tcon = list_entry(tmp3,
73835 struct cifs_tcon,
73836 tcon_list);
73837- atomic_set(&tcon->num_smbs_sent, 0);
73838+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
73839 if (server->ops->clear_stats)
73840 server->ops->clear_stats(tcon);
73841 }
73842@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73843 smBufAllocCount.counter, cifs_min_small);
73844 #ifdef CONFIG_CIFS_STATS2
73845 seq_printf(m, "Total Large %d Small %d Allocations\n",
73846- atomic_read(&totBufAllocCount),
73847- atomic_read(&totSmBufAllocCount));
73848+ atomic_read_unchecked(&totBufAllocCount),
73849+ atomic_read_unchecked(&totSmBufAllocCount));
73850 #endif /* CONFIG_CIFS_STATS2 */
73851
73852 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
73853@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73854 if (tcon->need_reconnect)
73855 seq_puts(m, "\tDISCONNECTED ");
73856 seq_printf(m, "\nSMBs: %d",
73857- atomic_read(&tcon->num_smbs_sent));
73858+ atomic_read_unchecked(&tcon->num_smbs_sent));
73859 if (server->ops->print_stats)
73860 server->ops->print_stats(m, tcon);
73861 }
73862diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
73863index 0a9fb6b..9def7fa 100644
73864--- a/fs/cifs/cifsfs.c
73865+++ b/fs/cifs/cifsfs.c
73866@@ -1082,7 +1082,7 @@ cifs_init_request_bufs(void)
73867 */
73868 cifs_req_cachep = kmem_cache_create("cifs_request",
73869 CIFSMaxBufSize + max_hdr_size, 0,
73870- SLAB_HWCACHE_ALIGN, NULL);
73871+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
73872 if (cifs_req_cachep == NULL)
73873 return -ENOMEM;
73874
73875@@ -1109,7 +1109,7 @@ cifs_init_request_bufs(void)
73876 efficient to alloc 1 per page off the slab compared to 17K (5page)
73877 alloc of large cifs buffers even when page debugging is on */
73878 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
73879- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
73880+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
73881 NULL);
73882 if (cifs_sm_req_cachep == NULL) {
73883 mempool_destroy(cifs_req_poolp);
73884@@ -1194,8 +1194,8 @@ init_cifs(void)
73885 atomic_set(&bufAllocCount, 0);
73886 atomic_set(&smBufAllocCount, 0);
73887 #ifdef CONFIG_CIFS_STATS2
73888- atomic_set(&totBufAllocCount, 0);
73889- atomic_set(&totSmBufAllocCount, 0);
73890+ atomic_set_unchecked(&totBufAllocCount, 0);
73891+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73892 #endif /* CONFIG_CIFS_STATS2 */
73893
73894 atomic_set(&midCount, 0);
73895diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
73896index 22b289a..bbbba082 100644
73897--- a/fs/cifs/cifsglob.h
73898+++ b/fs/cifs/cifsglob.h
73899@@ -823,35 +823,35 @@ struct cifs_tcon {
73900 __u16 Flags; /* optional support bits */
73901 enum statusEnum tidStatus;
73902 #ifdef CONFIG_CIFS_STATS
73903- atomic_t num_smbs_sent;
73904+ atomic_unchecked_t num_smbs_sent;
73905 union {
73906 struct {
73907- atomic_t num_writes;
73908- atomic_t num_reads;
73909- atomic_t num_flushes;
73910- atomic_t num_oplock_brks;
73911- atomic_t num_opens;
73912- atomic_t num_closes;
73913- atomic_t num_deletes;
73914- atomic_t num_mkdirs;
73915- atomic_t num_posixopens;
73916- atomic_t num_posixmkdirs;
73917- atomic_t num_rmdirs;
73918- atomic_t num_renames;
73919- atomic_t num_t2renames;
73920- atomic_t num_ffirst;
73921- atomic_t num_fnext;
73922- atomic_t num_fclose;
73923- atomic_t num_hardlinks;
73924- atomic_t num_symlinks;
73925- atomic_t num_locks;
73926- atomic_t num_acl_get;
73927- atomic_t num_acl_set;
73928+ atomic_unchecked_t num_writes;
73929+ atomic_unchecked_t num_reads;
73930+ atomic_unchecked_t num_flushes;
73931+ atomic_unchecked_t num_oplock_brks;
73932+ atomic_unchecked_t num_opens;
73933+ atomic_unchecked_t num_closes;
73934+ atomic_unchecked_t num_deletes;
73935+ atomic_unchecked_t num_mkdirs;
73936+ atomic_unchecked_t num_posixopens;
73937+ atomic_unchecked_t num_posixmkdirs;
73938+ atomic_unchecked_t num_rmdirs;
73939+ atomic_unchecked_t num_renames;
73940+ atomic_unchecked_t num_t2renames;
73941+ atomic_unchecked_t num_ffirst;
73942+ atomic_unchecked_t num_fnext;
73943+ atomic_unchecked_t num_fclose;
73944+ atomic_unchecked_t num_hardlinks;
73945+ atomic_unchecked_t num_symlinks;
73946+ atomic_unchecked_t num_locks;
73947+ atomic_unchecked_t num_acl_get;
73948+ atomic_unchecked_t num_acl_set;
73949 } cifs_stats;
73950 #ifdef CONFIG_CIFS_SMB2
73951 struct {
73952- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73953- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73954+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73955+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73956 } smb2_stats;
73957 #endif /* CONFIG_CIFS_SMB2 */
73958 } stats;
73959@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
73960 }
73961
73962 #ifdef CONFIG_CIFS_STATS
73963-#define cifs_stats_inc atomic_inc
73964+#define cifs_stats_inc atomic_inc_unchecked
73965
73966 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
73967 unsigned int bytes)
73968@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
73969 /* Various Debug counters */
73970 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
73971 #ifdef CONFIG_CIFS_STATS2
73972-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
73973-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
73974+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
73975+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
73976 #endif
73977 GLOBAL_EXTERN atomic_t smBufAllocCount;
73978 GLOBAL_EXTERN atomic_t midCount;
73979diff --git a/fs/cifs/file.c b/fs/cifs/file.c
73980index 3f50cee..7741620 100644
73981--- a/fs/cifs/file.c
73982+++ b/fs/cifs/file.c
73983@@ -2054,10 +2054,14 @@ static int cifs_writepages(struct address_space *mapping,
73984 index = mapping->writeback_index; /* Start from prev offset */
73985 end = -1;
73986 } else {
73987- index = wbc->range_start >> PAGE_CACHE_SHIFT;
73988- end = wbc->range_end >> PAGE_CACHE_SHIFT;
73989- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
73990+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
73991 range_whole = true;
73992+ index = 0;
73993+ end = ULONG_MAX;
73994+ } else {
73995+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
73996+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
73997+ }
73998 scanned = true;
73999 }
74000 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
74001diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
74002index 8442b8b..ea6986f 100644
74003--- a/fs/cifs/misc.c
74004+++ b/fs/cifs/misc.c
74005@@ -170,7 +170,7 @@ cifs_buf_get(void)
74006 memset(ret_buf, 0, buf_size + 3);
74007 atomic_inc(&bufAllocCount);
74008 #ifdef CONFIG_CIFS_STATS2
74009- atomic_inc(&totBufAllocCount);
74010+ atomic_inc_unchecked(&totBufAllocCount);
74011 #endif /* CONFIG_CIFS_STATS2 */
74012 }
74013
74014@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
74015 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
74016 atomic_inc(&smBufAllocCount);
74017 #ifdef CONFIG_CIFS_STATS2
74018- atomic_inc(&totSmBufAllocCount);
74019+ atomic_inc_unchecked(&totSmBufAllocCount);
74020 #endif /* CONFIG_CIFS_STATS2 */
74021
74022 }
74023diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
74024index fc537c2..47d654c 100644
74025--- a/fs/cifs/smb1ops.c
74026+++ b/fs/cifs/smb1ops.c
74027@@ -622,27 +622,27 @@ static void
74028 cifs_clear_stats(struct cifs_tcon *tcon)
74029 {
74030 #ifdef CONFIG_CIFS_STATS
74031- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
74032- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
74033- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
74034- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
74035- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
74036- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
74037- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
74038- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
74039- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
74040- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
74041- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
74042- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
74043- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
74044- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
74045- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
74046- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
74047- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
74048- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
74049- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
74050- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
74051- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
74052+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
74053+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
74054+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
74055+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
74056+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
74057+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
74058+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
74059+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
74060+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
74061+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
74062+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
74063+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
74064+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
74065+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
74066+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
74067+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
74068+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
74069+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
74070+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
74071+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
74072+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
74073 #endif
74074 }
74075
74076@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
74077 {
74078 #ifdef CONFIG_CIFS_STATS
74079 seq_printf(m, " Oplocks breaks: %d",
74080- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
74081+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
74082 seq_printf(m, "\nReads: %d Bytes: %llu",
74083- atomic_read(&tcon->stats.cifs_stats.num_reads),
74084+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
74085 (long long)(tcon->bytes_read));
74086 seq_printf(m, "\nWrites: %d Bytes: %llu",
74087- atomic_read(&tcon->stats.cifs_stats.num_writes),
74088+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
74089 (long long)(tcon->bytes_written));
74090 seq_printf(m, "\nFlushes: %d",
74091- atomic_read(&tcon->stats.cifs_stats.num_flushes));
74092+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
74093 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
74094- atomic_read(&tcon->stats.cifs_stats.num_locks),
74095- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
74096- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
74097+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
74098+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
74099+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
74100 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
74101- atomic_read(&tcon->stats.cifs_stats.num_opens),
74102- atomic_read(&tcon->stats.cifs_stats.num_closes),
74103- atomic_read(&tcon->stats.cifs_stats.num_deletes));
74104+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
74105+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
74106+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
74107 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
74108- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
74109- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
74110+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
74111+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
74112 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
74113- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
74114- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
74115+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
74116+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
74117 seq_printf(m, "\nRenames: %d T2 Renames %d",
74118- atomic_read(&tcon->stats.cifs_stats.num_renames),
74119- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
74120+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
74121+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
74122 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
74123- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
74124- atomic_read(&tcon->stats.cifs_stats.num_fnext),
74125- atomic_read(&tcon->stats.cifs_stats.num_fclose));
74126+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
74127+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
74128+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
74129 #endif
74130 }
74131
74132diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
74133index 54daee5..2669fcb 100644
74134--- a/fs/cifs/smb2ops.c
74135+++ b/fs/cifs/smb2ops.c
74136@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
74137 #ifdef CONFIG_CIFS_STATS
74138 int i;
74139 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
74140- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
74141- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
74142+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
74143+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
74144 }
74145 #endif
74146 }
74147@@ -459,65 +459,65 @@ static void
74148 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
74149 {
74150 #ifdef CONFIG_CIFS_STATS
74151- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
74152- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
74153+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
74154+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
74155 seq_printf(m, "\nNegotiates: %d sent %d failed",
74156- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
74157- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
74158+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
74159+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
74160 seq_printf(m, "\nSessionSetups: %d sent %d failed",
74161- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
74162- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
74163+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
74164+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
74165 seq_printf(m, "\nLogoffs: %d sent %d failed",
74166- atomic_read(&sent[SMB2_LOGOFF_HE]),
74167- atomic_read(&failed[SMB2_LOGOFF_HE]));
74168+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
74169+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
74170 seq_printf(m, "\nTreeConnects: %d sent %d failed",
74171- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
74172- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
74173+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
74174+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
74175 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
74176- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
74177- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
74178+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
74179+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
74180 seq_printf(m, "\nCreates: %d sent %d failed",
74181- atomic_read(&sent[SMB2_CREATE_HE]),
74182- atomic_read(&failed[SMB2_CREATE_HE]));
74183+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
74184+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
74185 seq_printf(m, "\nCloses: %d sent %d failed",
74186- atomic_read(&sent[SMB2_CLOSE_HE]),
74187- atomic_read(&failed[SMB2_CLOSE_HE]));
74188+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
74189+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
74190 seq_printf(m, "\nFlushes: %d sent %d failed",
74191- atomic_read(&sent[SMB2_FLUSH_HE]),
74192- atomic_read(&failed[SMB2_FLUSH_HE]));
74193+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
74194+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
74195 seq_printf(m, "\nReads: %d sent %d failed",
74196- atomic_read(&sent[SMB2_READ_HE]),
74197- atomic_read(&failed[SMB2_READ_HE]));
74198+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
74199+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
74200 seq_printf(m, "\nWrites: %d sent %d failed",
74201- atomic_read(&sent[SMB2_WRITE_HE]),
74202- atomic_read(&failed[SMB2_WRITE_HE]));
74203+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
74204+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
74205 seq_printf(m, "\nLocks: %d sent %d failed",
74206- atomic_read(&sent[SMB2_LOCK_HE]),
74207- atomic_read(&failed[SMB2_LOCK_HE]));
74208+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
74209+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
74210 seq_printf(m, "\nIOCTLs: %d sent %d failed",
74211- atomic_read(&sent[SMB2_IOCTL_HE]),
74212- atomic_read(&failed[SMB2_IOCTL_HE]));
74213+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
74214+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
74215 seq_printf(m, "\nCancels: %d sent %d failed",
74216- atomic_read(&sent[SMB2_CANCEL_HE]),
74217- atomic_read(&failed[SMB2_CANCEL_HE]));
74218+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
74219+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
74220 seq_printf(m, "\nEchos: %d sent %d failed",
74221- atomic_read(&sent[SMB2_ECHO_HE]),
74222- atomic_read(&failed[SMB2_ECHO_HE]));
74223+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
74224+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
74225 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
74226- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
74227- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
74228+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
74229+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
74230 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
74231- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
74232- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
74233+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
74234+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
74235 seq_printf(m, "\nQueryInfos: %d sent %d failed",
74236- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
74237- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
74238+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
74239+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
74240 seq_printf(m, "\nSetInfos: %d sent %d failed",
74241- atomic_read(&sent[SMB2_SET_INFO_HE]),
74242- atomic_read(&failed[SMB2_SET_INFO_HE]));
74243+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
74244+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
74245 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
74246- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
74247- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
74248+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
74249+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
74250 #endif
74251 }
74252
74253diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
74254index 54cbe19..fcd4a1b 100644
74255--- a/fs/cifs/smb2pdu.c
74256+++ b/fs/cifs/smb2pdu.c
74257@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
74258 default:
74259 cifs_dbg(VFS, "info level %u isn't supported\n",
74260 srch_inf->info_level);
74261- rc = -EINVAL;
74262- goto qdir_exit;
74263+ return -EINVAL;
74264 }
74265
74266 req->FileIndex = cpu_to_le32(index);
74267diff --git a/fs/coda/cache.c b/fs/coda/cache.c
74268index 5bb630a..043dc70 100644
74269--- a/fs/coda/cache.c
74270+++ b/fs/coda/cache.c
74271@@ -24,7 +24,7 @@
74272 #include "coda_linux.h"
74273 #include "coda_cache.h"
74274
74275-static atomic_t permission_epoch = ATOMIC_INIT(0);
74276+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
74277
74278 /* replace or extend an acl cache hit */
74279 void coda_cache_enter(struct inode *inode, int mask)
74280@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
74281 struct coda_inode_info *cii = ITOC(inode);
74282
74283 spin_lock(&cii->c_lock);
74284- cii->c_cached_epoch = atomic_read(&permission_epoch);
74285+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
74286 if (!uid_eq(cii->c_uid, current_fsuid())) {
74287 cii->c_uid = current_fsuid();
74288 cii->c_cached_perm = mask;
74289@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
74290 {
74291 struct coda_inode_info *cii = ITOC(inode);
74292 spin_lock(&cii->c_lock);
74293- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
74294+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
74295 spin_unlock(&cii->c_lock);
74296 }
74297
74298 /* remove all acl caches */
74299 void coda_cache_clear_all(struct super_block *sb)
74300 {
74301- atomic_inc(&permission_epoch);
74302+ atomic_inc_unchecked(&permission_epoch);
74303 }
74304
74305
74306@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
74307 spin_lock(&cii->c_lock);
74308 hit = (mask & cii->c_cached_perm) == mask &&
74309 uid_eq(cii->c_uid, current_fsuid()) &&
74310- cii->c_cached_epoch == atomic_read(&permission_epoch);
74311+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
74312 spin_unlock(&cii->c_lock);
74313
74314 return hit;
74315diff --git a/fs/compat.c b/fs/compat.c
74316index 6fd272d..dd34ba2 100644
74317--- a/fs/compat.c
74318+++ b/fs/compat.c
74319@@ -54,7 +54,7 @@
74320 #include <asm/ioctls.h>
74321 #include "internal.h"
74322
74323-int compat_log = 1;
74324+int compat_log = 0;
74325
74326 int compat_printk(const char *fmt, ...)
74327 {
74328@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
74329
74330 set_fs(KERNEL_DS);
74331 /* The __user pointer cast is valid because of the set_fs() */
74332- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
74333+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
74334 set_fs(oldfs);
74335 /* truncating is ok because it's a user address */
74336 if (!ret)
74337@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
74338 goto out;
74339
74340 ret = -EINVAL;
74341- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
74342+ if (nr_segs > UIO_MAXIOV)
74343 goto out;
74344 if (nr_segs > fast_segs) {
74345 ret = -ENOMEM;
74346@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
74347 struct compat_readdir_callback {
74348 struct dir_context ctx;
74349 struct compat_old_linux_dirent __user *dirent;
74350+ struct file * file;
74351 int result;
74352 };
74353
74354@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
74355 buf->result = -EOVERFLOW;
74356 return -EOVERFLOW;
74357 }
74358+
74359+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74360+ return 0;
74361+
74362 buf->result++;
74363 dirent = buf->dirent;
74364 if (!access_ok(VERIFY_WRITE, dirent,
74365@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
74366 if (!f.file)
74367 return -EBADF;
74368
74369+ buf.file = f.file;
74370 error = iterate_dir(f.file, &buf.ctx);
74371 if (buf.result)
74372 error = buf.result;
74373@@ -913,6 +919,7 @@ struct compat_getdents_callback {
74374 struct dir_context ctx;
74375 struct compat_linux_dirent __user *current_dir;
74376 struct compat_linux_dirent __user *previous;
74377+ struct file * file;
74378 int count;
74379 int error;
74380 };
74381@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
74382 buf->error = -EOVERFLOW;
74383 return -EOVERFLOW;
74384 }
74385+
74386+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74387+ return 0;
74388+
74389 dirent = buf->previous;
74390 if (dirent) {
74391 if (__put_user(offset, &dirent->d_off))
74392@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
74393 if (!f.file)
74394 return -EBADF;
74395
74396+ buf.file = f.file;
74397 error = iterate_dir(f.file, &buf.ctx);
74398 if (error >= 0)
74399 error = buf.error;
74400@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
74401 struct dir_context ctx;
74402 struct linux_dirent64 __user *current_dir;
74403 struct linux_dirent64 __user *previous;
74404+ struct file * file;
74405 int count;
74406 int error;
74407 };
74408@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
74409 buf->error = -EINVAL; /* only used if we fail.. */
74410 if (reclen > buf->count)
74411 return -EINVAL;
74412+
74413+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74414+ return 0;
74415+
74416 dirent = buf->previous;
74417
74418 if (dirent) {
74419@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
74420 if (!f.file)
74421 return -EBADF;
74422
74423+ buf.file = f.file;
74424 error = iterate_dir(f.file, &buf.ctx);
74425 if (error >= 0)
74426 error = buf.error;
74427diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
74428index 4d24d17..4f8c09e 100644
74429--- a/fs/compat_binfmt_elf.c
74430+++ b/fs/compat_binfmt_elf.c
74431@@ -30,11 +30,13 @@
74432 #undef elf_phdr
74433 #undef elf_shdr
74434 #undef elf_note
74435+#undef elf_dyn
74436 #undef elf_addr_t
74437 #define elfhdr elf32_hdr
74438 #define elf_phdr elf32_phdr
74439 #define elf_shdr elf32_shdr
74440 #define elf_note elf32_note
74441+#define elf_dyn Elf32_Dyn
74442 #define elf_addr_t Elf32_Addr
74443
74444 /*
74445diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
74446index 6b8e2f0..9b13a5e 100644
74447--- a/fs/compat_ioctl.c
74448+++ b/fs/compat_ioctl.c
74449@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
74450 return -EFAULT;
74451 if (__get_user(udata, &ss32->iomem_base))
74452 return -EFAULT;
74453- ss.iomem_base = compat_ptr(udata);
74454+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
74455 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
74456 __get_user(ss.port_high, &ss32->port_high))
74457 return -EFAULT;
74458@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
74459 for (i = 0; i < nmsgs; i++) {
74460 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
74461 return -EFAULT;
74462- if (get_user(datap, &umsgs[i].buf) ||
74463- put_user(compat_ptr(datap), &tmsgs[i].buf))
74464+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
74465+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
74466 return -EFAULT;
74467 }
74468 return sys_ioctl(fd, cmd, (unsigned long)tdata);
74469@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
74470 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
74471 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
74472 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
74473- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
74474+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
74475 return -EFAULT;
74476
74477 return ioctl_preallocate(file, p);
74478@@ -1620,8 +1620,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
74479 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
74480 {
74481 unsigned int a, b;
74482- a = *(unsigned int *)p;
74483- b = *(unsigned int *)q;
74484+ a = *(const unsigned int *)p;
74485+ b = *(const unsigned int *)q;
74486 if (a > b)
74487 return 1;
74488 if (a < b)
74489diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
74490index c81ce7f..f3de5fd 100644
74491--- a/fs/configfs/dir.c
74492+++ b/fs/configfs/dir.c
74493@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74494 }
74495 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
74496 struct configfs_dirent *next;
74497- const char *name;
74498+ const unsigned char * name;
74499+ char d_name[sizeof(next->s_dentry->d_iname)];
74500 int len;
74501 struct inode *inode = NULL;
74502
74503@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74504 continue;
74505
74506 name = configfs_get_name(next);
74507- len = strlen(name);
74508+ if (next->s_dentry && name == next->s_dentry->d_iname) {
74509+ len = next->s_dentry->d_name.len;
74510+ memcpy(d_name, name, len);
74511+ name = d_name;
74512+ } else
74513+ len = strlen(name);
74514
74515 /*
74516 * We'll have a dentry and an inode for
74517diff --git a/fs/configfs/item.c b/fs/configfs/item.c
74518index e65f9ff..3ed264d 100644
74519--- a/fs/configfs/item.c
74520+++ b/fs/configfs/item.c
74521@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
74522 const char *name,
74523 struct config_item_type *type)
74524 {
74525- config_item_set_name(item, name);
74526+ config_item_set_name(item, "%s", name);
74527 item->ci_type = type;
74528 config_item_init(item);
74529 }
74530@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
74531 void config_group_init_type_name(struct config_group *group, const char *name,
74532 struct config_item_type *type)
74533 {
74534- config_item_set_name(&group->cg_item, name);
74535+ config_item_set_name(&group->cg_item, "%s", name);
74536 group->cg_item.ci_type = type;
74537 config_group_init(group);
74538 }
74539diff --git a/fs/coredump.c b/fs/coredump.c
74540index bbbe139..b76fae5 100644
74541--- a/fs/coredump.c
74542+++ b/fs/coredump.c
74543@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
74544 struct pipe_inode_info *pipe = file->private_data;
74545
74546 pipe_lock(pipe);
74547- pipe->readers++;
74548- pipe->writers--;
74549+ atomic_inc(&pipe->readers);
74550+ atomic_dec(&pipe->writers);
74551 wake_up_interruptible_sync(&pipe->wait);
74552 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
74553 pipe_unlock(pipe);
74554@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
74555 * We actually want wait_event_freezable() but then we need
74556 * to clear TIF_SIGPENDING and improve dump_interrupted().
74557 */
74558- wait_event_interruptible(pipe->wait, pipe->readers == 1);
74559+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
74560
74561 pipe_lock(pipe);
74562- pipe->readers--;
74563- pipe->writers++;
74564+ atomic_dec(&pipe->readers);
74565+ atomic_inc(&pipe->writers);
74566 pipe_unlock(pipe);
74567 }
74568
74569@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
74570 struct files_struct *displaced;
74571 bool need_nonrelative = false;
74572 bool core_dumped = false;
74573- static atomic_t core_dump_count = ATOMIC_INIT(0);
74574+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
74575+ long signr = siginfo->si_signo;
74576+ int dumpable;
74577 struct coredump_params cprm = {
74578 .siginfo = siginfo,
74579 .regs = signal_pt_regs(),
74580@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
74581 .mm_flags = mm->flags,
74582 };
74583
74584- audit_core_dumps(siginfo->si_signo);
74585+ audit_core_dumps(signr);
74586+
74587+ dumpable = __get_dumpable(cprm.mm_flags);
74588+
74589+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
74590+ gr_handle_brute_attach(dumpable);
74591
74592 binfmt = mm->binfmt;
74593 if (!binfmt || !binfmt->core_dump)
74594 goto fail;
74595- if (!__get_dumpable(cprm.mm_flags))
74596+ if (!dumpable)
74597 goto fail;
74598
74599 cred = prepare_creds();
74600@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
74601 need_nonrelative = true;
74602 }
74603
74604- retval = coredump_wait(siginfo->si_signo, &core_state);
74605+ retval = coredump_wait(signr, &core_state);
74606 if (retval < 0)
74607 goto fail_creds;
74608
74609@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
74610 }
74611 cprm.limit = RLIM_INFINITY;
74612
74613- dump_count = atomic_inc_return(&core_dump_count);
74614+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
74615 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
74616 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
74617 task_tgid_vnr(current), current->comm);
74618@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
74619 } else {
74620 struct inode *inode;
74621
74622+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
74623+
74624 if (cprm.limit < binfmt->min_coredump)
74625 goto fail_unlock;
74626
74627@@ -681,7 +690,7 @@ close_fail:
74628 filp_close(cprm.file, NULL);
74629 fail_dropcount:
74630 if (ispipe)
74631- atomic_dec(&core_dump_count);
74632+ atomic_dec_unchecked(&core_dump_count);
74633 fail_unlock:
74634 kfree(cn.corename);
74635 coredump_finish(mm, core_dumped);
74636@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
74637 struct file *file = cprm->file;
74638 loff_t pos = file->f_pos;
74639 ssize_t n;
74640+
74641+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
74642 if (cprm->written + nr > cprm->limit)
74643 return 0;
74644 while (nr) {
74645diff --git a/fs/dcache.c b/fs/dcache.c
74646index 50bb3c2..d874b57 100644
74647--- a/fs/dcache.c
74648+++ b/fs/dcache.c
74649@@ -545,7 +545,7 @@ static void __dentry_kill(struct dentry *dentry)
74650 * dentry_iput drops the locks, at which point nobody (except
74651 * transient RCU lookups) can reach this dentry.
74652 */
74653- BUG_ON(dentry->d_lockref.count > 0);
74654+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
74655 this_cpu_dec(nr_dentry);
74656 if (dentry->d_op && dentry->d_op->d_release)
74657 dentry->d_op->d_release(dentry);
74658@@ -598,7 +598,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
74659 struct dentry *parent = dentry->d_parent;
74660 if (IS_ROOT(dentry))
74661 return NULL;
74662- if (unlikely(dentry->d_lockref.count < 0))
74663+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
74664 return NULL;
74665 if (likely(spin_trylock(&parent->d_lock)))
74666 return parent;
74667@@ -642,7 +642,7 @@ static inline bool fast_dput(struct dentry *dentry)
74668
74669 /*
74670 * If we have a d_op->d_delete() operation, we sould not
74671- * let the dentry count go to zero, so use "put__or_lock".
74672+ * let the dentry count go to zero, so use "put_or_lock".
74673 */
74674 if (unlikely(dentry->d_flags & DCACHE_OP_DELETE))
74675 return lockref_put_or_lock(&dentry->d_lockref);
74676@@ -660,8 +660,8 @@ static inline bool fast_dput(struct dentry *dentry)
74677 */
74678 if (unlikely(ret < 0)) {
74679 spin_lock(&dentry->d_lock);
74680- if (dentry->d_lockref.count > 1) {
74681- dentry->d_lockref.count--;
74682+ if (__lockref_read(&dentry->d_lockref) > 1) {
74683+ __lockref_dec(&dentry->d_lockref);
74684 spin_unlock(&dentry->d_lock);
74685 return 1;
74686 }
74687@@ -697,7 +697,7 @@ static inline bool fast_dput(struct dentry *dentry)
74688 */
74689 smp_rmb();
74690 d_flags = ACCESS_ONCE(dentry->d_flags);
74691- d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST;
74692+ d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED;
74693
74694 /* Nothing to do? Dropping the reference was all we needed? */
74695 if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry))
74696@@ -716,7 +716,7 @@ static inline bool fast_dput(struct dentry *dentry)
74697 * else could have killed it and marked it dead. Either way, we
74698 * don't need to do anything else.
74699 */
74700- if (dentry->d_lockref.count) {
74701+ if (__lockref_read(&dentry->d_lockref)) {
74702 spin_unlock(&dentry->d_lock);
74703 return 1;
74704 }
74705@@ -726,7 +726,7 @@ static inline bool fast_dput(struct dentry *dentry)
74706 * lock, and we just tested that it was zero, so we can just
74707 * set it to 1.
74708 */
74709- dentry->d_lockref.count = 1;
74710+ __lockref_set(&dentry->d_lockref, 1);
74711 return 0;
74712 }
74713
74714@@ -776,6 +776,9 @@ repeat:
74715 if (unlikely(d_unhashed(dentry)))
74716 goto kill_it;
74717
74718+ if (unlikely(dentry->d_flags & DCACHE_DISCONNECTED))
74719+ goto kill_it;
74720+
74721 if (unlikely(dentry->d_flags & DCACHE_OP_DELETE)) {
74722 if (dentry->d_op->d_delete(dentry))
74723 goto kill_it;
74724@@ -785,7 +788,7 @@ repeat:
74725 dentry->d_flags |= DCACHE_REFERENCED;
74726 dentry_lru_add(dentry);
74727
74728- dentry->d_lockref.count--;
74729+ __lockref_dec(&dentry->d_lockref);
74730 spin_unlock(&dentry->d_lock);
74731 return;
74732
74733@@ -800,7 +803,7 @@ EXPORT_SYMBOL(dput);
74734 /* This must be called with d_lock held */
74735 static inline void __dget_dlock(struct dentry *dentry)
74736 {
74737- dentry->d_lockref.count++;
74738+ __lockref_inc(&dentry->d_lockref);
74739 }
74740
74741 static inline void __dget(struct dentry *dentry)
74742@@ -841,8 +844,8 @@ repeat:
74743 goto repeat;
74744 }
74745 rcu_read_unlock();
74746- BUG_ON(!ret->d_lockref.count);
74747- ret->d_lockref.count++;
74748+ BUG_ON(!__lockref_read(&ret->d_lockref));
74749+ __lockref_inc(&ret->d_lockref);
74750 spin_unlock(&ret->d_lock);
74751 return ret;
74752 }
74753@@ -920,9 +923,9 @@ restart:
74754 spin_lock(&inode->i_lock);
74755 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
74756 spin_lock(&dentry->d_lock);
74757- if (!dentry->d_lockref.count) {
74758+ if (!__lockref_read(&dentry->d_lockref)) {
74759 struct dentry *parent = lock_parent(dentry);
74760- if (likely(!dentry->d_lockref.count)) {
74761+ if (likely(!__lockref_read(&dentry->d_lockref))) {
74762 __dentry_kill(dentry);
74763 dput(parent);
74764 goto restart;
74765@@ -957,7 +960,7 @@ static void shrink_dentry_list(struct list_head *list)
74766 * We found an inuse dentry which was not removed from
74767 * the LRU because of laziness during lookup. Do not free it.
74768 */
74769- if (dentry->d_lockref.count > 0) {
74770+ if (__lockref_read(&dentry->d_lockref) > 0) {
74771 spin_unlock(&dentry->d_lock);
74772 if (parent)
74773 spin_unlock(&parent->d_lock);
74774@@ -995,8 +998,8 @@ static void shrink_dentry_list(struct list_head *list)
74775 dentry = parent;
74776 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
74777 parent = lock_parent(dentry);
74778- if (dentry->d_lockref.count != 1) {
74779- dentry->d_lockref.count--;
74780+ if (__lockref_read(&dentry->d_lockref) != 1) {
74781+ __lockref_inc(&dentry->d_lockref);
74782 spin_unlock(&dentry->d_lock);
74783 if (parent)
74784 spin_unlock(&parent->d_lock);
74785@@ -1036,7 +1039,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
74786 * counts, just remove them from the LRU. Otherwise give them
74787 * another pass through the LRU.
74788 */
74789- if (dentry->d_lockref.count) {
74790+ if (__lockref_read(&dentry->d_lockref)) {
74791 d_lru_isolate(lru, dentry);
74792 spin_unlock(&dentry->d_lock);
74793 return LRU_REMOVED;
74794@@ -1370,7 +1373,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
74795 } else {
74796 if (dentry->d_flags & DCACHE_LRU_LIST)
74797 d_lru_del(dentry);
74798- if (!dentry->d_lockref.count) {
74799+ if (!__lockref_read(&dentry->d_lockref)) {
74800 d_shrink_add(dentry, &data->dispose);
74801 data->found++;
74802 }
74803@@ -1418,7 +1421,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74804 return D_WALK_CONTINUE;
74805
74806 /* root with refcount 1 is fine */
74807- if (dentry == _data && dentry->d_lockref.count == 1)
74808+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
74809 return D_WALK_CONTINUE;
74810
74811 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
74812@@ -1427,7 +1430,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74813 dentry->d_inode ?
74814 dentry->d_inode->i_ino : 0UL,
74815 dentry,
74816- dentry->d_lockref.count,
74817+ __lockref_read(&dentry->d_lockref),
74818 dentry->d_sb->s_type->name,
74819 dentry->d_sb->s_id);
74820 WARN_ON(1);
74821@@ -1568,7 +1571,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74822 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
74823 if (name->len > DNAME_INLINE_LEN-1) {
74824 size_t size = offsetof(struct external_name, name[1]);
74825- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
74826+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
74827 if (!p) {
74828 kmem_cache_free(dentry_cache, dentry);
74829 return NULL;
74830@@ -1591,7 +1594,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74831 smp_wmb();
74832 dentry->d_name.name = dname;
74833
74834- dentry->d_lockref.count = 1;
74835+ __lockref_set(&dentry->d_lockref, 1);
74836 dentry->d_flags = 0;
74837 spin_lock_init(&dentry->d_lock);
74838 seqcount_init(&dentry->d_seq);
74839@@ -1600,6 +1603,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74840 dentry->d_sb = sb;
74841 dentry->d_op = NULL;
74842 dentry->d_fsdata = NULL;
74843+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
74844+ atomic_set(&dentry->chroot_refcnt, 0);
74845+#endif
74846 INIT_HLIST_BL_NODE(&dentry->d_hash);
74847 INIT_LIST_HEAD(&dentry->d_lru);
74848 INIT_LIST_HEAD(&dentry->d_subdirs);
74849@@ -2321,7 +2327,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
74850 goto next;
74851 }
74852
74853- dentry->d_lockref.count++;
74854+ __lockref_inc(&dentry->d_lockref);
74855 found = dentry;
74856 spin_unlock(&dentry->d_lock);
74857 break;
74858@@ -2389,7 +2395,7 @@ again:
74859 spin_lock(&dentry->d_lock);
74860 inode = dentry->d_inode;
74861 isdir = S_ISDIR(inode->i_mode);
74862- if (dentry->d_lockref.count == 1) {
74863+ if (__lockref_read(&dentry->d_lockref) == 1) {
74864 if (!spin_trylock(&inode->i_lock)) {
74865 spin_unlock(&dentry->d_lock);
74866 cpu_relax();
74867@@ -3331,7 +3337,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
74868
74869 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
74870 dentry->d_flags |= DCACHE_GENOCIDE;
74871- dentry->d_lockref.count--;
74872+ __lockref_dec(&dentry->d_lockref);
74873 }
74874 }
74875 return D_WALK_CONTINUE;
74876@@ -3447,7 +3453,8 @@ void __init vfs_caches_init(unsigned long mempages)
74877 mempages -= reserve;
74878
74879 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
74880- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
74881+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
74882+ SLAB_NO_SANITIZE, NULL);
74883
74884 dcache_init();
74885 inode_init();
74886diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
74887index 1275604..d2ca85b 100644
74888--- a/fs/debugfs/inode.c
74889+++ b/fs/debugfs/inode.c
74890@@ -407,6 +407,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
74891 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
74892 * returned.
74893 */
74894+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74895+extern int grsec_enable_sysfs_restrict;
74896+#endif
74897+
74898 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74899 {
74900 struct dentry *dentry = start_creating(name, parent);
74901@@ -419,7 +423,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74902 if (unlikely(!inode))
74903 return failed_creating(dentry);
74904
74905- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74906+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74907+ if (grsec_enable_sysfs_restrict)
74908+ inode->i_mode = S_IFDIR | S_IRWXU;
74909+ else
74910+#endif
74911+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74912 inode->i_op = &simple_dir_inode_operations;
74913 inode->i_fop = &simple_dir_operations;
74914
74915diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
74916index fc850b5..1677a2a 100644
74917--- a/fs/ecryptfs/inode.c
74918+++ b/fs/ecryptfs/inode.c
74919@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
74920 old_fs = get_fs();
74921 set_fs(get_ds());
74922 rc = d_inode(lower_dentry)->i_op->readlink(lower_dentry,
74923- (char __user *)lower_buf,
74924+ (char __force_user *)lower_buf,
74925 PATH_MAX);
74926 set_fs(old_fs);
74927 if (rc < 0)
74928diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
74929index e4141f2..d8263e8 100644
74930--- a/fs/ecryptfs/miscdev.c
74931+++ b/fs/ecryptfs/miscdev.c
74932@@ -304,7 +304,7 @@ check_list:
74933 goto out_unlock_msg_ctx;
74934 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
74935 if (msg_ctx->msg) {
74936- if (copy_to_user(&buf[i], packet_length, packet_length_size))
74937+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
74938 goto out_unlock_msg_ctx;
74939 i += packet_length_size;
74940 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
74941diff --git a/fs/exec.c b/fs/exec.c
74942index 1977c2a..40e7f8f 100644
74943--- a/fs/exec.c
74944+++ b/fs/exec.c
74945@@ -56,8 +56,20 @@
74946 #include <linux/pipe_fs_i.h>
74947 #include <linux/oom.h>
74948 #include <linux/compat.h>
74949+#include <linux/random.h>
74950+#include <linux/seq_file.h>
74951+#include <linux/coredump.h>
74952+#include <linux/mman.h>
74953+
74954+#ifdef CONFIG_PAX_REFCOUNT
74955+#include <linux/kallsyms.h>
74956+#include <linux/kdebug.h>
74957+#endif
74958+
74959+#include <trace/events/fs.h>
74960
74961 #include <asm/uaccess.h>
74962+#include <asm/sections.h>
74963 #include <asm/mmu_context.h>
74964 #include <asm/tlb.h>
74965
74966@@ -66,19 +78,34 @@
74967
74968 #include <trace/events/sched.h>
74969
74970+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74971+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
74972+{
74973+ 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");
74974+}
74975+#endif
74976+
74977+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
74978+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74979+EXPORT_SYMBOL(pax_set_initial_flags_func);
74980+#endif
74981+
74982 int suid_dumpable = 0;
74983
74984 static LIST_HEAD(formats);
74985 static DEFINE_RWLOCK(binfmt_lock);
74986
74987+extern int gr_process_kernel_exec_ban(void);
74988+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
74989+
74990 void __register_binfmt(struct linux_binfmt * fmt, int insert)
74991 {
74992 BUG_ON(!fmt);
74993 if (WARN_ON(!fmt->load_binary))
74994 return;
74995 write_lock(&binfmt_lock);
74996- insert ? list_add(&fmt->lh, &formats) :
74997- list_add_tail(&fmt->lh, &formats);
74998+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
74999+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
75000 write_unlock(&binfmt_lock);
75001 }
75002
75003@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
75004 void unregister_binfmt(struct linux_binfmt * fmt)
75005 {
75006 write_lock(&binfmt_lock);
75007- list_del(&fmt->lh);
75008+ pax_list_del((struct list_head *)&fmt->lh);
75009 write_unlock(&binfmt_lock);
75010 }
75011
75012@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
75013 int write)
75014 {
75015 struct page *page;
75016- int ret;
75017
75018-#ifdef CONFIG_STACK_GROWSUP
75019- if (write) {
75020- ret = expand_downwards(bprm->vma, pos);
75021- if (ret < 0)
75022- return NULL;
75023- }
75024-#endif
75025- ret = get_user_pages(current, bprm->mm, pos,
75026- 1, write, 1, &page, NULL);
75027- if (ret <= 0)
75028+ if (0 > expand_downwards(bprm->vma, pos))
75029+ return NULL;
75030+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
75031 return NULL;
75032
75033 if (write) {
75034@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
75035 if (size <= ARG_MAX)
75036 return page;
75037
75038+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75039+ // only allow 512KB for argv+env on suid/sgid binaries
75040+ // to prevent easy ASLR exhaustion
75041+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
75042+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
75043+ (size > (512 * 1024))) {
75044+ put_page(page);
75045+ return NULL;
75046+ }
75047+#endif
75048+
75049 /*
75050 * Limit to 1/4-th the stack size for the argv+env strings.
75051 * This ensures that:
75052@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
75053 vma->vm_end = STACK_TOP_MAX;
75054 vma->vm_start = vma->vm_end - PAGE_SIZE;
75055 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
75056+
75057+#ifdef CONFIG_PAX_SEGMEXEC
75058+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
75059+#endif
75060+
75061 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
75062 INIT_LIST_HEAD(&vma->anon_vma_chain);
75063
75064@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
75065 arch_bprm_mm_init(mm, vma);
75066 up_write(&mm->mmap_sem);
75067 bprm->p = vma->vm_end - sizeof(void *);
75068+
75069+#ifdef CONFIG_PAX_RANDUSTACK
75070+ if (randomize_va_space)
75071+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
75072+#endif
75073+
75074 return 0;
75075 err:
75076 up_write(&mm->mmap_sem);
75077@@ -396,7 +437,7 @@ struct user_arg_ptr {
75078 } ptr;
75079 };
75080
75081-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
75082+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
75083 {
75084 const char __user *native;
75085
75086@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
75087 compat_uptr_t compat;
75088
75089 if (get_user(compat, argv.ptr.compat + nr))
75090- return ERR_PTR(-EFAULT);
75091+ return (const char __force_user *)ERR_PTR(-EFAULT);
75092
75093 return compat_ptr(compat);
75094 }
75095 #endif
75096
75097 if (get_user(native, argv.ptr.native + nr))
75098- return ERR_PTR(-EFAULT);
75099+ return (const char __force_user *)ERR_PTR(-EFAULT);
75100
75101 return native;
75102 }
75103@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
75104 if (!p)
75105 break;
75106
75107- if (IS_ERR(p))
75108+ if (IS_ERR((const char __force_kernel *)p))
75109 return -EFAULT;
75110
75111 if (i >= max)
75112@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
75113
75114 ret = -EFAULT;
75115 str = get_user_arg_ptr(argv, argc);
75116- if (IS_ERR(str))
75117+ if (IS_ERR((const char __force_kernel *)str))
75118 goto out;
75119
75120 len = strnlen_user(str, MAX_ARG_STRLEN);
75121@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
75122 int r;
75123 mm_segment_t oldfs = get_fs();
75124 struct user_arg_ptr argv = {
75125- .ptr.native = (const char __user *const __user *)__argv,
75126+ .ptr.native = (const char __user * const __force_user *)__argv,
75127 };
75128
75129 set_fs(KERNEL_DS);
75130@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
75131 unsigned long new_end = old_end - shift;
75132 struct mmu_gather tlb;
75133
75134- BUG_ON(new_start > new_end);
75135+ if (new_start >= new_end || new_start < mmap_min_addr)
75136+ return -ENOMEM;
75137
75138 /*
75139 * ensure there are no vmas between where we want to go
75140@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
75141 if (vma != find_vma(mm, new_start))
75142 return -EFAULT;
75143
75144+#ifdef CONFIG_PAX_SEGMEXEC
75145+ BUG_ON(pax_find_mirror_vma(vma));
75146+#endif
75147+
75148 /*
75149 * cover the whole range: [new_start, old_end)
75150 */
75151@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
75152 stack_top = arch_align_stack(stack_top);
75153 stack_top = PAGE_ALIGN(stack_top);
75154
75155- if (unlikely(stack_top < mmap_min_addr) ||
75156- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
75157- return -ENOMEM;
75158-
75159 stack_shift = vma->vm_end - stack_top;
75160
75161 bprm->p -= stack_shift;
75162@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
75163 bprm->exec -= stack_shift;
75164
75165 down_write(&mm->mmap_sem);
75166+
75167+ /* Move stack pages down in memory. */
75168+ if (stack_shift) {
75169+ ret = shift_arg_pages(vma, stack_shift);
75170+ if (ret)
75171+ goto out_unlock;
75172+ }
75173+
75174 vm_flags = VM_STACK_FLAGS;
75175
75176+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75177+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
75178+ vm_flags &= ~VM_EXEC;
75179+
75180+#ifdef CONFIG_PAX_MPROTECT
75181+ if (mm->pax_flags & MF_PAX_MPROTECT)
75182+ vm_flags &= ~VM_MAYEXEC;
75183+#endif
75184+
75185+ }
75186+#endif
75187+
75188 /*
75189 * Adjust stack execute permissions; explicitly enable for
75190 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
75191@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
75192 goto out_unlock;
75193 BUG_ON(prev != vma);
75194
75195- /* Move stack pages down in memory. */
75196- if (stack_shift) {
75197- ret = shift_arg_pages(vma, stack_shift);
75198- if (ret)
75199- goto out_unlock;
75200- }
75201-
75202 /* mprotect_fixup is overkill to remove the temporary stack flags */
75203 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
75204
75205@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
75206 #endif
75207 current->mm->start_stack = bprm->p;
75208 ret = expand_stack(vma, stack_base);
75209+
75210+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
75211+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
75212+ unsigned long size;
75213+ vm_flags_t vm_flags;
75214+
75215+ size = STACK_TOP - vma->vm_end;
75216+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
75217+
75218+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
75219+
75220+#ifdef CONFIG_X86
75221+ if (!ret) {
75222+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
75223+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
75224+ }
75225+#endif
75226+
75227+ }
75228+#endif
75229+
75230 if (ret)
75231 ret = -EFAULT;
75232
75233@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
75234 if (err)
75235 goto exit;
75236
75237- if (name->name[0] != '\0')
75238+ if (name->name[0] != '\0') {
75239 fsnotify_open(file);
75240+ trace_open_exec(name->name);
75241+ }
75242
75243 out:
75244 return file;
75245@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
75246 old_fs = get_fs();
75247 set_fs(get_ds());
75248 /* The cast to a user pointer is valid due to the set_fs() */
75249- result = vfs_read(file, (void __user *)addr, count, &pos);
75250+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
75251 set_fs(old_fs);
75252 return result;
75253 }
75254@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
75255 tsk->mm = mm;
75256 tsk->active_mm = mm;
75257 activate_mm(active_mm, mm);
75258+ populate_stack();
75259 tsk->mm->vmacache_seqnum = 0;
75260 vmacache_flush(tsk);
75261 task_unlock(tsk);
75262@@ -1271,7 +1350,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
75263 }
75264 rcu_read_unlock();
75265
75266- if (p->fs->users > n_fs)
75267+ if (atomic_read(&p->fs->users) > n_fs)
75268 bprm->unsafe |= LSM_UNSAFE_SHARE;
75269 else
75270 p->fs->in_exec = 1;
75271@@ -1472,6 +1551,31 @@ static int exec_binprm(struct linux_binprm *bprm)
75272 return ret;
75273 }
75274
75275+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75276+static DEFINE_PER_CPU(u64, exec_counter);
75277+static int __init init_exec_counters(void)
75278+{
75279+ unsigned int cpu;
75280+
75281+ for_each_possible_cpu(cpu) {
75282+ per_cpu(exec_counter, cpu) = (u64)cpu;
75283+ }
75284+
75285+ return 0;
75286+}
75287+early_initcall(init_exec_counters);
75288+static inline void increment_exec_counter(void)
75289+{
75290+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
75291+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
75292+}
75293+#else
75294+static inline void increment_exec_counter(void) {}
75295+#endif
75296+
75297+extern void gr_handle_exec_args(struct linux_binprm *bprm,
75298+ struct user_arg_ptr argv);
75299+
75300 /*
75301 * sys_execve() executes a new program.
75302 */
75303@@ -1480,6 +1584,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75304 struct user_arg_ptr envp,
75305 int flags)
75306 {
75307+#ifdef CONFIG_GRKERNSEC
75308+ struct file *old_exec_file;
75309+ struct acl_subject_label *old_acl;
75310+ struct rlimit old_rlim[RLIM_NLIMITS];
75311+#endif
75312 char *pathbuf = NULL;
75313 struct linux_binprm *bprm;
75314 struct file *file;
75315@@ -1489,6 +1598,8 @@ static int do_execveat_common(int fd, struct filename *filename,
75316 if (IS_ERR(filename))
75317 return PTR_ERR(filename);
75318
75319+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
75320+
75321 /*
75322 * We move the actual failure in case of RLIMIT_NPROC excess from
75323 * set*uid() to execve() because too many poorly written programs
75324@@ -1526,6 +1637,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75325 if (IS_ERR(file))
75326 goto out_unmark;
75327
75328+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
75329+ retval = -EPERM;
75330+ goto out_unmark;
75331+ }
75332+
75333 sched_exec();
75334
75335 bprm->file = file;
75336@@ -1552,6 +1668,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75337 }
75338 bprm->interp = bprm->filename;
75339
75340+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
75341+ retval = -EACCES;
75342+ goto out_unmark;
75343+ }
75344+
75345 retval = bprm_mm_init(bprm);
75346 if (retval)
75347 goto out_unmark;
75348@@ -1568,24 +1689,70 @@ static int do_execveat_common(int fd, struct filename *filename,
75349 if (retval < 0)
75350 goto out;
75351
75352+#ifdef CONFIG_GRKERNSEC
75353+ old_acl = current->acl;
75354+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
75355+ old_exec_file = current->exec_file;
75356+ get_file(file);
75357+ current->exec_file = file;
75358+#endif
75359+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75360+ /* limit suid stack to 8MB
75361+ * we saved the old limits above and will restore them if this exec fails
75362+ */
75363+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
75364+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
75365+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
75366+#endif
75367+
75368+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
75369+ retval = -EPERM;
75370+ goto out_fail;
75371+ }
75372+
75373+ if (!gr_tpe_allow(file)) {
75374+ retval = -EACCES;
75375+ goto out_fail;
75376+ }
75377+
75378+ if (gr_check_crash_exec(file)) {
75379+ retval = -EACCES;
75380+ goto out_fail;
75381+ }
75382+
75383+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
75384+ bprm->unsafe);
75385+ if (retval < 0)
75386+ goto out_fail;
75387+
75388 retval = copy_strings_kernel(1, &bprm->filename, bprm);
75389 if (retval < 0)
75390- goto out;
75391+ goto out_fail;
75392
75393 bprm->exec = bprm->p;
75394 retval = copy_strings(bprm->envc, envp, bprm);
75395 if (retval < 0)
75396- goto out;
75397+ goto out_fail;
75398
75399 retval = copy_strings(bprm->argc, argv, bprm);
75400 if (retval < 0)
75401- goto out;
75402+ goto out_fail;
75403+
75404+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
75405+
75406+ gr_handle_exec_args(bprm, argv);
75407
75408 retval = exec_binprm(bprm);
75409 if (retval < 0)
75410- goto out;
75411+ goto out_fail;
75412+#ifdef CONFIG_GRKERNSEC
75413+ if (old_exec_file)
75414+ fput(old_exec_file);
75415+#endif
75416
75417 /* execve succeeded */
75418+
75419+ increment_exec_counter();
75420 current->fs->in_exec = 0;
75421 current->in_execve = 0;
75422 acct_update_integrals(current);
75423@@ -1597,6 +1764,14 @@ static int do_execveat_common(int fd, struct filename *filename,
75424 put_files_struct(displaced);
75425 return retval;
75426
75427+out_fail:
75428+#ifdef CONFIG_GRKERNSEC
75429+ current->acl = old_acl;
75430+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
75431+ fput(current->exec_file);
75432+ current->exec_file = old_exec_file;
75433+#endif
75434+
75435 out:
75436 if (bprm->mm) {
75437 acct_arg_size(bprm, 0);
75438@@ -1743,3 +1918,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
75439 argv, envp, flags);
75440 }
75441 #endif
75442+
75443+int pax_check_flags(unsigned long *flags)
75444+{
75445+ int retval = 0;
75446+
75447+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
75448+ if (*flags & MF_PAX_SEGMEXEC)
75449+ {
75450+ *flags &= ~MF_PAX_SEGMEXEC;
75451+ retval = -EINVAL;
75452+ }
75453+#endif
75454+
75455+ if ((*flags & MF_PAX_PAGEEXEC)
75456+
75457+#ifdef CONFIG_PAX_PAGEEXEC
75458+ && (*flags & MF_PAX_SEGMEXEC)
75459+#endif
75460+
75461+ )
75462+ {
75463+ *flags &= ~MF_PAX_PAGEEXEC;
75464+ retval = -EINVAL;
75465+ }
75466+
75467+ if ((*flags & MF_PAX_MPROTECT)
75468+
75469+#ifdef CONFIG_PAX_MPROTECT
75470+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75471+#endif
75472+
75473+ )
75474+ {
75475+ *flags &= ~MF_PAX_MPROTECT;
75476+ retval = -EINVAL;
75477+ }
75478+
75479+ if ((*flags & MF_PAX_EMUTRAMP)
75480+
75481+#ifdef CONFIG_PAX_EMUTRAMP
75482+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75483+#endif
75484+
75485+ )
75486+ {
75487+ *flags &= ~MF_PAX_EMUTRAMP;
75488+ retval = -EINVAL;
75489+ }
75490+
75491+ return retval;
75492+}
75493+
75494+EXPORT_SYMBOL(pax_check_flags);
75495+
75496+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75497+char *pax_get_path(const struct path *path, char *buf, int buflen)
75498+{
75499+ char *pathname = d_path(path, buf, buflen);
75500+
75501+ if (IS_ERR(pathname))
75502+ goto toolong;
75503+
75504+ pathname = mangle_path(buf, pathname, "\t\n\\");
75505+ if (!pathname)
75506+ goto toolong;
75507+
75508+ *pathname = 0;
75509+ return buf;
75510+
75511+toolong:
75512+ return "<path too long>";
75513+}
75514+EXPORT_SYMBOL(pax_get_path);
75515+
75516+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
75517+{
75518+ struct task_struct *tsk = current;
75519+ struct mm_struct *mm = current->mm;
75520+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
75521+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
75522+ char *path_exec = NULL;
75523+ char *path_fault = NULL;
75524+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
75525+ siginfo_t info = { };
75526+
75527+ if (buffer_exec && buffer_fault) {
75528+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
75529+
75530+ down_read(&mm->mmap_sem);
75531+ vma = mm->mmap;
75532+ while (vma && (!vma_exec || !vma_fault)) {
75533+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
75534+ vma_exec = vma;
75535+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
75536+ vma_fault = vma;
75537+ vma = vma->vm_next;
75538+ }
75539+ if (vma_exec)
75540+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
75541+ if (vma_fault) {
75542+ start = vma_fault->vm_start;
75543+ end = vma_fault->vm_end;
75544+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
75545+ if (vma_fault->vm_file)
75546+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
75547+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
75548+ path_fault = "<heap>";
75549+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75550+ path_fault = "<stack>";
75551+ else
75552+ path_fault = "<anonymous mapping>";
75553+ }
75554+ up_read(&mm->mmap_sem);
75555+ }
75556+ if (tsk->signal->curr_ip)
75557+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
75558+ else
75559+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
75560+ 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),
75561+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
75562+ free_page((unsigned long)buffer_exec);
75563+ free_page((unsigned long)buffer_fault);
75564+ pax_report_insns(regs, pc, sp);
75565+ info.si_signo = SIGKILL;
75566+ info.si_errno = 0;
75567+ info.si_code = SI_KERNEL;
75568+ info.si_pid = 0;
75569+ info.si_uid = 0;
75570+ do_coredump(&info);
75571+}
75572+#endif
75573+
75574+#ifdef CONFIG_PAX_REFCOUNT
75575+void pax_report_refcount_overflow(struct pt_regs *regs)
75576+{
75577+ if (current->signal->curr_ip)
75578+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
75579+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
75580+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75581+ else
75582+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
75583+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75584+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
75585+ preempt_disable();
75586+ show_regs(regs);
75587+ preempt_enable();
75588+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
75589+}
75590+#endif
75591+
75592+#ifdef CONFIG_PAX_USERCOPY
75593+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
75594+static noinline int check_stack_object(const void *obj, unsigned long len)
75595+{
75596+ const void * const stack = task_stack_page(current);
75597+ const void * const stackend = stack + THREAD_SIZE;
75598+
75599+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75600+ const void *frame = NULL;
75601+ const void *oldframe;
75602+#endif
75603+
75604+ if (obj + len < obj)
75605+ return -1;
75606+
75607+ if (obj + len <= stack || stackend <= obj)
75608+ return 0;
75609+
75610+ if (obj < stack || stackend < obj + len)
75611+ return -1;
75612+
75613+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75614+ oldframe = __builtin_frame_address(1);
75615+ if (oldframe)
75616+ frame = __builtin_frame_address(2);
75617+ /*
75618+ low ----------------------------------------------> high
75619+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
75620+ ^----------------^
75621+ allow copies only within here
75622+ */
75623+ while (stack <= frame && frame < stackend) {
75624+ /* if obj + len extends past the last frame, this
75625+ check won't pass and the next frame will be 0,
75626+ causing us to bail out and correctly report
75627+ the copy as invalid
75628+ */
75629+ if (obj + len <= frame)
75630+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
75631+ oldframe = frame;
75632+ frame = *(const void * const *)frame;
75633+ }
75634+ return -1;
75635+#else
75636+ return 1;
75637+#endif
75638+}
75639+
75640+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
75641+{
75642+ if (current->signal->curr_ip)
75643+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75644+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75645+ else
75646+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75647+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75648+ dump_stack();
75649+ gr_handle_kernel_exploit();
75650+ do_group_exit(SIGKILL);
75651+}
75652+#endif
75653+
75654+#ifdef CONFIG_PAX_USERCOPY
75655+
75656+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
75657+{
75658+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
75659+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
75660+#ifdef CONFIG_MODULES
75661+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
75662+#else
75663+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
75664+#endif
75665+
75666+#else
75667+ unsigned long textlow = (unsigned long)_stext;
75668+ unsigned long texthigh = (unsigned long)_etext;
75669+
75670+#ifdef CONFIG_X86_64
75671+ /* check against linear mapping as well */
75672+ if (high > (unsigned long)__va(__pa(textlow)) &&
75673+ low < (unsigned long)__va(__pa(texthigh)))
75674+ return true;
75675+#endif
75676+
75677+#endif
75678+
75679+ if (high <= textlow || low >= texthigh)
75680+ return false;
75681+ else
75682+ return true;
75683+}
75684+#endif
75685+
75686+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
75687+{
75688+#ifdef CONFIG_PAX_USERCOPY
75689+ const char *type;
75690+#endif
75691+
75692+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
75693+ unsigned long stackstart = (unsigned long)task_stack_page(current);
75694+ unsigned long currentsp = (unsigned long)&stackstart;
75695+ if (unlikely((currentsp < stackstart + 512 ||
75696+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
75697+ BUG();
75698+#endif
75699+
75700+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75701+ if (const_size)
75702+ return;
75703+#endif
75704+
75705+#ifdef CONFIG_PAX_USERCOPY
75706+ if (!n)
75707+ return;
75708+
75709+ type = check_heap_object(ptr, n);
75710+ if (!type) {
75711+ int ret = check_stack_object(ptr, n);
75712+ if (ret == 1 || ret == 2)
75713+ return;
75714+ if (ret == 0) {
75715+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
75716+ type = "<kernel text>";
75717+ else
75718+ return;
75719+ } else
75720+ type = "<process stack>";
75721+ }
75722+
75723+ pax_report_usercopy(ptr, n, to_user, type);
75724+#endif
75725+
75726+}
75727+EXPORT_SYMBOL(__check_object_size);
75728+
75729+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
75730+void __used pax_track_stack(void)
75731+{
75732+ unsigned long sp = (unsigned long)&sp;
75733+ if (sp < current_thread_info()->lowest_stack &&
75734+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
75735+ current_thread_info()->lowest_stack = sp;
75736+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
75737+ BUG();
75738+}
75739+EXPORT_SYMBOL(pax_track_stack);
75740+#endif
75741+
75742+#ifdef CONFIG_PAX_SIZE_OVERFLOW
75743+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
75744+{
75745+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
75746+ dump_stack();
75747+ do_group_exit(SIGKILL);
75748+}
75749+EXPORT_SYMBOL(report_size_overflow);
75750+#endif
75751diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
75752index 9f9992b..8b59411 100644
75753--- a/fs/ext2/balloc.c
75754+++ b/fs/ext2/balloc.c
75755@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
75756
75757 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75758 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75759- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75760+ if (free_blocks < root_blocks + 1 &&
75761 !uid_eq(sbi->s_resuid, current_fsuid()) &&
75762 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75763- !in_group_p (sbi->s_resgid))) {
75764+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75765 return 0;
75766 }
75767 return 1;
75768diff --git a/fs/ext2/super.c b/fs/ext2/super.c
75769index d0e746e..82e06f0 100644
75770--- a/fs/ext2/super.c
75771+++ b/fs/ext2/super.c
75772@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
75773 #ifdef CONFIG_EXT2_FS_XATTR
75774 if (test_opt(sb, XATTR_USER))
75775 seq_puts(seq, ",user_xattr");
75776- if (!test_opt(sb, XATTR_USER) &&
75777- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
75778+ if (!test_opt(sb, XATTR_USER))
75779 seq_puts(seq, ",nouser_xattr");
75780- }
75781 #endif
75782
75783 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75784@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
75785 if (def_mount_opts & EXT2_DEFM_UID16)
75786 set_opt(sbi->s_mount_opt, NO_UID32);
75787 #ifdef CONFIG_EXT2_FS_XATTR
75788- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
75789- set_opt(sbi->s_mount_opt, XATTR_USER);
75790+ /* always enable user xattrs */
75791+ set_opt(sbi->s_mount_opt, XATTR_USER);
75792 #endif
75793 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75794 if (def_mount_opts & EXT2_DEFM_ACL)
75795diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
75796index 0b6bfd3..93a2964 100644
75797--- a/fs/ext2/xattr.c
75798+++ b/fs/ext2/xattr.c
75799@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
75800 struct buffer_head *bh = NULL;
75801 struct ext2_xattr_entry *entry;
75802 char *end;
75803- size_t rest = buffer_size;
75804+ size_t rest = buffer_size, total_size = 0;
75805 int error;
75806
75807 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
75808@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
75809 buffer += size;
75810 }
75811 rest -= size;
75812+ total_size += size;
75813 }
75814 }
75815- error = buffer_size - rest; /* total size */
75816+ error = total_size;
75817
75818 cleanup:
75819 brelse(bh);
75820diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
75821index 158b5d4..2432610 100644
75822--- a/fs/ext3/balloc.c
75823+++ b/fs/ext3/balloc.c
75824@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
75825
75826 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75827 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75828- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75829+ if (free_blocks < root_blocks + 1 &&
75830 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
75831 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75832- !in_group_p (sbi->s_resgid))) {
75833+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75834 return 0;
75835 }
75836 return 1;
75837diff --git a/fs/ext3/super.c b/fs/ext3/super.c
75838index a9312f0..e3a11ec 100644
75839--- a/fs/ext3/super.c
75840+++ b/fs/ext3/super.c
75841@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
75842 #ifdef CONFIG_EXT3_FS_XATTR
75843 if (test_opt(sb, XATTR_USER))
75844 seq_puts(seq, ",user_xattr");
75845- if (!test_opt(sb, XATTR_USER) &&
75846- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
75847+ if (!test_opt(sb, XATTR_USER))
75848 seq_puts(seq, ",nouser_xattr");
75849- }
75850 #endif
75851 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75852 if (test_opt(sb, POSIX_ACL))
75853@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
75854 if (def_mount_opts & EXT3_DEFM_UID16)
75855 set_opt(sbi->s_mount_opt, NO_UID32);
75856 #ifdef CONFIG_EXT3_FS_XATTR
75857- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
75858- set_opt(sbi->s_mount_opt, XATTR_USER);
75859+ /* always enable user xattrs */
75860+ set_opt(sbi->s_mount_opt, XATTR_USER);
75861 #endif
75862 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75863 if (def_mount_opts & EXT3_DEFM_ACL)
75864diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
75865index 7cf3650..e3f4a51 100644
75866--- a/fs/ext3/xattr.c
75867+++ b/fs/ext3/xattr.c
75868@@ -330,7 +330,7 @@ static int
75869 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75870 char *buffer, size_t buffer_size)
75871 {
75872- size_t rest = buffer_size;
75873+ size_t rest = buffer_size, total_size = 0;
75874
75875 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
75876 const struct xattr_handler *handler =
75877@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75878 buffer += size;
75879 }
75880 rest -= size;
75881+ total_size += size;
75882 }
75883 }
75884- return buffer_size - rest;
75885+ return total_size;
75886 }
75887
75888 static int
75889diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
75890index 955bf49a..44ee359 100644
75891--- a/fs/ext4/balloc.c
75892+++ b/fs/ext4/balloc.c
75893@@ -556,8 +556,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
75894 /* Hm, nope. Are (enough) root reserved clusters available? */
75895 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
75896 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
75897- capable(CAP_SYS_RESOURCE) ||
75898- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
75899+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
75900+ capable_nolog(CAP_SYS_RESOURCE)) {
75901
75902 if (free_clusters >= (nclusters + dirty_clusters +
75903 resv_clusters))
75904diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
75905index 9a83f14..1dd1b38 100644
75906--- a/fs/ext4/ext4.h
75907+++ b/fs/ext4/ext4.h
75908@@ -1310,19 +1310,19 @@ struct ext4_sb_info {
75909 unsigned long s_mb_last_start;
75910
75911 /* stats for buddy allocator */
75912- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
75913- atomic_t s_bal_success; /* we found long enough chunks */
75914- atomic_t s_bal_allocated; /* in blocks */
75915- atomic_t s_bal_ex_scanned; /* total extents scanned */
75916- atomic_t s_bal_goals; /* goal hits */
75917- atomic_t s_bal_breaks; /* too long searches */
75918- atomic_t s_bal_2orders; /* 2^order hits */
75919+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
75920+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
75921+ atomic_unchecked_t s_bal_allocated; /* in blocks */
75922+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
75923+ atomic_unchecked_t s_bal_goals; /* goal hits */
75924+ atomic_unchecked_t s_bal_breaks; /* too long searches */
75925+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
75926 spinlock_t s_bal_lock;
75927 unsigned long s_mb_buddies_generated;
75928 unsigned long long s_mb_generation_time;
75929- atomic_t s_mb_lost_chunks;
75930- atomic_t s_mb_preallocated;
75931- atomic_t s_mb_discarded;
75932+ atomic_unchecked_t s_mb_lost_chunks;
75933+ atomic_unchecked_t s_mb_preallocated;
75934+ atomic_unchecked_t s_mb_discarded;
75935 atomic_t s_lock_busy;
75936
75937 /* locality groups */
75938diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
75939index 8d1e602..abf497b 100644
75940--- a/fs/ext4/mballoc.c
75941+++ b/fs/ext4/mballoc.c
75942@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
75943 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
75944
75945 if (EXT4_SB(sb)->s_mb_stats)
75946- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
75947+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
75948
75949 break;
75950 }
75951@@ -2211,7 +2211,7 @@ repeat:
75952 ac->ac_status = AC_STATUS_CONTINUE;
75953 ac->ac_flags |= EXT4_MB_HINT_FIRST;
75954 cr = 3;
75955- atomic_inc(&sbi->s_mb_lost_chunks);
75956+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
75957 goto repeat;
75958 }
75959 }
75960@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
75961 if (sbi->s_mb_stats) {
75962 ext4_msg(sb, KERN_INFO,
75963 "mballoc: %u blocks %u reqs (%u success)",
75964- atomic_read(&sbi->s_bal_allocated),
75965- atomic_read(&sbi->s_bal_reqs),
75966- atomic_read(&sbi->s_bal_success));
75967+ atomic_read_unchecked(&sbi->s_bal_allocated),
75968+ atomic_read_unchecked(&sbi->s_bal_reqs),
75969+ atomic_read_unchecked(&sbi->s_bal_success));
75970 ext4_msg(sb, KERN_INFO,
75971 "mballoc: %u extents scanned, %u goal hits, "
75972 "%u 2^N hits, %u breaks, %u lost",
75973- atomic_read(&sbi->s_bal_ex_scanned),
75974- atomic_read(&sbi->s_bal_goals),
75975- atomic_read(&sbi->s_bal_2orders),
75976- atomic_read(&sbi->s_bal_breaks),
75977- atomic_read(&sbi->s_mb_lost_chunks));
75978+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
75979+ atomic_read_unchecked(&sbi->s_bal_goals),
75980+ atomic_read_unchecked(&sbi->s_bal_2orders),
75981+ atomic_read_unchecked(&sbi->s_bal_breaks),
75982+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
75983 ext4_msg(sb, KERN_INFO,
75984 "mballoc: %lu generated and it took %Lu",
75985 sbi->s_mb_buddies_generated,
75986 sbi->s_mb_generation_time);
75987 ext4_msg(sb, KERN_INFO,
75988 "mballoc: %u preallocated, %u discarded",
75989- atomic_read(&sbi->s_mb_preallocated),
75990- atomic_read(&sbi->s_mb_discarded));
75991+ atomic_read_unchecked(&sbi->s_mb_preallocated),
75992+ atomic_read_unchecked(&sbi->s_mb_discarded));
75993 }
75994
75995 free_percpu(sbi->s_locality_groups);
75996@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
75997 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
75998
75999 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
76000- atomic_inc(&sbi->s_bal_reqs);
76001- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
76002+ atomic_inc_unchecked(&sbi->s_bal_reqs);
76003+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
76004 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
76005- atomic_inc(&sbi->s_bal_success);
76006- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
76007+ atomic_inc_unchecked(&sbi->s_bal_success);
76008+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
76009 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
76010 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
76011- atomic_inc(&sbi->s_bal_goals);
76012+ atomic_inc_unchecked(&sbi->s_bal_goals);
76013 if (ac->ac_found > sbi->s_mb_max_to_scan)
76014- atomic_inc(&sbi->s_bal_breaks);
76015+ atomic_inc_unchecked(&sbi->s_bal_breaks);
76016 }
76017
76018 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
76019@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
76020 trace_ext4_mb_new_inode_pa(ac, pa);
76021
76022 ext4_mb_use_inode_pa(ac, pa);
76023- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
76024+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
76025
76026 ei = EXT4_I(ac->ac_inode);
76027 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
76028@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
76029 trace_ext4_mb_new_group_pa(ac, pa);
76030
76031 ext4_mb_use_group_pa(ac, pa);
76032- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
76033+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
76034
76035 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
76036 lg = ac->ac_lg;
76037@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
76038 * from the bitmap and continue.
76039 */
76040 }
76041- atomic_add(free, &sbi->s_mb_discarded);
76042+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
76043
76044 return err;
76045 }
76046@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
76047 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
76048 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
76049 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
76050- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
76051+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
76052 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
76053
76054 return 0;
76055diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
76056index 8313ca3..8a37d08 100644
76057--- a/fs/ext4/mmp.c
76058+++ b/fs/ext4/mmp.c
76059@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
76060 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
76061 const char *function, unsigned int line, const char *msg)
76062 {
76063- __ext4_warning(sb, function, line, msg);
76064+ __ext4_warning(sb, function, line, "%s", msg);
76065 __ext4_warning(sb, function, line,
76066 "MMP failure info: last update time: %llu, last update "
76067 "node: %s, last update device: %s\n",
76068diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
76069index cf0c472..ddf284d 100644
76070--- a/fs/ext4/resize.c
76071+++ b/fs/ext4/resize.c
76072@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
76073
76074 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
76075 for (count2 = count; count > 0; count -= count2, block += count2) {
76076- ext4_fsblk_t start;
76077+ ext4_fsblk_t start, diff;
76078 struct buffer_head *bh;
76079 ext4_group_t group;
76080 int err;
76081@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
76082 start = ext4_group_first_block_no(sb, group);
76083 group -= flex_gd->groups[0].group;
76084
76085- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
76086- if (count2 > count)
76087- count2 = count;
76088-
76089 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
76090 BUG_ON(flex_gd->count > 1);
76091 continue;
76092@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
76093 err = ext4_journal_get_write_access(handle, bh);
76094 if (err)
76095 return err;
76096+
76097+ diff = block - start;
76098+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
76099+ if (count2 > count)
76100+ count2 = count;
76101+
76102 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
76103- block - start, count2);
76104- ext4_set_bits(bh->b_data, block - start, count2);
76105+ diff, count2);
76106+ ext4_set_bits(bh->b_data, diff, count2);
76107
76108 err = ext4_handle_dirty_metadata(handle, NULL, bh);
76109 if (unlikely(err))
76110diff --git a/fs/ext4/super.c b/fs/ext4/super.c
76111index ca9d4a2..4c52f42 100644
76112--- a/fs/ext4/super.c
76113+++ b/fs/ext4/super.c
76114@@ -1232,7 +1232,7 @@ static ext4_fsblk_t get_sb_block(void **data)
76115 }
76116
76117 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
76118-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
76119+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
76120 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
76121
76122 #ifdef CONFIG_QUOTA
76123@@ -2442,7 +2442,7 @@ struct ext4_attr {
76124 int offset;
76125 int deprecated_val;
76126 } u;
76127-};
76128+} __do_const;
76129
76130 static int parse_strtoull(const char *buf,
76131 unsigned long long max, unsigned long long *value)
76132diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
76133index 16e28c0..728c282 100644
76134--- a/fs/ext4/xattr.c
76135+++ b/fs/ext4/xattr.c
76136@@ -398,7 +398,7 @@ static int
76137 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
76138 char *buffer, size_t buffer_size)
76139 {
76140- size_t rest = buffer_size;
76141+ size_t rest = buffer_size, total_size = 0;
76142
76143 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
76144 const struct xattr_handler *handler =
76145@@ -415,9 +415,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
76146 buffer += size;
76147 }
76148 rest -= size;
76149+ total_size += size;
76150 }
76151 }
76152- return buffer_size - rest;
76153+ return total_size;
76154 }
76155
76156 static int
76157diff --git a/fs/fcntl.c b/fs/fcntl.c
76158index ee85cd4..9dd0d20 100644
76159--- a/fs/fcntl.c
76160+++ b/fs/fcntl.c
76161@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
76162 int force)
76163 {
76164 security_file_set_fowner(filp);
76165+ if (gr_handle_chroot_fowner(pid, type))
76166+ return;
76167+ if (gr_check_protected_task_fowner(pid, type))
76168+ return;
76169 f_modown(filp, pid, type, force);
76170 }
76171 EXPORT_SYMBOL(__f_setown);
76172diff --git a/fs/fhandle.c b/fs/fhandle.c
76173index d59712d..2281df9 100644
76174--- a/fs/fhandle.c
76175+++ b/fs/fhandle.c
76176@@ -8,6 +8,7 @@
76177 #include <linux/fs_struct.h>
76178 #include <linux/fsnotify.h>
76179 #include <linux/personality.h>
76180+#include <linux/grsecurity.h>
76181 #include <asm/uaccess.h>
76182 #include "internal.h"
76183 #include "mount.h"
76184@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
76185 } else
76186 retval = 0;
76187 /* copy the mount id */
76188- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
76189- sizeof(*mnt_id)) ||
76190+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
76191 copy_to_user(ufh, handle,
76192 sizeof(struct file_handle) + handle_bytes))
76193 retval = -EFAULT;
76194@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
76195 * the directory. Ideally we would like CAP_DAC_SEARCH.
76196 * But we don't have that
76197 */
76198- if (!capable(CAP_DAC_READ_SEARCH)) {
76199+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
76200 retval = -EPERM;
76201 goto out_err;
76202 }
76203diff --git a/fs/file.c b/fs/file.c
76204index 93c5f89..ed75817 100644
76205--- a/fs/file.c
76206+++ b/fs/file.c
76207@@ -16,6 +16,7 @@
76208 #include <linux/slab.h>
76209 #include <linux/vmalloc.h>
76210 #include <linux/file.h>
76211+#include <linux/security.h>
76212 #include <linux/fdtable.h>
76213 #include <linux/bitops.h>
76214 #include <linux/interrupt.h>
76215@@ -139,7 +140,7 @@ out:
76216 * Return <0 error code on error; 1 on successful completion.
76217 * The files->file_lock should be held on entry, and will be held on exit.
76218 */
76219-static int expand_fdtable(struct files_struct *files, int nr)
76220+static int expand_fdtable(struct files_struct *files, unsigned int nr)
76221 __releases(files->file_lock)
76222 __acquires(files->file_lock)
76223 {
76224@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
76225 * expanded and execution may have blocked.
76226 * The files->file_lock should be held on entry, and will be held on exit.
76227 */
76228-static int expand_files(struct files_struct *files, int nr)
76229+static int expand_files(struct files_struct *files, unsigned int nr)
76230 {
76231 struct fdtable *fdt;
76232
76233@@ -799,6 +800,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
76234 if (!file)
76235 return __close_fd(files, fd);
76236
76237+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
76238 if (fd >= rlimit(RLIMIT_NOFILE))
76239 return -EBADF;
76240
76241@@ -825,6 +827,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
76242 if (unlikely(oldfd == newfd))
76243 return -EINVAL;
76244
76245+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
76246 if (newfd >= rlimit(RLIMIT_NOFILE))
76247 return -EBADF;
76248
76249@@ -880,6 +883,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
76250 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
76251 {
76252 int err;
76253+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
76254 if (from >= rlimit(RLIMIT_NOFILE))
76255 return -EINVAL;
76256 err = alloc_fd(from, flags);
76257diff --git a/fs/filesystems.c b/fs/filesystems.c
76258index 5797d45..7d7d79a 100644
76259--- a/fs/filesystems.c
76260+++ b/fs/filesystems.c
76261@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
76262 int len = dot ? dot - name : strlen(name);
76263
76264 fs = __get_fs_type(name, len);
76265+#ifdef CONFIG_GRKERNSEC_MODHARDEN
76266+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
76267+#else
76268 if (!fs && (request_module("fs-%.*s", len, name) == 0))
76269+#endif
76270 fs = __get_fs_type(name, len);
76271
76272 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
76273diff --git a/fs/fs_struct.c b/fs/fs_struct.c
76274index 7dca743..1ff87ae 100644
76275--- a/fs/fs_struct.c
76276+++ b/fs/fs_struct.c
76277@@ -4,6 +4,7 @@
76278 #include <linux/path.h>
76279 #include <linux/slab.h>
76280 #include <linux/fs_struct.h>
76281+#include <linux/grsecurity.h>
76282 #include "internal.h"
76283
76284 /*
76285@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
76286 struct path old_root;
76287
76288 path_get(path);
76289+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
76290 spin_lock(&fs->lock);
76291 write_seqcount_begin(&fs->seq);
76292 old_root = fs->root;
76293 fs->root = *path;
76294+ gr_set_chroot_entries(current, path);
76295 write_seqcount_end(&fs->seq);
76296 spin_unlock(&fs->lock);
76297- if (old_root.dentry)
76298+ if (old_root.dentry) {
76299+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
76300 path_put(&old_root);
76301+ }
76302 }
76303
76304 /*
76305@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76306 int hits = 0;
76307 spin_lock(&fs->lock);
76308 write_seqcount_begin(&fs->seq);
76309+ /* this root replacement is only done by pivot_root,
76310+ leave grsec's chroot tagging alone for this task
76311+ so that a pivoted root isn't treated as a chroot
76312+ */
76313 hits += replace_path(&fs->root, old_root, new_root);
76314 hits += replace_path(&fs->pwd, old_root, new_root);
76315 write_seqcount_end(&fs->seq);
76316@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76317
76318 void free_fs_struct(struct fs_struct *fs)
76319 {
76320+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76321 path_put(&fs->root);
76322 path_put(&fs->pwd);
76323 kmem_cache_free(fs_cachep, fs);
76324@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
76325 task_lock(tsk);
76326 spin_lock(&fs->lock);
76327 tsk->fs = NULL;
76328- kill = !--fs->users;
76329+ gr_clear_chroot_entries(tsk);
76330+ kill = !atomic_dec_return(&fs->users);
76331 spin_unlock(&fs->lock);
76332 task_unlock(tsk);
76333 if (kill)
76334@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76335 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
76336 /* We don't need to lock fs - think why ;-) */
76337 if (fs) {
76338- fs->users = 1;
76339+ atomic_set(&fs->users, 1);
76340 fs->in_exec = 0;
76341 spin_lock_init(&fs->lock);
76342 seqcount_init(&fs->seq);
76343@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76344 spin_lock(&old->lock);
76345 fs->root = old->root;
76346 path_get(&fs->root);
76347+ /* instead of calling gr_set_chroot_entries here,
76348+ we call it from every caller of this function
76349+ */
76350 fs->pwd = old->pwd;
76351 path_get(&fs->pwd);
76352 spin_unlock(&old->lock);
76353+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76354 }
76355 return fs;
76356 }
76357@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
76358
76359 task_lock(current);
76360 spin_lock(&fs->lock);
76361- kill = !--fs->users;
76362+ kill = !atomic_dec_return(&fs->users);
76363 current->fs = new_fs;
76364+ gr_set_chroot_entries(current, &new_fs->root);
76365 spin_unlock(&fs->lock);
76366 task_unlock(current);
76367
76368@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
76369
76370 int current_umask(void)
76371 {
76372- return current->fs->umask;
76373+ return current->fs->umask | gr_acl_umask();
76374 }
76375 EXPORT_SYMBOL(current_umask);
76376
76377 /* to be mentioned only in INIT_TASK */
76378 struct fs_struct init_fs = {
76379- .users = 1,
76380+ .users = ATOMIC_INIT(1),
76381 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
76382 .seq = SEQCNT_ZERO(init_fs.seq),
76383 .umask = 0022,
76384diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
76385index 89acec7..a575262 100644
76386--- a/fs/fscache/cookie.c
76387+++ b/fs/fscache/cookie.c
76388@@ -19,7 +19,7 @@
76389
76390 struct kmem_cache *fscache_cookie_jar;
76391
76392-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
76393+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
76394
76395 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
76396 static int fscache_alloc_object(struct fscache_cache *cache,
76397@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
76398 parent ? (char *) parent->def->name : "<no-parent>",
76399 def->name, netfs_data, enable);
76400
76401- fscache_stat(&fscache_n_acquires);
76402+ fscache_stat_unchecked(&fscache_n_acquires);
76403
76404 /* if there's no parent cookie, then we don't create one here either */
76405 if (!parent) {
76406- fscache_stat(&fscache_n_acquires_null);
76407+ fscache_stat_unchecked(&fscache_n_acquires_null);
76408 _leave(" [no parent]");
76409 return NULL;
76410 }
76411@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76412 /* allocate and initialise a cookie */
76413 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
76414 if (!cookie) {
76415- fscache_stat(&fscache_n_acquires_oom);
76416+ fscache_stat_unchecked(&fscache_n_acquires_oom);
76417 _leave(" [ENOMEM]");
76418 return NULL;
76419 }
76420@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
76421
76422 switch (cookie->def->type) {
76423 case FSCACHE_COOKIE_TYPE_INDEX:
76424- fscache_stat(&fscache_n_cookie_index);
76425+ fscache_stat_unchecked(&fscache_n_cookie_index);
76426 break;
76427 case FSCACHE_COOKIE_TYPE_DATAFILE:
76428- fscache_stat(&fscache_n_cookie_data);
76429+ fscache_stat_unchecked(&fscache_n_cookie_data);
76430 break;
76431 default:
76432- fscache_stat(&fscache_n_cookie_special);
76433+ fscache_stat_unchecked(&fscache_n_cookie_special);
76434 break;
76435 }
76436
76437@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76438 } else {
76439 atomic_dec(&parent->n_children);
76440 __fscache_cookie_put(cookie);
76441- fscache_stat(&fscache_n_acquires_nobufs);
76442+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
76443 _leave(" = NULL");
76444 return NULL;
76445 }
76446@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76447 }
76448 }
76449
76450- fscache_stat(&fscache_n_acquires_ok);
76451+ fscache_stat_unchecked(&fscache_n_acquires_ok);
76452 _leave(" = %p", cookie);
76453 return cookie;
76454 }
76455@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
76456 cache = fscache_select_cache_for_object(cookie->parent);
76457 if (!cache) {
76458 up_read(&fscache_addremove_sem);
76459- fscache_stat(&fscache_n_acquires_no_cache);
76460+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
76461 _leave(" = -ENOMEDIUM [no cache]");
76462 return -ENOMEDIUM;
76463 }
76464@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
76465 object = cache->ops->alloc_object(cache, cookie);
76466 fscache_stat_d(&fscache_n_cop_alloc_object);
76467 if (IS_ERR(object)) {
76468- fscache_stat(&fscache_n_object_no_alloc);
76469+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
76470 ret = PTR_ERR(object);
76471 goto error;
76472 }
76473
76474- fscache_stat(&fscache_n_object_alloc);
76475+ fscache_stat_unchecked(&fscache_n_object_alloc);
76476
76477- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
76478+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
76479
76480 _debug("ALLOC OBJ%x: %s {%lx}",
76481 object->debug_id, cookie->def->name, object->events);
76482@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
76483
76484 _enter("{%s}", cookie->def->name);
76485
76486- fscache_stat(&fscache_n_invalidates);
76487+ fscache_stat_unchecked(&fscache_n_invalidates);
76488
76489 /* Only permit invalidation of data files. Invalidating an index will
76490 * require the caller to release all its attachments to the tree rooted
76491@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
76492 {
76493 struct fscache_object *object;
76494
76495- fscache_stat(&fscache_n_updates);
76496+ fscache_stat_unchecked(&fscache_n_updates);
76497
76498 if (!cookie) {
76499- fscache_stat(&fscache_n_updates_null);
76500+ fscache_stat_unchecked(&fscache_n_updates_null);
76501 _leave(" [no cookie]");
76502 return;
76503 }
76504@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
76505 */
76506 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
76507 {
76508- fscache_stat(&fscache_n_relinquishes);
76509+ fscache_stat_unchecked(&fscache_n_relinquishes);
76510 if (retire)
76511- fscache_stat(&fscache_n_relinquishes_retire);
76512+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
76513
76514 if (!cookie) {
76515- fscache_stat(&fscache_n_relinquishes_null);
76516+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
76517 _leave(" [no cookie]");
76518 return;
76519 }
76520@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
76521 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
76522 goto inconsistent;
76523
76524- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
76525+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76526
76527 __fscache_use_cookie(cookie);
76528 if (fscache_submit_op(object, op) < 0)
76529diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
76530index 7872a62..d91b19f 100644
76531--- a/fs/fscache/internal.h
76532+++ b/fs/fscache/internal.h
76533@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
76534 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
76535 extern int fscache_wait_for_operation_activation(struct fscache_object *,
76536 struct fscache_operation *,
76537- atomic_t *,
76538- atomic_t *,
76539+ atomic_unchecked_t *,
76540+ atomic_unchecked_t *,
76541 void (*)(struct fscache_operation *));
76542 extern void fscache_invalidate_writes(struct fscache_cookie *);
76543
76544@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
76545 * stats.c
76546 */
76547 #ifdef CONFIG_FSCACHE_STATS
76548-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76549-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76550+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76551+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76552
76553-extern atomic_t fscache_n_op_pend;
76554-extern atomic_t fscache_n_op_run;
76555-extern atomic_t fscache_n_op_enqueue;
76556-extern atomic_t fscache_n_op_deferred_release;
76557-extern atomic_t fscache_n_op_release;
76558-extern atomic_t fscache_n_op_gc;
76559-extern atomic_t fscache_n_op_cancelled;
76560-extern atomic_t fscache_n_op_rejected;
76561+extern atomic_unchecked_t fscache_n_op_pend;
76562+extern atomic_unchecked_t fscache_n_op_run;
76563+extern atomic_unchecked_t fscache_n_op_enqueue;
76564+extern atomic_unchecked_t fscache_n_op_deferred_release;
76565+extern atomic_unchecked_t fscache_n_op_release;
76566+extern atomic_unchecked_t fscache_n_op_gc;
76567+extern atomic_unchecked_t fscache_n_op_cancelled;
76568+extern atomic_unchecked_t fscache_n_op_rejected;
76569
76570-extern atomic_t fscache_n_attr_changed;
76571-extern atomic_t fscache_n_attr_changed_ok;
76572-extern atomic_t fscache_n_attr_changed_nobufs;
76573-extern atomic_t fscache_n_attr_changed_nomem;
76574-extern atomic_t fscache_n_attr_changed_calls;
76575+extern atomic_unchecked_t fscache_n_attr_changed;
76576+extern atomic_unchecked_t fscache_n_attr_changed_ok;
76577+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
76578+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
76579+extern atomic_unchecked_t fscache_n_attr_changed_calls;
76580
76581-extern atomic_t fscache_n_allocs;
76582-extern atomic_t fscache_n_allocs_ok;
76583-extern atomic_t fscache_n_allocs_wait;
76584-extern atomic_t fscache_n_allocs_nobufs;
76585-extern atomic_t fscache_n_allocs_intr;
76586-extern atomic_t fscache_n_allocs_object_dead;
76587-extern atomic_t fscache_n_alloc_ops;
76588-extern atomic_t fscache_n_alloc_op_waits;
76589+extern atomic_unchecked_t fscache_n_allocs;
76590+extern atomic_unchecked_t fscache_n_allocs_ok;
76591+extern atomic_unchecked_t fscache_n_allocs_wait;
76592+extern atomic_unchecked_t fscache_n_allocs_nobufs;
76593+extern atomic_unchecked_t fscache_n_allocs_intr;
76594+extern atomic_unchecked_t fscache_n_allocs_object_dead;
76595+extern atomic_unchecked_t fscache_n_alloc_ops;
76596+extern atomic_unchecked_t fscache_n_alloc_op_waits;
76597
76598-extern atomic_t fscache_n_retrievals;
76599-extern atomic_t fscache_n_retrievals_ok;
76600-extern atomic_t fscache_n_retrievals_wait;
76601-extern atomic_t fscache_n_retrievals_nodata;
76602-extern atomic_t fscache_n_retrievals_nobufs;
76603-extern atomic_t fscache_n_retrievals_intr;
76604-extern atomic_t fscache_n_retrievals_nomem;
76605-extern atomic_t fscache_n_retrievals_object_dead;
76606-extern atomic_t fscache_n_retrieval_ops;
76607-extern atomic_t fscache_n_retrieval_op_waits;
76608+extern atomic_unchecked_t fscache_n_retrievals;
76609+extern atomic_unchecked_t fscache_n_retrievals_ok;
76610+extern atomic_unchecked_t fscache_n_retrievals_wait;
76611+extern atomic_unchecked_t fscache_n_retrievals_nodata;
76612+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
76613+extern atomic_unchecked_t fscache_n_retrievals_intr;
76614+extern atomic_unchecked_t fscache_n_retrievals_nomem;
76615+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
76616+extern atomic_unchecked_t fscache_n_retrieval_ops;
76617+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
76618
76619-extern atomic_t fscache_n_stores;
76620-extern atomic_t fscache_n_stores_ok;
76621-extern atomic_t fscache_n_stores_again;
76622-extern atomic_t fscache_n_stores_nobufs;
76623-extern atomic_t fscache_n_stores_oom;
76624-extern atomic_t fscache_n_store_ops;
76625-extern atomic_t fscache_n_store_calls;
76626-extern atomic_t fscache_n_store_pages;
76627-extern atomic_t fscache_n_store_radix_deletes;
76628-extern atomic_t fscache_n_store_pages_over_limit;
76629+extern atomic_unchecked_t fscache_n_stores;
76630+extern atomic_unchecked_t fscache_n_stores_ok;
76631+extern atomic_unchecked_t fscache_n_stores_again;
76632+extern atomic_unchecked_t fscache_n_stores_nobufs;
76633+extern atomic_unchecked_t fscache_n_stores_oom;
76634+extern atomic_unchecked_t fscache_n_store_ops;
76635+extern atomic_unchecked_t fscache_n_store_calls;
76636+extern atomic_unchecked_t fscache_n_store_pages;
76637+extern atomic_unchecked_t fscache_n_store_radix_deletes;
76638+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
76639
76640-extern atomic_t fscache_n_store_vmscan_not_storing;
76641-extern atomic_t fscache_n_store_vmscan_gone;
76642-extern atomic_t fscache_n_store_vmscan_busy;
76643-extern atomic_t fscache_n_store_vmscan_cancelled;
76644-extern atomic_t fscache_n_store_vmscan_wait;
76645+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
76646+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
76647+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
76648+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
76649+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
76650
76651-extern atomic_t fscache_n_marks;
76652-extern atomic_t fscache_n_uncaches;
76653+extern atomic_unchecked_t fscache_n_marks;
76654+extern atomic_unchecked_t fscache_n_uncaches;
76655
76656-extern atomic_t fscache_n_acquires;
76657-extern atomic_t fscache_n_acquires_null;
76658-extern atomic_t fscache_n_acquires_no_cache;
76659-extern atomic_t fscache_n_acquires_ok;
76660-extern atomic_t fscache_n_acquires_nobufs;
76661-extern atomic_t fscache_n_acquires_oom;
76662+extern atomic_unchecked_t fscache_n_acquires;
76663+extern atomic_unchecked_t fscache_n_acquires_null;
76664+extern atomic_unchecked_t fscache_n_acquires_no_cache;
76665+extern atomic_unchecked_t fscache_n_acquires_ok;
76666+extern atomic_unchecked_t fscache_n_acquires_nobufs;
76667+extern atomic_unchecked_t fscache_n_acquires_oom;
76668
76669-extern atomic_t fscache_n_invalidates;
76670-extern atomic_t fscache_n_invalidates_run;
76671+extern atomic_unchecked_t fscache_n_invalidates;
76672+extern atomic_unchecked_t fscache_n_invalidates_run;
76673
76674-extern atomic_t fscache_n_updates;
76675-extern atomic_t fscache_n_updates_null;
76676-extern atomic_t fscache_n_updates_run;
76677+extern atomic_unchecked_t fscache_n_updates;
76678+extern atomic_unchecked_t fscache_n_updates_null;
76679+extern atomic_unchecked_t fscache_n_updates_run;
76680
76681-extern atomic_t fscache_n_relinquishes;
76682-extern atomic_t fscache_n_relinquishes_null;
76683-extern atomic_t fscache_n_relinquishes_waitcrt;
76684-extern atomic_t fscache_n_relinquishes_retire;
76685+extern atomic_unchecked_t fscache_n_relinquishes;
76686+extern atomic_unchecked_t fscache_n_relinquishes_null;
76687+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
76688+extern atomic_unchecked_t fscache_n_relinquishes_retire;
76689
76690-extern atomic_t fscache_n_cookie_index;
76691-extern atomic_t fscache_n_cookie_data;
76692-extern atomic_t fscache_n_cookie_special;
76693+extern atomic_unchecked_t fscache_n_cookie_index;
76694+extern atomic_unchecked_t fscache_n_cookie_data;
76695+extern atomic_unchecked_t fscache_n_cookie_special;
76696
76697-extern atomic_t fscache_n_object_alloc;
76698-extern atomic_t fscache_n_object_no_alloc;
76699-extern atomic_t fscache_n_object_lookups;
76700-extern atomic_t fscache_n_object_lookups_negative;
76701-extern atomic_t fscache_n_object_lookups_positive;
76702-extern atomic_t fscache_n_object_lookups_timed_out;
76703-extern atomic_t fscache_n_object_created;
76704-extern atomic_t fscache_n_object_avail;
76705-extern atomic_t fscache_n_object_dead;
76706+extern atomic_unchecked_t fscache_n_object_alloc;
76707+extern atomic_unchecked_t fscache_n_object_no_alloc;
76708+extern atomic_unchecked_t fscache_n_object_lookups;
76709+extern atomic_unchecked_t fscache_n_object_lookups_negative;
76710+extern atomic_unchecked_t fscache_n_object_lookups_positive;
76711+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
76712+extern atomic_unchecked_t fscache_n_object_created;
76713+extern atomic_unchecked_t fscache_n_object_avail;
76714+extern atomic_unchecked_t fscache_n_object_dead;
76715
76716-extern atomic_t fscache_n_checkaux_none;
76717-extern atomic_t fscache_n_checkaux_okay;
76718-extern atomic_t fscache_n_checkaux_update;
76719-extern atomic_t fscache_n_checkaux_obsolete;
76720+extern atomic_unchecked_t fscache_n_checkaux_none;
76721+extern atomic_unchecked_t fscache_n_checkaux_okay;
76722+extern atomic_unchecked_t fscache_n_checkaux_update;
76723+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
76724
76725 extern atomic_t fscache_n_cop_alloc_object;
76726 extern atomic_t fscache_n_cop_lookup_object;
76727@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
76728 atomic_inc(stat);
76729 }
76730
76731+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
76732+{
76733+ atomic_inc_unchecked(stat);
76734+}
76735+
76736 static inline void fscache_stat_d(atomic_t *stat)
76737 {
76738 atomic_dec(stat);
76739@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
76740
76741 #define __fscache_stat(stat) (NULL)
76742 #define fscache_stat(stat) do {} while (0)
76743+#define fscache_stat_unchecked(stat) do {} while (0)
76744 #define fscache_stat_d(stat) do {} while (0)
76745 #endif
76746
76747diff --git a/fs/fscache/object.c b/fs/fscache/object.c
76748index da032da..0076ce7 100644
76749--- a/fs/fscache/object.c
76750+++ b/fs/fscache/object.c
76751@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76752 _debug("LOOKUP \"%s\" in \"%s\"",
76753 cookie->def->name, object->cache->tag->name);
76754
76755- fscache_stat(&fscache_n_object_lookups);
76756+ fscache_stat_unchecked(&fscache_n_object_lookups);
76757 fscache_stat(&fscache_n_cop_lookup_object);
76758 ret = object->cache->ops->lookup_object(object);
76759 fscache_stat_d(&fscache_n_cop_lookup_object);
76760@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76761 if (ret == -ETIMEDOUT) {
76762 /* probably stuck behind another object, so move this one to
76763 * the back of the queue */
76764- fscache_stat(&fscache_n_object_lookups_timed_out);
76765+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
76766 _leave(" [timeout]");
76767 return NO_TRANSIT;
76768 }
76769@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
76770 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
76771
76772 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76773- fscache_stat(&fscache_n_object_lookups_negative);
76774+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
76775
76776 /* Allow write requests to begin stacking up and read requests to begin
76777 * returning ENODATA.
76778@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
76779 /* if we were still looking up, then we must have a positive lookup
76780 * result, in which case there may be data available */
76781 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76782- fscache_stat(&fscache_n_object_lookups_positive);
76783+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
76784
76785 /* We do (presumably) have data */
76786 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
76787@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
76788 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
76789 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
76790 } else {
76791- fscache_stat(&fscache_n_object_created);
76792+ fscache_stat_unchecked(&fscache_n_object_created);
76793 }
76794
76795 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
76796@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
76797 fscache_stat_d(&fscache_n_cop_lookup_complete);
76798
76799 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
76800- fscache_stat(&fscache_n_object_avail);
76801+ fscache_stat_unchecked(&fscache_n_object_avail);
76802
76803 _leave("");
76804 return transit_to(JUMPSTART_DEPS);
76805@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
76806
76807 /* this just shifts the object release to the work processor */
76808 fscache_put_object(object);
76809- fscache_stat(&fscache_n_object_dead);
76810+ fscache_stat_unchecked(&fscache_n_object_dead);
76811
76812 _leave("");
76813 return transit_to(OBJECT_DEAD);
76814@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76815 enum fscache_checkaux result;
76816
76817 if (!object->cookie->def->check_aux) {
76818- fscache_stat(&fscache_n_checkaux_none);
76819+ fscache_stat_unchecked(&fscache_n_checkaux_none);
76820 return FSCACHE_CHECKAUX_OKAY;
76821 }
76822
76823@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76824 switch (result) {
76825 /* entry okay as is */
76826 case FSCACHE_CHECKAUX_OKAY:
76827- fscache_stat(&fscache_n_checkaux_okay);
76828+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
76829 break;
76830
76831 /* entry requires update */
76832 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
76833- fscache_stat(&fscache_n_checkaux_update);
76834+ fscache_stat_unchecked(&fscache_n_checkaux_update);
76835 break;
76836
76837 /* entry requires deletion */
76838 case FSCACHE_CHECKAUX_OBSOLETE:
76839- fscache_stat(&fscache_n_checkaux_obsolete);
76840+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
76841 break;
76842
76843 default:
76844@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
76845 {
76846 const struct fscache_state *s;
76847
76848- fscache_stat(&fscache_n_invalidates_run);
76849+ fscache_stat_unchecked(&fscache_n_invalidates_run);
76850 fscache_stat(&fscache_n_cop_invalidate_object);
76851 s = _fscache_invalidate_object(object, event);
76852 fscache_stat_d(&fscache_n_cop_invalidate_object);
76853@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
76854 {
76855 _enter("{OBJ%x},%d", object->debug_id, event);
76856
76857- fscache_stat(&fscache_n_updates_run);
76858+ fscache_stat_unchecked(&fscache_n_updates_run);
76859 fscache_stat(&fscache_n_cop_update_object);
76860 object->cache->ops->update_object(object);
76861 fscache_stat_d(&fscache_n_cop_update_object);
76862diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
76863index e7b87a0..a85d47a 100644
76864--- a/fs/fscache/operation.c
76865+++ b/fs/fscache/operation.c
76866@@ -17,7 +17,7 @@
76867 #include <linux/slab.h>
76868 #include "internal.h"
76869
76870-atomic_t fscache_op_debug_id;
76871+atomic_unchecked_t fscache_op_debug_id;
76872 EXPORT_SYMBOL(fscache_op_debug_id);
76873
76874 /**
76875@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
76876 ASSERTCMP(atomic_read(&op->usage), >, 0);
76877 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
76878
76879- fscache_stat(&fscache_n_op_enqueue);
76880+ fscache_stat_unchecked(&fscache_n_op_enqueue);
76881 switch (op->flags & FSCACHE_OP_TYPE) {
76882 case FSCACHE_OP_ASYNC:
76883 _debug("queue async");
76884@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
76885 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
76886 if (op->processor)
76887 fscache_enqueue_operation(op);
76888- fscache_stat(&fscache_n_op_run);
76889+ fscache_stat_unchecked(&fscache_n_op_run);
76890 }
76891
76892 /*
76893@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76894 if (object->n_in_progress > 0) {
76895 atomic_inc(&op->usage);
76896 list_add_tail(&op->pend_link, &object->pending_ops);
76897- fscache_stat(&fscache_n_op_pend);
76898+ fscache_stat_unchecked(&fscache_n_op_pend);
76899 } else if (!list_empty(&object->pending_ops)) {
76900 atomic_inc(&op->usage);
76901 list_add_tail(&op->pend_link, &object->pending_ops);
76902- fscache_stat(&fscache_n_op_pend);
76903+ fscache_stat_unchecked(&fscache_n_op_pend);
76904 fscache_start_operations(object);
76905 } else {
76906 ASSERTCMP(object->n_in_progress, ==, 0);
76907@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76908 object->n_exclusive++; /* reads and writes must wait */
76909 atomic_inc(&op->usage);
76910 list_add_tail(&op->pend_link, &object->pending_ops);
76911- fscache_stat(&fscache_n_op_pend);
76912+ fscache_stat_unchecked(&fscache_n_op_pend);
76913 ret = 0;
76914 } else {
76915 /* If we're in any other state, there must have been an I/O
76916@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
76917 if (object->n_exclusive > 0) {
76918 atomic_inc(&op->usage);
76919 list_add_tail(&op->pend_link, &object->pending_ops);
76920- fscache_stat(&fscache_n_op_pend);
76921+ fscache_stat_unchecked(&fscache_n_op_pend);
76922 } else if (!list_empty(&object->pending_ops)) {
76923 atomic_inc(&op->usage);
76924 list_add_tail(&op->pend_link, &object->pending_ops);
76925- fscache_stat(&fscache_n_op_pend);
76926+ fscache_stat_unchecked(&fscache_n_op_pend);
76927 fscache_start_operations(object);
76928 } else {
76929 ASSERTCMP(object->n_exclusive, ==, 0);
76930@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
76931 object->n_ops++;
76932 atomic_inc(&op->usage);
76933 list_add_tail(&op->pend_link, &object->pending_ops);
76934- fscache_stat(&fscache_n_op_pend);
76935+ fscache_stat_unchecked(&fscache_n_op_pend);
76936 ret = 0;
76937 } else if (fscache_object_is_dying(object)) {
76938- fscache_stat(&fscache_n_op_rejected);
76939+ fscache_stat_unchecked(&fscache_n_op_rejected);
76940 op->state = FSCACHE_OP_ST_CANCELLED;
76941 ret = -ENOBUFS;
76942 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
76943@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
76944 ret = -EBUSY;
76945 if (op->state == FSCACHE_OP_ST_PENDING) {
76946 ASSERT(!list_empty(&op->pend_link));
76947- fscache_stat(&fscache_n_op_cancelled);
76948+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76949 list_del_init(&op->pend_link);
76950 if (do_cancel)
76951 do_cancel(op);
76952@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
76953 while (!list_empty(&object->pending_ops)) {
76954 op = list_entry(object->pending_ops.next,
76955 struct fscache_operation, pend_link);
76956- fscache_stat(&fscache_n_op_cancelled);
76957+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76958 list_del_init(&op->pend_link);
76959
76960 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
76961@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
76962 op->state, ==, FSCACHE_OP_ST_CANCELLED);
76963 op->state = FSCACHE_OP_ST_DEAD;
76964
76965- fscache_stat(&fscache_n_op_release);
76966+ fscache_stat_unchecked(&fscache_n_op_release);
76967
76968 if (op->release) {
76969 op->release(op);
76970@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
76971 * lock, and defer it otherwise */
76972 if (!spin_trylock(&object->lock)) {
76973 _debug("defer put");
76974- fscache_stat(&fscache_n_op_deferred_release);
76975+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
76976
76977 cache = object->cache;
76978 spin_lock(&cache->op_gc_list_lock);
76979@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
76980
76981 _debug("GC DEFERRED REL OBJ%x OP%x",
76982 object->debug_id, op->debug_id);
76983- fscache_stat(&fscache_n_op_gc);
76984+ fscache_stat_unchecked(&fscache_n_op_gc);
76985
76986 ASSERTCMP(atomic_read(&op->usage), ==, 0);
76987 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
76988diff --git a/fs/fscache/page.c b/fs/fscache/page.c
76989index de33b3f..8be4d29 100644
76990--- a/fs/fscache/page.c
76991+++ b/fs/fscache/page.c
76992@@ -74,7 +74,7 @@ try_again:
76993 val = radix_tree_lookup(&cookie->stores, page->index);
76994 if (!val) {
76995 rcu_read_unlock();
76996- fscache_stat(&fscache_n_store_vmscan_not_storing);
76997+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
76998 __fscache_uncache_page(cookie, page);
76999 return true;
77000 }
77001@@ -104,11 +104,11 @@ try_again:
77002 spin_unlock(&cookie->stores_lock);
77003
77004 if (xpage) {
77005- fscache_stat(&fscache_n_store_vmscan_cancelled);
77006- fscache_stat(&fscache_n_store_radix_deletes);
77007+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
77008+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
77009 ASSERTCMP(xpage, ==, page);
77010 } else {
77011- fscache_stat(&fscache_n_store_vmscan_gone);
77012+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
77013 }
77014
77015 wake_up_bit(&cookie->flags, 0);
77016@@ -123,11 +123,11 @@ page_busy:
77017 * sleeping on memory allocation, so we may need to impose a timeout
77018 * too. */
77019 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
77020- fscache_stat(&fscache_n_store_vmscan_busy);
77021+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
77022 return false;
77023 }
77024
77025- fscache_stat(&fscache_n_store_vmscan_wait);
77026+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
77027 if (!release_page_wait_timeout(cookie, page))
77028 _debug("fscache writeout timeout page: %p{%lx}",
77029 page, page->index);
77030@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
77031 FSCACHE_COOKIE_STORING_TAG);
77032 if (!radix_tree_tag_get(&cookie->stores, page->index,
77033 FSCACHE_COOKIE_PENDING_TAG)) {
77034- fscache_stat(&fscache_n_store_radix_deletes);
77035+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
77036 xpage = radix_tree_delete(&cookie->stores, page->index);
77037 }
77038 spin_unlock(&cookie->stores_lock);
77039@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
77040
77041 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
77042
77043- fscache_stat(&fscache_n_attr_changed_calls);
77044+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
77045
77046 if (fscache_object_is_active(object)) {
77047 fscache_stat(&fscache_n_cop_attr_changed);
77048@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
77049
77050 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77051
77052- fscache_stat(&fscache_n_attr_changed);
77053+ fscache_stat_unchecked(&fscache_n_attr_changed);
77054
77055 op = kzalloc(sizeof(*op), GFP_KERNEL);
77056 if (!op) {
77057- fscache_stat(&fscache_n_attr_changed_nomem);
77058+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
77059 _leave(" = -ENOMEM");
77060 return -ENOMEM;
77061 }
77062@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
77063 if (fscache_submit_exclusive_op(object, op) < 0)
77064 goto nobufs_dec;
77065 spin_unlock(&cookie->lock);
77066- fscache_stat(&fscache_n_attr_changed_ok);
77067+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
77068 fscache_put_operation(op);
77069 _leave(" = 0");
77070 return 0;
77071@@ -242,7 +242,7 @@ nobufs:
77072 kfree(op);
77073 if (wake_cookie)
77074 __fscache_wake_unused_cookie(cookie);
77075- fscache_stat(&fscache_n_attr_changed_nobufs);
77076+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
77077 _leave(" = %d", -ENOBUFS);
77078 return -ENOBUFS;
77079 }
77080@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
77081 /* allocate a retrieval operation and attempt to submit it */
77082 op = kzalloc(sizeof(*op), GFP_NOIO);
77083 if (!op) {
77084- fscache_stat(&fscache_n_retrievals_nomem);
77085+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
77086 return NULL;
77087 }
77088
77089@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
77090 return 0;
77091 }
77092
77093- fscache_stat(&fscache_n_retrievals_wait);
77094+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
77095
77096 jif = jiffies;
77097 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
77098 TASK_INTERRUPTIBLE) != 0) {
77099- fscache_stat(&fscache_n_retrievals_intr);
77100+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
77101 _leave(" = -ERESTARTSYS");
77102 return -ERESTARTSYS;
77103 }
77104@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
77105 */
77106 int fscache_wait_for_operation_activation(struct fscache_object *object,
77107 struct fscache_operation *op,
77108- atomic_t *stat_op_waits,
77109- atomic_t *stat_object_dead,
77110+ atomic_unchecked_t *stat_op_waits,
77111+ atomic_unchecked_t *stat_object_dead,
77112 void (*do_cancel)(struct fscache_operation *))
77113 {
77114 int ret;
77115@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
77116
77117 _debug(">>> WT");
77118 if (stat_op_waits)
77119- fscache_stat(stat_op_waits);
77120+ fscache_stat_unchecked(stat_op_waits);
77121 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
77122 TASK_INTERRUPTIBLE) != 0) {
77123 ret = fscache_cancel_op(op, do_cancel);
77124@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
77125 check_if_dead:
77126 if (op->state == FSCACHE_OP_ST_CANCELLED) {
77127 if (stat_object_dead)
77128- fscache_stat(stat_object_dead);
77129+ fscache_stat_unchecked(stat_object_dead);
77130 _leave(" = -ENOBUFS [cancelled]");
77131 return -ENOBUFS;
77132 }
77133@@ -381,7 +381,7 @@ check_if_dead:
77134 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
77135 fscache_cancel_op(op, do_cancel);
77136 if (stat_object_dead)
77137- fscache_stat(stat_object_dead);
77138+ fscache_stat_unchecked(stat_object_dead);
77139 return -ENOBUFS;
77140 }
77141 return 0;
77142@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77143
77144 _enter("%p,%p,,,", cookie, page);
77145
77146- fscache_stat(&fscache_n_retrievals);
77147+ fscache_stat_unchecked(&fscache_n_retrievals);
77148
77149 if (hlist_empty(&cookie->backing_objects))
77150 goto nobufs;
77151@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77152 goto nobufs_unlock_dec;
77153 spin_unlock(&cookie->lock);
77154
77155- fscache_stat(&fscache_n_retrieval_ops);
77156+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
77157
77158 /* pin the netfs read context in case we need to do the actual netfs
77159 * read because we've encountered a cache read failure */
77160@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77161
77162 error:
77163 if (ret == -ENOMEM)
77164- fscache_stat(&fscache_n_retrievals_nomem);
77165+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
77166 else if (ret == -ERESTARTSYS)
77167- fscache_stat(&fscache_n_retrievals_intr);
77168+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
77169 else if (ret == -ENODATA)
77170- fscache_stat(&fscache_n_retrievals_nodata);
77171+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
77172 else if (ret < 0)
77173- fscache_stat(&fscache_n_retrievals_nobufs);
77174+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77175 else
77176- fscache_stat(&fscache_n_retrievals_ok);
77177+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
77178
77179 fscache_put_retrieval(op);
77180 _leave(" = %d", ret);
77181@@ -505,7 +505,7 @@ nobufs_unlock:
77182 __fscache_wake_unused_cookie(cookie);
77183 kfree(op);
77184 nobufs:
77185- fscache_stat(&fscache_n_retrievals_nobufs);
77186+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77187 _leave(" = -ENOBUFS");
77188 return -ENOBUFS;
77189 }
77190@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77191
77192 _enter("%p,,%d,,,", cookie, *nr_pages);
77193
77194- fscache_stat(&fscache_n_retrievals);
77195+ fscache_stat_unchecked(&fscache_n_retrievals);
77196
77197 if (hlist_empty(&cookie->backing_objects))
77198 goto nobufs;
77199@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77200 goto nobufs_unlock_dec;
77201 spin_unlock(&cookie->lock);
77202
77203- fscache_stat(&fscache_n_retrieval_ops);
77204+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
77205
77206 /* pin the netfs read context in case we need to do the actual netfs
77207 * read because we've encountered a cache read failure */
77208@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77209
77210 error:
77211 if (ret == -ENOMEM)
77212- fscache_stat(&fscache_n_retrievals_nomem);
77213+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
77214 else if (ret == -ERESTARTSYS)
77215- fscache_stat(&fscache_n_retrievals_intr);
77216+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
77217 else if (ret == -ENODATA)
77218- fscache_stat(&fscache_n_retrievals_nodata);
77219+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
77220 else if (ret < 0)
77221- fscache_stat(&fscache_n_retrievals_nobufs);
77222+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77223 else
77224- fscache_stat(&fscache_n_retrievals_ok);
77225+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
77226
77227 fscache_put_retrieval(op);
77228 _leave(" = %d", ret);
77229@@ -636,7 +636,7 @@ nobufs_unlock:
77230 if (wake_cookie)
77231 __fscache_wake_unused_cookie(cookie);
77232 nobufs:
77233- fscache_stat(&fscache_n_retrievals_nobufs);
77234+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77235 _leave(" = -ENOBUFS");
77236 return -ENOBUFS;
77237 }
77238@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77239
77240 _enter("%p,%p,,,", cookie, page);
77241
77242- fscache_stat(&fscache_n_allocs);
77243+ fscache_stat_unchecked(&fscache_n_allocs);
77244
77245 if (hlist_empty(&cookie->backing_objects))
77246 goto nobufs;
77247@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77248 goto nobufs_unlock_dec;
77249 spin_unlock(&cookie->lock);
77250
77251- fscache_stat(&fscache_n_alloc_ops);
77252+ fscache_stat_unchecked(&fscache_n_alloc_ops);
77253
77254 ret = fscache_wait_for_operation_activation(
77255 object, &op->op,
77256@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77257
77258 error:
77259 if (ret == -ERESTARTSYS)
77260- fscache_stat(&fscache_n_allocs_intr);
77261+ fscache_stat_unchecked(&fscache_n_allocs_intr);
77262 else if (ret < 0)
77263- fscache_stat(&fscache_n_allocs_nobufs);
77264+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77265 else
77266- fscache_stat(&fscache_n_allocs_ok);
77267+ fscache_stat_unchecked(&fscache_n_allocs_ok);
77268
77269 fscache_put_retrieval(op);
77270 _leave(" = %d", ret);
77271@@ -730,7 +730,7 @@ nobufs_unlock:
77272 if (wake_cookie)
77273 __fscache_wake_unused_cookie(cookie);
77274 nobufs:
77275- fscache_stat(&fscache_n_allocs_nobufs);
77276+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77277 _leave(" = -ENOBUFS");
77278 return -ENOBUFS;
77279 }
77280@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77281
77282 spin_lock(&cookie->stores_lock);
77283
77284- fscache_stat(&fscache_n_store_calls);
77285+ fscache_stat_unchecked(&fscache_n_store_calls);
77286
77287 /* find a page to store */
77288 page = NULL;
77289@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77290 page = results[0];
77291 _debug("gang %d [%lx]", n, page->index);
77292 if (page->index > op->store_limit) {
77293- fscache_stat(&fscache_n_store_pages_over_limit);
77294+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
77295 goto superseded;
77296 }
77297
77298@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77299 spin_unlock(&cookie->stores_lock);
77300 spin_unlock(&object->lock);
77301
77302- fscache_stat(&fscache_n_store_pages);
77303+ fscache_stat_unchecked(&fscache_n_store_pages);
77304 fscache_stat(&fscache_n_cop_write_page);
77305 ret = object->cache->ops->write_page(op, page);
77306 fscache_stat_d(&fscache_n_cop_write_page);
77307@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77308 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77309 ASSERT(PageFsCache(page));
77310
77311- fscache_stat(&fscache_n_stores);
77312+ fscache_stat_unchecked(&fscache_n_stores);
77313
77314 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
77315 _leave(" = -ENOBUFS [invalidating]");
77316@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77317 spin_unlock(&cookie->stores_lock);
77318 spin_unlock(&object->lock);
77319
77320- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
77321+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
77322 op->store_limit = object->store_limit;
77323
77324 __fscache_use_cookie(cookie);
77325@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77326
77327 spin_unlock(&cookie->lock);
77328 radix_tree_preload_end();
77329- fscache_stat(&fscache_n_store_ops);
77330- fscache_stat(&fscache_n_stores_ok);
77331+ fscache_stat_unchecked(&fscache_n_store_ops);
77332+ fscache_stat_unchecked(&fscache_n_stores_ok);
77333
77334 /* the work queue now carries its own ref on the object */
77335 fscache_put_operation(&op->op);
77336@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77337 return 0;
77338
77339 already_queued:
77340- fscache_stat(&fscache_n_stores_again);
77341+ fscache_stat_unchecked(&fscache_n_stores_again);
77342 already_pending:
77343 spin_unlock(&cookie->stores_lock);
77344 spin_unlock(&object->lock);
77345 spin_unlock(&cookie->lock);
77346 radix_tree_preload_end();
77347 kfree(op);
77348- fscache_stat(&fscache_n_stores_ok);
77349+ fscache_stat_unchecked(&fscache_n_stores_ok);
77350 _leave(" = 0");
77351 return 0;
77352
77353@@ -1039,14 +1039,14 @@ nobufs:
77354 kfree(op);
77355 if (wake_cookie)
77356 __fscache_wake_unused_cookie(cookie);
77357- fscache_stat(&fscache_n_stores_nobufs);
77358+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
77359 _leave(" = -ENOBUFS");
77360 return -ENOBUFS;
77361
77362 nomem_free:
77363 kfree(op);
77364 nomem:
77365- fscache_stat(&fscache_n_stores_oom);
77366+ fscache_stat_unchecked(&fscache_n_stores_oom);
77367 _leave(" = -ENOMEM");
77368 return -ENOMEM;
77369 }
77370@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
77371 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77372 ASSERTCMP(page, !=, NULL);
77373
77374- fscache_stat(&fscache_n_uncaches);
77375+ fscache_stat_unchecked(&fscache_n_uncaches);
77376
77377 /* cache withdrawal may beat us to it */
77378 if (!PageFsCache(page))
77379@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
77380 struct fscache_cookie *cookie = op->op.object->cookie;
77381
77382 #ifdef CONFIG_FSCACHE_STATS
77383- atomic_inc(&fscache_n_marks);
77384+ atomic_inc_unchecked(&fscache_n_marks);
77385 #endif
77386
77387 _debug("- mark %p{%lx}", page, page->index);
77388diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
77389index 40d13c7..ddf52b9 100644
77390--- a/fs/fscache/stats.c
77391+++ b/fs/fscache/stats.c
77392@@ -18,99 +18,99 @@
77393 /*
77394 * operation counters
77395 */
77396-atomic_t fscache_n_op_pend;
77397-atomic_t fscache_n_op_run;
77398-atomic_t fscache_n_op_enqueue;
77399-atomic_t fscache_n_op_requeue;
77400-atomic_t fscache_n_op_deferred_release;
77401-atomic_t fscache_n_op_release;
77402-atomic_t fscache_n_op_gc;
77403-atomic_t fscache_n_op_cancelled;
77404-atomic_t fscache_n_op_rejected;
77405+atomic_unchecked_t fscache_n_op_pend;
77406+atomic_unchecked_t fscache_n_op_run;
77407+atomic_unchecked_t fscache_n_op_enqueue;
77408+atomic_unchecked_t fscache_n_op_requeue;
77409+atomic_unchecked_t fscache_n_op_deferred_release;
77410+atomic_unchecked_t fscache_n_op_release;
77411+atomic_unchecked_t fscache_n_op_gc;
77412+atomic_unchecked_t fscache_n_op_cancelled;
77413+atomic_unchecked_t fscache_n_op_rejected;
77414
77415-atomic_t fscache_n_attr_changed;
77416-atomic_t fscache_n_attr_changed_ok;
77417-atomic_t fscache_n_attr_changed_nobufs;
77418-atomic_t fscache_n_attr_changed_nomem;
77419-atomic_t fscache_n_attr_changed_calls;
77420+atomic_unchecked_t fscache_n_attr_changed;
77421+atomic_unchecked_t fscache_n_attr_changed_ok;
77422+atomic_unchecked_t fscache_n_attr_changed_nobufs;
77423+atomic_unchecked_t fscache_n_attr_changed_nomem;
77424+atomic_unchecked_t fscache_n_attr_changed_calls;
77425
77426-atomic_t fscache_n_allocs;
77427-atomic_t fscache_n_allocs_ok;
77428-atomic_t fscache_n_allocs_wait;
77429-atomic_t fscache_n_allocs_nobufs;
77430-atomic_t fscache_n_allocs_intr;
77431-atomic_t fscache_n_allocs_object_dead;
77432-atomic_t fscache_n_alloc_ops;
77433-atomic_t fscache_n_alloc_op_waits;
77434+atomic_unchecked_t fscache_n_allocs;
77435+atomic_unchecked_t fscache_n_allocs_ok;
77436+atomic_unchecked_t fscache_n_allocs_wait;
77437+atomic_unchecked_t fscache_n_allocs_nobufs;
77438+atomic_unchecked_t fscache_n_allocs_intr;
77439+atomic_unchecked_t fscache_n_allocs_object_dead;
77440+atomic_unchecked_t fscache_n_alloc_ops;
77441+atomic_unchecked_t fscache_n_alloc_op_waits;
77442
77443-atomic_t fscache_n_retrievals;
77444-atomic_t fscache_n_retrievals_ok;
77445-atomic_t fscache_n_retrievals_wait;
77446-atomic_t fscache_n_retrievals_nodata;
77447-atomic_t fscache_n_retrievals_nobufs;
77448-atomic_t fscache_n_retrievals_intr;
77449-atomic_t fscache_n_retrievals_nomem;
77450-atomic_t fscache_n_retrievals_object_dead;
77451-atomic_t fscache_n_retrieval_ops;
77452-atomic_t fscache_n_retrieval_op_waits;
77453+atomic_unchecked_t fscache_n_retrievals;
77454+atomic_unchecked_t fscache_n_retrievals_ok;
77455+atomic_unchecked_t fscache_n_retrievals_wait;
77456+atomic_unchecked_t fscache_n_retrievals_nodata;
77457+atomic_unchecked_t fscache_n_retrievals_nobufs;
77458+atomic_unchecked_t fscache_n_retrievals_intr;
77459+atomic_unchecked_t fscache_n_retrievals_nomem;
77460+atomic_unchecked_t fscache_n_retrievals_object_dead;
77461+atomic_unchecked_t fscache_n_retrieval_ops;
77462+atomic_unchecked_t fscache_n_retrieval_op_waits;
77463
77464-atomic_t fscache_n_stores;
77465-atomic_t fscache_n_stores_ok;
77466-atomic_t fscache_n_stores_again;
77467-atomic_t fscache_n_stores_nobufs;
77468-atomic_t fscache_n_stores_oom;
77469-atomic_t fscache_n_store_ops;
77470-atomic_t fscache_n_store_calls;
77471-atomic_t fscache_n_store_pages;
77472-atomic_t fscache_n_store_radix_deletes;
77473-atomic_t fscache_n_store_pages_over_limit;
77474+atomic_unchecked_t fscache_n_stores;
77475+atomic_unchecked_t fscache_n_stores_ok;
77476+atomic_unchecked_t fscache_n_stores_again;
77477+atomic_unchecked_t fscache_n_stores_nobufs;
77478+atomic_unchecked_t fscache_n_stores_oom;
77479+atomic_unchecked_t fscache_n_store_ops;
77480+atomic_unchecked_t fscache_n_store_calls;
77481+atomic_unchecked_t fscache_n_store_pages;
77482+atomic_unchecked_t fscache_n_store_radix_deletes;
77483+atomic_unchecked_t fscache_n_store_pages_over_limit;
77484
77485-atomic_t fscache_n_store_vmscan_not_storing;
77486-atomic_t fscache_n_store_vmscan_gone;
77487-atomic_t fscache_n_store_vmscan_busy;
77488-atomic_t fscache_n_store_vmscan_cancelled;
77489-atomic_t fscache_n_store_vmscan_wait;
77490+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
77491+atomic_unchecked_t fscache_n_store_vmscan_gone;
77492+atomic_unchecked_t fscache_n_store_vmscan_busy;
77493+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
77494+atomic_unchecked_t fscache_n_store_vmscan_wait;
77495
77496-atomic_t fscache_n_marks;
77497-atomic_t fscache_n_uncaches;
77498+atomic_unchecked_t fscache_n_marks;
77499+atomic_unchecked_t fscache_n_uncaches;
77500
77501-atomic_t fscache_n_acquires;
77502-atomic_t fscache_n_acquires_null;
77503-atomic_t fscache_n_acquires_no_cache;
77504-atomic_t fscache_n_acquires_ok;
77505-atomic_t fscache_n_acquires_nobufs;
77506-atomic_t fscache_n_acquires_oom;
77507+atomic_unchecked_t fscache_n_acquires;
77508+atomic_unchecked_t fscache_n_acquires_null;
77509+atomic_unchecked_t fscache_n_acquires_no_cache;
77510+atomic_unchecked_t fscache_n_acquires_ok;
77511+atomic_unchecked_t fscache_n_acquires_nobufs;
77512+atomic_unchecked_t fscache_n_acquires_oom;
77513
77514-atomic_t fscache_n_invalidates;
77515-atomic_t fscache_n_invalidates_run;
77516+atomic_unchecked_t fscache_n_invalidates;
77517+atomic_unchecked_t fscache_n_invalidates_run;
77518
77519-atomic_t fscache_n_updates;
77520-atomic_t fscache_n_updates_null;
77521-atomic_t fscache_n_updates_run;
77522+atomic_unchecked_t fscache_n_updates;
77523+atomic_unchecked_t fscache_n_updates_null;
77524+atomic_unchecked_t fscache_n_updates_run;
77525
77526-atomic_t fscache_n_relinquishes;
77527-atomic_t fscache_n_relinquishes_null;
77528-atomic_t fscache_n_relinquishes_waitcrt;
77529-atomic_t fscache_n_relinquishes_retire;
77530+atomic_unchecked_t fscache_n_relinquishes;
77531+atomic_unchecked_t fscache_n_relinquishes_null;
77532+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
77533+atomic_unchecked_t fscache_n_relinquishes_retire;
77534
77535-atomic_t fscache_n_cookie_index;
77536-atomic_t fscache_n_cookie_data;
77537-atomic_t fscache_n_cookie_special;
77538+atomic_unchecked_t fscache_n_cookie_index;
77539+atomic_unchecked_t fscache_n_cookie_data;
77540+atomic_unchecked_t fscache_n_cookie_special;
77541
77542-atomic_t fscache_n_object_alloc;
77543-atomic_t fscache_n_object_no_alloc;
77544-atomic_t fscache_n_object_lookups;
77545-atomic_t fscache_n_object_lookups_negative;
77546-atomic_t fscache_n_object_lookups_positive;
77547-atomic_t fscache_n_object_lookups_timed_out;
77548-atomic_t fscache_n_object_created;
77549-atomic_t fscache_n_object_avail;
77550-atomic_t fscache_n_object_dead;
77551+atomic_unchecked_t fscache_n_object_alloc;
77552+atomic_unchecked_t fscache_n_object_no_alloc;
77553+atomic_unchecked_t fscache_n_object_lookups;
77554+atomic_unchecked_t fscache_n_object_lookups_negative;
77555+atomic_unchecked_t fscache_n_object_lookups_positive;
77556+atomic_unchecked_t fscache_n_object_lookups_timed_out;
77557+atomic_unchecked_t fscache_n_object_created;
77558+atomic_unchecked_t fscache_n_object_avail;
77559+atomic_unchecked_t fscache_n_object_dead;
77560
77561-atomic_t fscache_n_checkaux_none;
77562-atomic_t fscache_n_checkaux_okay;
77563-atomic_t fscache_n_checkaux_update;
77564-atomic_t fscache_n_checkaux_obsolete;
77565+atomic_unchecked_t fscache_n_checkaux_none;
77566+atomic_unchecked_t fscache_n_checkaux_okay;
77567+atomic_unchecked_t fscache_n_checkaux_update;
77568+atomic_unchecked_t fscache_n_checkaux_obsolete;
77569
77570 atomic_t fscache_n_cop_alloc_object;
77571 atomic_t fscache_n_cop_lookup_object;
77572@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
77573 seq_puts(m, "FS-Cache statistics\n");
77574
77575 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
77576- atomic_read(&fscache_n_cookie_index),
77577- atomic_read(&fscache_n_cookie_data),
77578- atomic_read(&fscache_n_cookie_special));
77579+ atomic_read_unchecked(&fscache_n_cookie_index),
77580+ atomic_read_unchecked(&fscache_n_cookie_data),
77581+ atomic_read_unchecked(&fscache_n_cookie_special));
77582
77583 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
77584- atomic_read(&fscache_n_object_alloc),
77585- atomic_read(&fscache_n_object_no_alloc),
77586- atomic_read(&fscache_n_object_avail),
77587- atomic_read(&fscache_n_object_dead));
77588+ atomic_read_unchecked(&fscache_n_object_alloc),
77589+ atomic_read_unchecked(&fscache_n_object_no_alloc),
77590+ atomic_read_unchecked(&fscache_n_object_avail),
77591+ atomic_read_unchecked(&fscache_n_object_dead));
77592 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
77593- atomic_read(&fscache_n_checkaux_none),
77594- atomic_read(&fscache_n_checkaux_okay),
77595- atomic_read(&fscache_n_checkaux_update),
77596- atomic_read(&fscache_n_checkaux_obsolete));
77597+ atomic_read_unchecked(&fscache_n_checkaux_none),
77598+ atomic_read_unchecked(&fscache_n_checkaux_okay),
77599+ atomic_read_unchecked(&fscache_n_checkaux_update),
77600+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
77601
77602 seq_printf(m, "Pages : mrk=%u unc=%u\n",
77603- atomic_read(&fscache_n_marks),
77604- atomic_read(&fscache_n_uncaches));
77605+ atomic_read_unchecked(&fscache_n_marks),
77606+ atomic_read_unchecked(&fscache_n_uncaches));
77607
77608 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
77609 " oom=%u\n",
77610- atomic_read(&fscache_n_acquires),
77611- atomic_read(&fscache_n_acquires_null),
77612- atomic_read(&fscache_n_acquires_no_cache),
77613- atomic_read(&fscache_n_acquires_ok),
77614- atomic_read(&fscache_n_acquires_nobufs),
77615- atomic_read(&fscache_n_acquires_oom));
77616+ atomic_read_unchecked(&fscache_n_acquires),
77617+ atomic_read_unchecked(&fscache_n_acquires_null),
77618+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
77619+ atomic_read_unchecked(&fscache_n_acquires_ok),
77620+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
77621+ atomic_read_unchecked(&fscache_n_acquires_oom));
77622
77623 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
77624- atomic_read(&fscache_n_object_lookups),
77625- atomic_read(&fscache_n_object_lookups_negative),
77626- atomic_read(&fscache_n_object_lookups_positive),
77627- atomic_read(&fscache_n_object_created),
77628- atomic_read(&fscache_n_object_lookups_timed_out));
77629+ atomic_read_unchecked(&fscache_n_object_lookups),
77630+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
77631+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
77632+ atomic_read_unchecked(&fscache_n_object_created),
77633+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
77634
77635 seq_printf(m, "Invals : n=%u run=%u\n",
77636- atomic_read(&fscache_n_invalidates),
77637- atomic_read(&fscache_n_invalidates_run));
77638+ atomic_read_unchecked(&fscache_n_invalidates),
77639+ atomic_read_unchecked(&fscache_n_invalidates_run));
77640
77641 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
77642- atomic_read(&fscache_n_updates),
77643- atomic_read(&fscache_n_updates_null),
77644- atomic_read(&fscache_n_updates_run));
77645+ atomic_read_unchecked(&fscache_n_updates),
77646+ atomic_read_unchecked(&fscache_n_updates_null),
77647+ atomic_read_unchecked(&fscache_n_updates_run));
77648
77649 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
77650- atomic_read(&fscache_n_relinquishes),
77651- atomic_read(&fscache_n_relinquishes_null),
77652- atomic_read(&fscache_n_relinquishes_waitcrt),
77653- atomic_read(&fscache_n_relinquishes_retire));
77654+ atomic_read_unchecked(&fscache_n_relinquishes),
77655+ atomic_read_unchecked(&fscache_n_relinquishes_null),
77656+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
77657+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
77658
77659 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
77660- atomic_read(&fscache_n_attr_changed),
77661- atomic_read(&fscache_n_attr_changed_ok),
77662- atomic_read(&fscache_n_attr_changed_nobufs),
77663- atomic_read(&fscache_n_attr_changed_nomem),
77664- atomic_read(&fscache_n_attr_changed_calls));
77665+ atomic_read_unchecked(&fscache_n_attr_changed),
77666+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
77667+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
77668+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
77669+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
77670
77671 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
77672- atomic_read(&fscache_n_allocs),
77673- atomic_read(&fscache_n_allocs_ok),
77674- atomic_read(&fscache_n_allocs_wait),
77675- atomic_read(&fscache_n_allocs_nobufs),
77676- atomic_read(&fscache_n_allocs_intr));
77677+ atomic_read_unchecked(&fscache_n_allocs),
77678+ atomic_read_unchecked(&fscache_n_allocs_ok),
77679+ atomic_read_unchecked(&fscache_n_allocs_wait),
77680+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
77681+ atomic_read_unchecked(&fscache_n_allocs_intr));
77682 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
77683- atomic_read(&fscache_n_alloc_ops),
77684- atomic_read(&fscache_n_alloc_op_waits),
77685- atomic_read(&fscache_n_allocs_object_dead));
77686+ atomic_read_unchecked(&fscache_n_alloc_ops),
77687+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
77688+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
77689
77690 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
77691 " int=%u oom=%u\n",
77692- atomic_read(&fscache_n_retrievals),
77693- atomic_read(&fscache_n_retrievals_ok),
77694- atomic_read(&fscache_n_retrievals_wait),
77695- atomic_read(&fscache_n_retrievals_nodata),
77696- atomic_read(&fscache_n_retrievals_nobufs),
77697- atomic_read(&fscache_n_retrievals_intr),
77698- atomic_read(&fscache_n_retrievals_nomem));
77699+ atomic_read_unchecked(&fscache_n_retrievals),
77700+ atomic_read_unchecked(&fscache_n_retrievals_ok),
77701+ atomic_read_unchecked(&fscache_n_retrievals_wait),
77702+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
77703+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
77704+ atomic_read_unchecked(&fscache_n_retrievals_intr),
77705+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
77706 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
77707- atomic_read(&fscache_n_retrieval_ops),
77708- atomic_read(&fscache_n_retrieval_op_waits),
77709- atomic_read(&fscache_n_retrievals_object_dead));
77710+ atomic_read_unchecked(&fscache_n_retrieval_ops),
77711+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
77712+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
77713
77714 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
77715- atomic_read(&fscache_n_stores),
77716- atomic_read(&fscache_n_stores_ok),
77717- atomic_read(&fscache_n_stores_again),
77718- atomic_read(&fscache_n_stores_nobufs),
77719- atomic_read(&fscache_n_stores_oom));
77720+ atomic_read_unchecked(&fscache_n_stores),
77721+ atomic_read_unchecked(&fscache_n_stores_ok),
77722+ atomic_read_unchecked(&fscache_n_stores_again),
77723+ atomic_read_unchecked(&fscache_n_stores_nobufs),
77724+ atomic_read_unchecked(&fscache_n_stores_oom));
77725 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
77726- atomic_read(&fscache_n_store_ops),
77727- atomic_read(&fscache_n_store_calls),
77728- atomic_read(&fscache_n_store_pages),
77729- atomic_read(&fscache_n_store_radix_deletes),
77730- atomic_read(&fscache_n_store_pages_over_limit));
77731+ atomic_read_unchecked(&fscache_n_store_ops),
77732+ atomic_read_unchecked(&fscache_n_store_calls),
77733+ atomic_read_unchecked(&fscache_n_store_pages),
77734+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
77735+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
77736
77737 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
77738- atomic_read(&fscache_n_store_vmscan_not_storing),
77739- atomic_read(&fscache_n_store_vmscan_gone),
77740- atomic_read(&fscache_n_store_vmscan_busy),
77741- atomic_read(&fscache_n_store_vmscan_cancelled),
77742- atomic_read(&fscache_n_store_vmscan_wait));
77743+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
77744+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
77745+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
77746+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
77747+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
77748
77749 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
77750- atomic_read(&fscache_n_op_pend),
77751- atomic_read(&fscache_n_op_run),
77752- atomic_read(&fscache_n_op_enqueue),
77753- atomic_read(&fscache_n_op_cancelled),
77754- atomic_read(&fscache_n_op_rejected));
77755+ atomic_read_unchecked(&fscache_n_op_pend),
77756+ atomic_read_unchecked(&fscache_n_op_run),
77757+ atomic_read_unchecked(&fscache_n_op_enqueue),
77758+ atomic_read_unchecked(&fscache_n_op_cancelled),
77759+ atomic_read_unchecked(&fscache_n_op_rejected));
77760 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
77761- atomic_read(&fscache_n_op_deferred_release),
77762- atomic_read(&fscache_n_op_release),
77763- atomic_read(&fscache_n_op_gc));
77764+ atomic_read_unchecked(&fscache_n_op_deferred_release),
77765+ atomic_read_unchecked(&fscache_n_op_release),
77766+ atomic_read_unchecked(&fscache_n_op_gc));
77767
77768 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
77769 atomic_read(&fscache_n_cop_alloc_object),
77770diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
77771index e5bbf74..9bfdaf3 100644
77772--- a/fs/fuse/cuse.c
77773+++ b/fs/fuse/cuse.c
77774@@ -602,10 +602,12 @@ static int __init cuse_init(void)
77775 INIT_LIST_HEAD(&cuse_conntbl[i]);
77776
77777 /* inherit and extend fuse_dev_operations */
77778- cuse_channel_fops = fuse_dev_operations;
77779- cuse_channel_fops.owner = THIS_MODULE;
77780- cuse_channel_fops.open = cuse_channel_open;
77781- cuse_channel_fops.release = cuse_channel_release;
77782+ pax_open_kernel();
77783+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
77784+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
77785+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
77786+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
77787+ pax_close_kernel();
77788
77789 cuse_class = class_create(THIS_MODULE, "cuse");
77790 if (IS_ERR(cuse_class))
77791diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
77792index c8b68ab..97190db 100644
77793--- a/fs/fuse/dev.c
77794+++ b/fs/fuse/dev.c
77795@@ -1398,7 +1398,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77796 ret = 0;
77797 pipe_lock(pipe);
77798
77799- if (!pipe->readers) {
77800+ if (!atomic_read(&pipe->readers)) {
77801 send_sig(SIGPIPE, current, 0);
77802 if (!ret)
77803 ret = -EPIPE;
77804@@ -1427,7 +1427,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77805 page_nr++;
77806 ret += buf->len;
77807
77808- if (pipe->files)
77809+ if (atomic_read(&pipe->files))
77810 do_wakeup = 1;
77811 }
77812
77813diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
77814index 0572bca..cb9c3fa 100644
77815--- a/fs/fuse/dir.c
77816+++ b/fs/fuse/dir.c
77817@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
77818 return link;
77819 }
77820
77821-static void free_link(char *link)
77822+static void free_link(const char *link)
77823 {
77824 if (!IS_ERR(link))
77825 free_page((unsigned long) link);
77826diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
77827index 0fa8062..755b198 100644
77828--- a/fs/gfs2/glock.c
77829+++ b/fs/gfs2/glock.c
77830@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
77831 if (held1 != held2) {
77832 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
77833 if (held2)
77834- gl->gl_lockref.count++;
77835+ __lockref_inc(&gl->gl_lockref);
77836 else
77837- gl->gl_lockref.count--;
77838+ __lockref_dec(&gl->gl_lockref);
77839 }
77840 if (held1 && held2 && list_empty(&gl->gl_holders))
77841 clear_bit(GLF_QUEUED, &gl->gl_flags);
77842@@ -614,9 +614,9 @@ out:
77843 out_sched:
77844 clear_bit(GLF_LOCK, &gl->gl_flags);
77845 smp_mb__after_atomic();
77846- gl->gl_lockref.count++;
77847+ __lockref_inc(&gl->gl_lockref);
77848 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77849- gl->gl_lockref.count--;
77850+ __lockref_dec(&gl->gl_lockref);
77851 return;
77852
77853 out_unlock:
77854@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
77855 gl->gl_sbd = sdp;
77856 gl->gl_flags = 0;
77857 gl->gl_name = name;
77858- gl->gl_lockref.count = 1;
77859+ __lockref_set(&gl->gl_lockref, 1);
77860 gl->gl_state = LM_ST_UNLOCKED;
77861 gl->gl_target = LM_ST_UNLOCKED;
77862 gl->gl_demote_state = LM_ST_EXCLUSIVE;
77863@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
77864 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
77865 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
77866 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77867- gl->gl_lockref.count++;
77868+ __lockref_inc(&gl->gl_lockref);
77869 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77870- gl->gl_lockref.count--;
77871+ __lockref_dec(&gl->gl_lockref);
77872 }
77873 run_queue(gl, 1);
77874 spin_unlock(&gl->gl_spin);
77875@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
77876 }
77877 }
77878
77879- gl->gl_lockref.count++;
77880+ __lockref_inc(&gl->gl_lockref);
77881 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77882 spin_unlock(&gl->gl_spin);
77883
77884@@ -1384,12 +1384,12 @@ add_back_to_lru:
77885 goto add_back_to_lru;
77886 }
77887 clear_bit(GLF_LRU, &gl->gl_flags);
77888- gl->gl_lockref.count++;
77889+ __lockref_inc(&gl->gl_lockref);
77890 if (demote_ok(gl))
77891 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
77892 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
77893 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77894- gl->gl_lockref.count--;
77895+ __lockref_dec(&gl->gl_lockref);
77896 spin_unlock(&gl->gl_spin);
77897 cond_resched_lock(&lru_lock);
77898 }
77899@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
77900 state2str(gl->gl_demote_state), dtime,
77901 atomic_read(&gl->gl_ail_count),
77902 atomic_read(&gl->gl_revokes),
77903- (int)gl->gl_lockref.count, gl->gl_hold_time);
77904+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
77905
77906 list_for_each_entry(gh, &gl->gl_holders, gh_list)
77907 dump_holder(seq, gh);
77908diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
77909index fe91951..ce38a6e 100644
77910--- a/fs/gfs2/glops.c
77911+++ b/fs/gfs2/glops.c
77912@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
77913
77914 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
77915 gl->gl_state == LM_ST_SHARED && ip) {
77916- gl->gl_lockref.count++;
77917+ __lockref_inc(&gl->gl_lockref);
77918 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
77919- gl->gl_lockref.count--;
77920+ __lockref_dec(&gl->gl_lockref);
77921 }
77922 }
77923
77924diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
77925index e3065cb..45e7117 100644
77926--- a/fs/gfs2/quota.c
77927+++ b/fs/gfs2/quota.c
77928@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
77929 if (!spin_trylock(&qd->qd_lockref.lock))
77930 return LRU_SKIP;
77931
77932- if (qd->qd_lockref.count == 0) {
77933+ if (__lockref_read(&qd->qd_lockref) == 0) {
77934 lockref_mark_dead(&qd->qd_lockref);
77935 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
77936 }
77937@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
77938 return NULL;
77939
77940 qd->qd_sbd = sdp;
77941- qd->qd_lockref.count = 1;
77942+ __lockref_set(&qd->qd_lockref, 1);
77943 spin_lock_init(&qd->qd_lockref.lock);
77944 qd->qd_id = qid;
77945 qd->qd_slot = -1;
77946@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
77947 if (lockref_put_or_lock(&qd->qd_lockref))
77948 return;
77949
77950- qd->qd_lockref.count = 0;
77951+ __lockref_set(&qd->qd_lockref, 0);
77952 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
77953 spin_unlock(&qd->qd_lockref.lock);
77954
77955diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
77956index 07d8d8f..2c2a4e7 100644
77957--- a/fs/hostfs/hostfs_kern.c
77958+++ b/fs/hostfs/hostfs_kern.c
77959@@ -918,7 +918,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
77960
77961 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
77962 {
77963- char *s = nd_get_link(nd);
77964+ const char *s = nd_get_link(nd);
77965 if (!IS_ERR(s))
77966 __putname(s);
77967 }
77968diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
77969index 87724c1..5a5e53f 100644
77970--- a/fs/hugetlbfs/inode.c
77971+++ b/fs/hugetlbfs/inode.c
77972@@ -151,6 +151,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77973 struct mm_struct *mm = current->mm;
77974 struct vm_area_struct *vma;
77975 struct hstate *h = hstate_file(file);
77976+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
77977 struct vm_unmapped_area_info info;
77978
77979 if (len & ~huge_page_mask(h))
77980@@ -164,17 +165,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77981 return addr;
77982 }
77983
77984+#ifdef CONFIG_PAX_RANDMMAP
77985+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77986+#endif
77987+
77988 if (addr) {
77989 addr = ALIGN(addr, huge_page_size(h));
77990 vma = find_vma(mm, addr);
77991- if (TASK_SIZE - len >= addr &&
77992- (!vma || addr + len <= vma->vm_start))
77993+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
77994 return addr;
77995 }
77996
77997 info.flags = 0;
77998 info.length = len;
77999 info.low_limit = TASK_UNMAPPED_BASE;
78000+
78001+#ifdef CONFIG_PAX_RANDMMAP
78002+ if (mm->pax_flags & MF_PAX_RANDMMAP)
78003+ info.low_limit += mm->delta_mmap;
78004+#endif
78005+
78006 info.high_limit = TASK_SIZE;
78007 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
78008 info.align_offset = 0;
78009@@ -939,7 +949,7 @@ static struct file_system_type hugetlbfs_fs_type = {
78010 };
78011 MODULE_ALIAS_FS("hugetlbfs");
78012
78013-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
78014+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
78015
78016 static int can_do_hugetlb_shm(void)
78017 {
78018diff --git a/fs/inode.c b/fs/inode.c
78019index 6e342ca..0538cb7 100644
78020--- a/fs/inode.c
78021+++ b/fs/inode.c
78022@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
78023 unsigned int *p = &get_cpu_var(last_ino);
78024 unsigned int res = *p;
78025
78026+start:
78027+
78028 #ifdef CONFIG_SMP
78029 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
78030- static atomic_t shared_last_ino;
78031- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
78032+ static atomic_unchecked_t shared_last_ino;
78033+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
78034
78035 res = next - LAST_INO_BATCH;
78036 }
78037 #endif
78038
78039- *p = ++res;
78040+ if (unlikely(!++res))
78041+ goto start; /* never zero */
78042+ *p = res;
78043 put_cpu_var(last_ino);
78044 return res;
78045 }
78046diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
78047index 4a6cf28..d3a29d3 100644
78048--- a/fs/jffs2/erase.c
78049+++ b/fs/jffs2/erase.c
78050@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
78051 struct jffs2_unknown_node marker = {
78052 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
78053 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
78054- .totlen = cpu_to_je32(c->cleanmarker_size)
78055+ .totlen = cpu_to_je32(c->cleanmarker_size),
78056+ .hdr_crc = cpu_to_je32(0)
78057 };
78058
78059 jffs2_prealloc_raw_node_refs(c, jeb, 1);
78060diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
78061index 09ed551..45684f8 100644
78062--- a/fs/jffs2/wbuf.c
78063+++ b/fs/jffs2/wbuf.c
78064@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
78065 {
78066 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
78067 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
78068- .totlen = constant_cpu_to_je32(8)
78069+ .totlen = constant_cpu_to_je32(8),
78070+ .hdr_crc = constant_cpu_to_je32(0)
78071 };
78072
78073 /*
78074diff --git a/fs/jfs/super.c b/fs/jfs/super.c
78075index 4cd9798..8dfe86a 100644
78076--- a/fs/jfs/super.c
78077+++ b/fs/jfs/super.c
78078@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
78079
78080 jfs_inode_cachep =
78081 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
78082- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
78083+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
78084 init_once);
78085 if (jfs_inode_cachep == NULL)
78086 return -ENOMEM;
78087diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
78088index 2d48d28..82eddad 100644
78089--- a/fs/kernfs/dir.c
78090+++ b/fs/kernfs/dir.c
78091@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
78092 *
78093 * Returns 31 bit hash of ns + name (so it fits in an off_t )
78094 */
78095-static unsigned int kernfs_name_hash(const char *name, const void *ns)
78096+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
78097 {
78098 unsigned long hash = init_name_hash();
78099 unsigned int len = strlen(name);
78100@@ -873,6 +873,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
78101 ret = scops->mkdir(parent, dentry->d_name.name, mode);
78102
78103 kernfs_put_active(parent);
78104+
78105+ if (!ret) {
78106+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
78107+ ret = PTR_ERR_OR_ZERO(dentry_ret);
78108+ }
78109+
78110 return ret;
78111 }
78112
78113diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
78114index 2bacb99..f745182 100644
78115--- a/fs/kernfs/file.c
78116+++ b/fs/kernfs/file.c
78117@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
78118
78119 struct kernfs_open_node {
78120 atomic_t refcnt;
78121- atomic_t event;
78122+ atomic_unchecked_t event;
78123 wait_queue_head_t poll;
78124 struct list_head files; /* goes through kernfs_open_file.list */
78125 };
78126@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
78127 {
78128 struct kernfs_open_file *of = sf->private;
78129
78130- of->event = atomic_read(&of->kn->attr.open->event);
78131+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
78132
78133 return of->kn->attr.ops->seq_show(sf, v);
78134 }
78135@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
78136 goto out_free;
78137 }
78138
78139- of->event = atomic_read(&of->kn->attr.open->event);
78140+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
78141 ops = kernfs_ops(of->kn);
78142 if (ops->read)
78143 len = ops->read(of, buf, len, *ppos);
78144@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
78145 {
78146 struct kernfs_open_file *of = kernfs_of(file);
78147 const struct kernfs_ops *ops;
78148- size_t len;
78149+ ssize_t len;
78150 char *buf;
78151
78152 if (of->atomic_write_len) {
78153@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
78154 return ret;
78155 }
78156
78157-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
78158- void *buf, int len, int write)
78159+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
78160+ void *buf, size_t len, int write)
78161 {
78162 struct file *file = vma->vm_file;
78163 struct kernfs_open_file *of = kernfs_of(file);
78164- int ret;
78165+ ssize_t ret;
78166
78167 if (!of->vm_ops)
78168 return -EINVAL;
78169@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
78170 return -ENOMEM;
78171
78172 atomic_set(&new_on->refcnt, 0);
78173- atomic_set(&new_on->event, 1);
78174+ atomic_set_unchecked(&new_on->event, 1);
78175 init_waitqueue_head(&new_on->poll);
78176 INIT_LIST_HEAD(&new_on->files);
78177 goto retry;
78178@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
78179
78180 kernfs_put_active(kn);
78181
78182- if (of->event != atomic_read(&on->event))
78183+ if (of->event != atomic_read_unchecked(&on->event))
78184 goto trigger;
78185
78186 return DEFAULT_POLLMASK;
78187@@ -824,7 +824,7 @@ repeat:
78188
78189 on = kn->attr.open;
78190 if (on) {
78191- atomic_inc(&on->event);
78192+ atomic_inc_unchecked(&on->event);
78193 wake_up_interruptible(&on->poll);
78194 }
78195
78196diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
78197index 8a19889..4c3069a 100644
78198--- a/fs/kernfs/symlink.c
78199+++ b/fs/kernfs/symlink.c
78200@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
78201 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
78202 void *cookie)
78203 {
78204- char *page = nd_get_link(nd);
78205+ const char *page = nd_get_link(nd);
78206 if (!IS_ERR(page))
78207 free_page((unsigned long)page);
78208 }
78209diff --git a/fs/libfs.c b/fs/libfs.c
78210index 0281359..24971ac 100644
78211--- a/fs/libfs.c
78212+++ b/fs/libfs.c
78213@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
78214
78215 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
78216 struct dentry *next = list_entry(p, struct dentry, d_child);
78217+ char d_name[sizeof(next->d_iname)];
78218+ const unsigned char *name;
78219+
78220 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
78221 if (!simple_positive(next)) {
78222 spin_unlock(&next->d_lock);
78223@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
78224
78225 spin_unlock(&next->d_lock);
78226 spin_unlock(&dentry->d_lock);
78227- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
78228+ name = next->d_name.name;
78229+ if (name == next->d_iname) {
78230+ memcpy(d_name, name, next->d_name.len);
78231+ name = d_name;
78232+ }
78233+ if (!dir_emit(ctx, name, next->d_name.len,
78234 d_inode(next)->i_ino, dt_type(d_inode(next))))
78235 return 0;
78236 spin_lock(&dentry->d_lock);
78237@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
78238 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
78239 void *cookie)
78240 {
78241- char *s = nd_get_link(nd);
78242+ const char *s = nd_get_link(nd);
78243 if (!IS_ERR(s))
78244 kfree(s);
78245 }
78246diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
78247index acd3947..1f896e2 100644
78248--- a/fs/lockd/clntproc.c
78249+++ b/fs/lockd/clntproc.c
78250@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
78251 /*
78252 * Cookie counter for NLM requests
78253 */
78254-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
78255+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
78256
78257 void nlmclnt_next_cookie(struct nlm_cookie *c)
78258 {
78259- u32 cookie = atomic_inc_return(&nlm_cookie);
78260+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
78261
78262 memcpy(c->data, &cookie, 4);
78263 c->len=4;
78264diff --git a/fs/mount.h b/fs/mount.h
78265index 6a61c2b..bd79179 100644
78266--- a/fs/mount.h
78267+++ b/fs/mount.h
78268@@ -13,7 +13,7 @@ struct mnt_namespace {
78269 u64 seq; /* Sequence number to prevent loops */
78270 wait_queue_head_t poll;
78271 u64 event;
78272-};
78273+} __randomize_layout;
78274
78275 struct mnt_pcp {
78276 int mnt_count;
78277@@ -65,7 +65,7 @@ struct mount {
78278 struct hlist_head mnt_pins;
78279 struct fs_pin mnt_umount;
78280 struct dentry *mnt_ex_mountpoint;
78281-};
78282+} __randomize_layout;
78283
78284 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
78285
78286diff --git a/fs/namei.c b/fs/namei.c
78287index fe30d3b..cf767ae 100644
78288--- a/fs/namei.c
78289+++ b/fs/namei.c
78290@@ -336,17 +336,32 @@ int generic_permission(struct inode *inode, int mask)
78291 if (ret != -EACCES)
78292 return ret;
78293
78294+#ifdef CONFIG_GRKERNSEC
78295+ /* we'll block if we have to log due to a denied capability use */
78296+ if (mask & MAY_NOT_BLOCK)
78297+ return -ECHILD;
78298+#endif
78299+
78300 if (S_ISDIR(inode->i_mode)) {
78301 /* DACs are overridable for directories */
78302- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78303- return 0;
78304 if (!(mask & MAY_WRITE))
78305- if (capable_wrt_inode_uidgid(inode,
78306- CAP_DAC_READ_SEARCH))
78307+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78308+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78309 return 0;
78310+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78311+ return 0;
78312 return -EACCES;
78313 }
78314 /*
78315+ * Searching includes executable on directories, else just read.
78316+ */
78317+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78318+ if (mask == MAY_READ)
78319+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78320+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78321+ return 0;
78322+
78323+ /*
78324 * Read/write DACs are always overridable.
78325 * Executable DACs are overridable when there is
78326 * at least one exec bit set.
78327@@ -355,14 +370,6 @@ int generic_permission(struct inode *inode, int mask)
78328 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78329 return 0;
78330
78331- /*
78332- * Searching includes executable on directories, else just read.
78333- */
78334- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78335- if (mask == MAY_READ)
78336- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78337- return 0;
78338-
78339 return -EACCES;
78340 }
78341 EXPORT_SYMBOL(generic_permission);
78342@@ -502,7 +509,7 @@ struct nameidata {
78343 int last_type;
78344 unsigned depth;
78345 struct file *base;
78346- char *saved_names[MAX_NESTED_LINKS + 1];
78347+ const char *saved_names[MAX_NESTED_LINKS + 1];
78348 };
78349
78350 /*
78351@@ -713,13 +720,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
78352 nd->flags |= LOOKUP_JUMPED;
78353 }
78354
78355-void nd_set_link(struct nameidata *nd, char *path)
78356+void nd_set_link(struct nameidata *nd, const char *path)
78357 {
78358 nd->saved_names[nd->depth] = path;
78359 }
78360 EXPORT_SYMBOL(nd_set_link);
78361
78362-char *nd_get_link(struct nameidata *nd)
78363+const char *nd_get_link(const struct nameidata *nd)
78364 {
78365 return nd->saved_names[nd->depth];
78366 }
78367@@ -854,7 +861,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78368 {
78369 struct dentry *dentry = link->dentry;
78370 int error;
78371- char *s;
78372+ const char *s;
78373
78374 BUG_ON(nd->flags & LOOKUP_RCU);
78375
78376@@ -875,6 +882,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78377 if (error)
78378 goto out_put_nd_path;
78379
78380+ if (gr_handle_follow_link(dentry, nd->path.mnt)) {
78381+ error = -EACCES;
78382+ goto out_put_nd_path;
78383+ }
78384+
78385 nd->last_type = LAST_BIND;
78386 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
78387 error = PTR_ERR(*p);
78388@@ -1647,6 +1659,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
78389 if (res)
78390 break;
78391 res = walk_component(nd, path, LOOKUP_FOLLOW);
78392+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
78393+ res = -EACCES;
78394 put_link(nd, &link, cookie);
78395 } while (res > 0);
78396
78397@@ -1719,7 +1733,7 @@ EXPORT_SYMBOL(full_name_hash);
78398 static inline u64 hash_name(const char *name)
78399 {
78400 unsigned long a, b, adata, bdata, mask, hash, len;
78401- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78402+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78403
78404 hash = a = 0;
78405 len = -sizeof(unsigned long);
78406@@ -2015,6 +2029,8 @@ static int path_lookupat(int dfd, const struct filename *name,
78407 if (err)
78408 break;
78409 err = lookup_last(nd, &path);
78410+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
78411+ err = -EACCES;
78412 put_link(nd, &link, cookie);
78413 }
78414 }
78415@@ -2022,6 +2038,13 @@ static int path_lookupat(int dfd, const struct filename *name,
78416 if (!err)
78417 err = complete_walk(nd);
78418
78419+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
78420+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78421+ path_put(&nd->path);
78422+ err = -ENOENT;
78423+ }
78424+ }
78425+
78426 if (!err && nd->flags & LOOKUP_DIRECTORY) {
78427 if (!d_can_lookup(nd->path.dentry)) {
78428 path_put(&nd->path);
78429@@ -2042,8 +2065,15 @@ static int filename_lookup(int dfd, struct filename *name,
78430 if (unlikely(retval == -ESTALE))
78431 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
78432
78433- if (likely(!retval))
78434+ if (likely(!retval)) {
78435 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
78436+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
78437+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
78438+ path_put(&nd->path);
78439+ return -ENOENT;
78440+ }
78441+ }
78442+ }
78443 return retval;
78444 }
78445
78446@@ -2621,6 +2651,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
78447 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
78448 return -EPERM;
78449
78450+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
78451+ return -EPERM;
78452+ if (gr_handle_rawio(inode))
78453+ return -EPERM;
78454+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
78455+ return -EACCES;
78456+
78457 return 0;
78458 }
78459
78460@@ -2852,7 +2889,7 @@ looked_up:
78461 * cleared otherwise prior to returning.
78462 */
78463 static int lookup_open(struct nameidata *nd, struct path *path,
78464- struct file *file,
78465+ struct path *link, struct file *file,
78466 const struct open_flags *op,
78467 bool got_write, int *opened)
78468 {
78469@@ -2887,6 +2924,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78470 /* Negative dentry, just create the file */
78471 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
78472 umode_t mode = op->mode;
78473+
78474+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
78475+ error = -EACCES;
78476+ goto out_dput;
78477+ }
78478+
78479+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
78480+ error = -EACCES;
78481+ goto out_dput;
78482+ }
78483+
78484 if (!IS_POSIXACL(dir->d_inode))
78485 mode &= ~current_umask();
78486 /*
78487@@ -2908,6 +2956,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78488 nd->flags & LOOKUP_EXCL);
78489 if (error)
78490 goto out_dput;
78491+ else
78492+ gr_handle_create(dentry, nd->path.mnt);
78493 }
78494 out_no_open:
78495 path->dentry = dentry;
78496@@ -2922,7 +2972,7 @@ out_dput:
78497 /*
78498 * Handle the last step of open()
78499 */
78500-static int do_last(struct nameidata *nd, struct path *path,
78501+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
78502 struct file *file, const struct open_flags *op,
78503 int *opened, struct filename *name)
78504 {
78505@@ -2972,6 +3022,15 @@ static int do_last(struct nameidata *nd, struct path *path,
78506 if (error)
78507 return error;
78508
78509+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
78510+ error = -ENOENT;
78511+ goto out;
78512+ }
78513+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78514+ error = -EACCES;
78515+ goto out;
78516+ }
78517+
78518 audit_inode(name, dir, LOOKUP_PARENT);
78519 error = -EISDIR;
78520 /* trailing slashes? */
78521@@ -2991,7 +3050,7 @@ retry_lookup:
78522 */
78523 }
78524 mutex_lock(&dir->d_inode->i_mutex);
78525- error = lookup_open(nd, path, file, op, got_write, opened);
78526+ error = lookup_open(nd, path, link, file, op, got_write, opened);
78527 mutex_unlock(&dir->d_inode->i_mutex);
78528
78529 if (error <= 0) {
78530@@ -3015,11 +3074,28 @@ retry_lookup:
78531 goto finish_open_created;
78532 }
78533
78534+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
78535+ error = -ENOENT;
78536+ goto exit_dput;
78537+ }
78538+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
78539+ error = -EACCES;
78540+ goto exit_dput;
78541+ }
78542+
78543 /*
78544 * create/update audit record if it already exists.
78545 */
78546- if (d_is_positive(path->dentry))
78547+ if (d_is_positive(path->dentry)) {
78548+ /* only check if O_CREAT is specified, all other checks need to go
78549+ into may_open */
78550+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
78551+ error = -EACCES;
78552+ goto exit_dput;
78553+ }
78554+
78555 audit_inode(name, path->dentry, 0);
78556+ }
78557
78558 /*
78559 * If atomic_open() acquired write access it is dropped now due to
78560@@ -3060,6 +3136,11 @@ finish_lookup:
78561 }
78562 }
78563 BUG_ON(inode != path->dentry->d_inode);
78564+ /* if we're resolving a symlink to another symlink */
78565+ if (link && gr_handle_symlink_owner(link, inode)) {
78566+ error = -EACCES;
78567+ goto out;
78568+ }
78569 return 1;
78570 }
78571
78572@@ -3079,7 +3160,18 @@ finish_open:
78573 path_put(&save_parent);
78574 return error;
78575 }
78576+
78577+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78578+ error = -ENOENT;
78579+ goto out;
78580+ }
78581+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78582+ error = -EACCES;
78583+ goto out;
78584+ }
78585+
78586 audit_inode(name, nd->path.dentry, 0);
78587+
78588 error = -EISDIR;
78589 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
78590 goto out;
78591@@ -3240,7 +3332,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78592 if (unlikely(error))
78593 goto out;
78594
78595- error = do_last(nd, &path, file, op, &opened, pathname);
78596+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
78597 while (unlikely(error > 0)) { /* trailing symlink */
78598 struct path link = path;
78599 void *cookie;
78600@@ -3258,7 +3350,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78601 error = follow_link(&link, nd, &cookie);
78602 if (unlikely(error))
78603 break;
78604- error = do_last(nd, &path, file, op, &opened, pathname);
78605+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
78606 put_link(nd, &link, cookie);
78607 }
78608 out:
78609@@ -3361,9 +3453,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
78610 goto unlock;
78611
78612 error = -EEXIST;
78613- if (d_is_positive(dentry))
78614+ if (d_is_positive(dentry)) {
78615+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
78616+ error = -ENOENT;
78617 goto fail;
78618-
78619+ }
78620 /*
78621 * Special case - lookup gave negative, but... we had foo/bar/
78622 * From the vfs_mknod() POV we just have a negative dentry -
78623@@ -3428,6 +3522,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
78624 }
78625 EXPORT_SYMBOL(user_path_create);
78626
78627+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
78628+{
78629+ struct filename *tmp = getname(pathname);
78630+ struct dentry *res;
78631+ if (IS_ERR(tmp))
78632+ return ERR_CAST(tmp);
78633+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
78634+ if (IS_ERR(res))
78635+ putname(tmp);
78636+ else
78637+ *to = tmp;
78638+ return res;
78639+}
78640+
78641 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
78642 {
78643 int error = may_create(dir, dentry);
78644@@ -3491,6 +3599,17 @@ retry:
78645
78646 if (!IS_POSIXACL(path.dentry->d_inode))
78647 mode &= ~current_umask();
78648+
78649+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
78650+ error = -EPERM;
78651+ goto out;
78652+ }
78653+
78654+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78655+ error = -EACCES;
78656+ goto out;
78657+ }
78658+
78659 error = security_path_mknod(&path, dentry, mode, dev);
78660 if (error)
78661 goto out;
78662@@ -3506,6 +3625,8 @@ retry:
78663 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
78664 break;
78665 }
78666+ if (!error)
78667+ gr_handle_create(dentry, path.mnt);
78668 out:
78669 done_path_create(&path, dentry);
78670 if (retry_estale(error, lookup_flags)) {
78671@@ -3560,9 +3681,16 @@ retry:
78672
78673 if (!IS_POSIXACL(path.dentry->d_inode))
78674 mode &= ~current_umask();
78675+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
78676+ error = -EACCES;
78677+ goto out;
78678+ }
78679 error = security_path_mkdir(&path, dentry, mode);
78680 if (!error)
78681 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
78682+ if (!error)
78683+ gr_handle_create(dentry, path.mnt);
78684+out:
78685 done_path_create(&path, dentry);
78686 if (retry_estale(error, lookup_flags)) {
78687 lookup_flags |= LOOKUP_REVAL;
78688@@ -3595,7 +3723,7 @@ void dentry_unhash(struct dentry *dentry)
78689 {
78690 shrink_dcache_parent(dentry);
78691 spin_lock(&dentry->d_lock);
78692- if (dentry->d_lockref.count == 1)
78693+ if (__lockref_read(&dentry->d_lockref) == 1)
78694 __d_drop(dentry);
78695 spin_unlock(&dentry->d_lock);
78696 }
78697@@ -3646,6 +3774,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
78698 struct filename *name;
78699 struct dentry *dentry;
78700 struct nameidata nd;
78701+ u64 saved_ino = 0;
78702+ dev_t saved_dev = 0;
78703 unsigned int lookup_flags = 0;
78704 retry:
78705 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78706@@ -3678,10 +3808,21 @@ retry:
78707 error = -ENOENT;
78708 goto exit3;
78709 }
78710+
78711+ saved_ino = gr_get_ino_from_dentry(dentry);
78712+ saved_dev = gr_get_dev_from_dentry(dentry);
78713+
78714+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
78715+ error = -EACCES;
78716+ goto exit3;
78717+ }
78718+
78719 error = security_path_rmdir(&nd.path, dentry);
78720 if (error)
78721 goto exit3;
78722 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
78723+ if (!error && (saved_dev || saved_ino))
78724+ gr_handle_delete(saved_ino, saved_dev);
78725 exit3:
78726 dput(dentry);
78727 exit2:
78728@@ -3774,6 +3915,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
78729 struct nameidata nd;
78730 struct inode *inode = NULL;
78731 struct inode *delegated_inode = NULL;
78732+ u64 saved_ino = 0;
78733+ dev_t saved_dev = 0;
78734 unsigned int lookup_flags = 0;
78735 retry:
78736 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78737@@ -3800,10 +3943,22 @@ retry_deleg:
78738 if (d_is_negative(dentry))
78739 goto slashes;
78740 ihold(inode);
78741+
78742+ if (inode->i_nlink <= 1) {
78743+ saved_ino = gr_get_ino_from_dentry(dentry);
78744+ saved_dev = gr_get_dev_from_dentry(dentry);
78745+ }
78746+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
78747+ error = -EACCES;
78748+ goto exit2;
78749+ }
78750+
78751 error = security_path_unlink(&nd.path, dentry);
78752 if (error)
78753 goto exit2;
78754 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
78755+ if (!error && (saved_ino || saved_dev))
78756+ gr_handle_delete(saved_ino, saved_dev);
78757 exit2:
78758 dput(dentry);
78759 }
78760@@ -3892,9 +4047,17 @@ retry:
78761 if (IS_ERR(dentry))
78762 goto out_putname;
78763
78764+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
78765+ error = -EACCES;
78766+ goto out;
78767+ }
78768+
78769 error = security_path_symlink(&path, dentry, from->name);
78770 if (!error)
78771 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
78772+ if (!error)
78773+ gr_handle_create(dentry, path.mnt);
78774+out:
78775 done_path_create(&path, dentry);
78776 if (retry_estale(error, lookup_flags)) {
78777 lookup_flags |= LOOKUP_REVAL;
78778@@ -3998,6 +4161,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
78779 struct dentry *new_dentry;
78780 struct path old_path, new_path;
78781 struct inode *delegated_inode = NULL;
78782+ struct filename *to = NULL;
78783 int how = 0;
78784 int error;
78785
78786@@ -4021,7 +4185,7 @@ retry:
78787 if (error)
78788 return error;
78789
78790- new_dentry = user_path_create(newdfd, newname, &new_path,
78791+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
78792 (how & LOOKUP_REVAL));
78793 error = PTR_ERR(new_dentry);
78794 if (IS_ERR(new_dentry))
78795@@ -4033,11 +4197,26 @@ retry:
78796 error = may_linkat(&old_path);
78797 if (unlikely(error))
78798 goto out_dput;
78799+
78800+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt, to)) {
78801+ error = -EACCES;
78802+ goto out_dput;
78803+ }
78804+
78805+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
78806+ old_path.dentry, old_path.mnt, to)) {
78807+ error = -EACCES;
78808+ goto out_dput;
78809+ }
78810+
78811 error = security_path_link(old_path.dentry, &new_path, new_dentry);
78812 if (error)
78813 goto out_dput;
78814 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
78815+ if (!error)
78816+ gr_handle_create(new_dentry, new_path.mnt);
78817 out_dput:
78818+ putname(to);
78819 done_path_create(&new_path, new_dentry);
78820 if (delegated_inode) {
78821 error = break_deleg_wait(&delegated_inode);
78822@@ -4353,6 +4532,20 @@ retry_deleg:
78823 if (new_dentry == trap)
78824 goto exit5;
78825
78826+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
78827+ /* use EXDEV error to cause 'mv' to switch to an alternative
78828+ * method for usability
78829+ */
78830+ error = -EXDEV;
78831+ goto exit5;
78832+ }
78833+
78834+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
78835+ old_dentry, d_backing_inode(old_dir), oldnd.path.mnt,
78836+ to, flags);
78837+ if (error)
78838+ goto exit5;
78839+
78840 error = security_path_rename(&oldnd.path, old_dentry,
78841 &newnd.path, new_dentry, flags);
78842 if (error)
78843@@ -4360,6 +4553,9 @@ retry_deleg:
78844 error = vfs_rename(old_dir->d_inode, old_dentry,
78845 new_dir->d_inode, new_dentry,
78846 &delegated_inode, flags);
78847+ if (!error)
78848+ gr_handle_rename(d_backing_inode(old_dir), d_backing_inode(new_dir), old_dentry,
78849+ new_dentry, oldnd.path.mnt, d_is_positive(new_dentry) ? 1 : 0, flags);
78850 exit5:
78851 dput(new_dentry);
78852 exit4:
78853@@ -4416,14 +4612,24 @@ EXPORT_SYMBOL(vfs_whiteout);
78854
78855 int readlink_copy(char __user *buffer, int buflen, const char *link)
78856 {
78857+ char tmpbuf[64];
78858+ const char *newlink;
78859 int len = PTR_ERR(link);
78860+
78861 if (IS_ERR(link))
78862 goto out;
78863
78864 len = strlen(link);
78865 if (len > (unsigned) buflen)
78866 len = buflen;
78867- if (copy_to_user(buffer, link, len))
78868+
78869+ if (len < sizeof(tmpbuf)) {
78870+ memcpy(tmpbuf, link, len);
78871+ newlink = tmpbuf;
78872+ } else
78873+ newlink = link;
78874+
78875+ if (copy_to_user(buffer, newlink, len))
78876 len = -EFAULT;
78877 out:
78878 return len;
78879diff --git a/fs/namespace.c b/fs/namespace.c
78880index 02c6875..ac3626c 100644
78881--- a/fs/namespace.c
78882+++ b/fs/namespace.c
78883@@ -1350,6 +1350,36 @@ enum umount_tree_flags {
78884 UMOUNT_PROPAGATE = 2,
78885 UMOUNT_CONNECTED = 4,
78886 };
78887+
78888+static bool disconnect_mount(struct mount *mnt, enum umount_tree_flags how)
78889+{
78890+ /* Leaving mounts connected is only valid for lazy umounts */
78891+ if (how & UMOUNT_SYNC)
78892+ return true;
78893+
78894+ /* A mount without a parent has nothing to be connected to */
78895+ if (!mnt_has_parent(mnt))
78896+ return true;
78897+
78898+ /* Because the reference counting rules change when mounts are
78899+ * unmounted and connected, umounted mounts may not be
78900+ * connected to mounted mounts.
78901+ */
78902+ if (!(mnt->mnt_parent->mnt.mnt_flags & MNT_UMOUNT))
78903+ return true;
78904+
78905+ /* Has it been requested that the mount remain connected? */
78906+ if (how & UMOUNT_CONNECTED)
78907+ return false;
78908+
78909+ /* Is the mount locked such that it needs to remain connected? */
78910+ if (IS_MNT_LOCKED(mnt))
78911+ return false;
78912+
78913+ /* By default disconnect the mount */
78914+ return true;
78915+}
78916+
78917 /*
78918 * mount_lock must be held
78919 * namespace_sem must be held for write
78920@@ -1387,10 +1417,7 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)
78921 if (how & UMOUNT_SYNC)
78922 p->mnt.mnt_flags |= MNT_SYNC_UMOUNT;
78923
78924- disconnect = !(((how & UMOUNT_CONNECTED) &&
78925- mnt_has_parent(p) &&
78926- (p->mnt_parent->mnt.mnt_flags & MNT_UMOUNT)) ||
78927- IS_MNT_LOCKED_AND_LAZY(p));
78928+ disconnect = disconnect_mount(p, how);
78929
78930 pin_insert_group(&p->mnt_umount, &p->mnt_parent->mnt,
78931 disconnect ? &unmounted : NULL);
78932@@ -1478,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
78933 if (!(sb->s_flags & MS_RDONLY))
78934 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
78935 up_write(&sb->s_umount);
78936+
78937+ gr_log_remount(mnt->mnt_devname, retval);
78938+
78939 return retval;
78940 }
78941
78942@@ -1500,6 +1530,9 @@ static int do_umount(struct mount *mnt, int flags)
78943 }
78944 unlock_mount_hash();
78945 namespace_unlock();
78946+
78947+ gr_log_unmount(mnt->mnt_devname, retval);
78948+
78949 return retval;
78950 }
78951
78952@@ -1527,11 +1560,8 @@ void __detach_mounts(struct dentry *dentry)
78953 while (!hlist_empty(&mp->m_list)) {
78954 mnt = hlist_entry(mp->m_list.first, struct mount, mnt_mp_list);
78955 if (mnt->mnt.mnt_flags & MNT_UMOUNT) {
78956- struct mount *p, *tmp;
78957- list_for_each_entry_safe(p, tmp, &mnt->mnt_mounts, mnt_child) {
78958- hlist_add_head(&p->mnt_umount.s_list, &unmounted);
78959- umount_mnt(p);
78960- }
78961+ hlist_add_head(&mnt->mnt_umount.s_list, &unmounted);
78962+ umount_mnt(mnt);
78963 }
78964 else umount_tree(mnt, UMOUNT_CONNECTED);
78965 }
78966@@ -1557,7 +1587,7 @@ static inline bool may_mount(void)
78967 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
78968 */
78969
78970-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
78971+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
78972 {
78973 struct path path;
78974 struct mount *mnt;
78975@@ -1602,7 +1632,7 @@ out:
78976 /*
78977 * The 2.0 compatible umount. No flags.
78978 */
78979-SYSCALL_DEFINE1(oldumount, char __user *, name)
78980+SYSCALL_DEFINE1(oldumount, const char __user *, name)
78981 {
78982 return sys_umount(name, 0);
78983 }
78984@@ -2677,6 +2707,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78985 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
78986 MS_STRICTATIME);
78987
78988+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
78989+ retval = -EPERM;
78990+ goto dput_out;
78991+ }
78992+
78993+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
78994+ retval = -EPERM;
78995+ goto dput_out;
78996+ }
78997+
78998 if (flags & MS_REMOUNT)
78999 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
79000 data_page);
79001@@ -2690,7 +2730,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
79002 retval = do_new_mount(&path, type_page, flags, mnt_flags,
79003 dev_name, data_page);
79004 dput_out:
79005+ gr_log_mount(dev_name, &path, retval);
79006+
79007 path_put(&path);
79008+
79009 return retval;
79010 }
79011
79012@@ -2708,7 +2751,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
79013 * number incrementing at 10Ghz will take 12,427 years to wrap which
79014 * is effectively never, so we can ignore the possibility.
79015 */
79016-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
79017+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
79018
79019 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
79020 {
79021@@ -2724,7 +2767,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
79022 return ERR_PTR(ret);
79023 }
79024 new_ns->ns.ops = &mntns_operations;
79025- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
79026+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
79027 atomic_set(&new_ns->count, 1);
79028 new_ns->root = NULL;
79029 INIT_LIST_HEAD(&new_ns->list);
79030@@ -2734,7 +2777,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
79031 return new_ns;
79032 }
79033
79034-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
79035+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
79036 struct user_namespace *user_ns, struct fs_struct *new_fs)
79037 {
79038 struct mnt_namespace *new_ns;
79039@@ -2855,8 +2898,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
79040 }
79041 EXPORT_SYMBOL(mount_subtree);
79042
79043-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
79044- char __user *, type, unsigned long, flags, void __user *, data)
79045+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
79046+ const char __user *, type, unsigned long, flags, void __user *, data)
79047 {
79048 int ret;
79049 char *kernel_type;
79050@@ -2962,6 +3005,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
79051 if (error)
79052 goto out2;
79053
79054+ if (gr_handle_chroot_pivot()) {
79055+ error = -EPERM;
79056+ goto out2;
79057+ }
79058+
79059 get_fs_root(current->fs, &root);
79060 old_mp = lock_mount(&old);
79061 error = PTR_ERR(old_mp);
79062@@ -3263,7 +3311,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
79063 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
79064 return -EPERM;
79065
79066- if (fs->users != 1)
79067+ if (atomic_read(&fs->users) != 1)
79068 return -EINVAL;
79069
79070 get_mnt_ns(mnt_ns);
79071diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
79072index 19ca95c..b28702c 100644
79073--- a/fs/nfs/callback_xdr.c
79074+++ b/fs/nfs/callback_xdr.c
79075@@ -51,7 +51,7 @@ struct callback_op {
79076 callback_decode_arg_t decode_args;
79077 callback_encode_res_t encode_res;
79078 long res_maxsize;
79079-};
79080+} __do_const;
79081
79082 static struct callback_op callback_ops[];
79083
79084diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
79085index f734562..3fd6c4e 100644
79086--- a/fs/nfs/inode.c
79087+++ b/fs/nfs/inode.c
79088@@ -1275,16 +1275,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
79089 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
79090 }
79091
79092-static atomic_long_t nfs_attr_generation_counter;
79093+static atomic_long_unchecked_t nfs_attr_generation_counter;
79094
79095 static unsigned long nfs_read_attr_generation_counter(void)
79096 {
79097- return atomic_long_read(&nfs_attr_generation_counter);
79098+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
79099 }
79100
79101 unsigned long nfs_inc_attr_generation_counter(void)
79102 {
79103- return atomic_long_inc_return(&nfs_attr_generation_counter);
79104+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
79105 }
79106 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
79107
79108diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
79109index 864e200..357c255 100644
79110--- a/fs/nfsd/nfs4proc.c
79111+++ b/fs/nfsd/nfs4proc.c
79112@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
79113 nfsd4op_rsize op_rsize_bop;
79114 stateid_getter op_get_currentstateid;
79115 stateid_setter op_set_currentstateid;
79116-};
79117+} __do_const;
79118
79119 static struct nfsd4_operation nfsd4_ops[];
79120
79121diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
79122index 158badf..f7132ea 100644
79123--- a/fs/nfsd/nfs4xdr.c
79124+++ b/fs/nfsd/nfs4xdr.c
79125@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
79126
79127 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
79128
79129-static nfsd4_dec nfsd4_dec_ops[] = {
79130+static const nfsd4_dec nfsd4_dec_ops[] = {
79131 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
79132 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
79133 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
79134diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
79135index 46ec934..f384e41 100644
79136--- a/fs/nfsd/nfscache.c
79137+++ b/fs/nfsd/nfscache.c
79138@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79139 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
79140 u32 hash;
79141 struct nfsd_drc_bucket *b;
79142- int len;
79143+ long len;
79144 size_t bufsize = 0;
79145
79146 if (!rp)
79147@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79148 hash = nfsd_cache_hash(rp->c_xid);
79149 b = &drc_hashtbl[hash];
79150
79151- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
79152- len >>= 2;
79153+ if (statp) {
79154+ len = (char*)statp - (char*)resv->iov_base;
79155+ len = resv->iov_len - len;
79156+ len >>= 2;
79157+ }
79158
79159 /* Don't cache excessive amounts of data and XDR failures */
79160- if (!statp || len > (256 >> 2)) {
79161+ if (!statp || len > (256 >> 2) || len < 0) {
79162 nfsd_reply_cache_free(b, rp);
79163 return;
79164 }
79165@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79166 switch (cachetype) {
79167 case RC_REPLSTAT:
79168 if (len != 1)
79169- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
79170+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
79171 rp->c_replstat = *statp;
79172 break;
79173 case RC_REPLBUFF:
79174diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
79175index 84d770b..929bc5e 100644
79176--- a/fs/nfsd/vfs.c
79177+++ b/fs/nfsd/vfs.c
79178@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
79179
79180 oldfs = get_fs();
79181 set_fs(KERNEL_DS);
79182- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
79183+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
79184 set_fs(oldfs);
79185 return nfsd_finish_read(file, count, host_err);
79186 }
79187@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
79188
79189 /* Write the data. */
79190 oldfs = get_fs(); set_fs(KERNEL_DS);
79191- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
79192+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
79193 set_fs(oldfs);
79194 if (host_err < 0)
79195 goto out_nfserr;
79196@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
79197 */
79198
79199 oldfs = get_fs(); set_fs(KERNEL_DS);
79200- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
79201+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
79202 set_fs(oldfs);
79203
79204 if (host_err < 0)
79205diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
79206index 52ccd34..7a6b202 100644
79207--- a/fs/nls/nls_base.c
79208+++ b/fs/nls/nls_base.c
79209@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
79210
79211 int __register_nls(struct nls_table *nls, struct module *owner)
79212 {
79213- struct nls_table ** tmp = &tables;
79214+ struct nls_table *tmp = tables;
79215
79216 if (nls->next)
79217 return -EBUSY;
79218
79219- nls->owner = owner;
79220+ pax_open_kernel();
79221+ *(void **)&nls->owner = owner;
79222+ pax_close_kernel();
79223 spin_lock(&nls_lock);
79224- while (*tmp) {
79225- if (nls == *tmp) {
79226+ while (tmp) {
79227+ if (nls == tmp) {
79228 spin_unlock(&nls_lock);
79229 return -EBUSY;
79230 }
79231- tmp = &(*tmp)->next;
79232+ tmp = tmp->next;
79233 }
79234- nls->next = tables;
79235+ pax_open_kernel();
79236+ *(struct nls_table **)&nls->next = tables;
79237+ pax_close_kernel();
79238 tables = nls;
79239 spin_unlock(&nls_lock);
79240 return 0;
79241@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
79242
79243 int unregister_nls(struct nls_table * nls)
79244 {
79245- struct nls_table ** tmp = &tables;
79246+ struct nls_table * const * tmp = &tables;
79247
79248 spin_lock(&nls_lock);
79249 while (*tmp) {
79250 if (nls == *tmp) {
79251- *tmp = nls->next;
79252+ pax_open_kernel();
79253+ *(struct nls_table **)tmp = nls->next;
79254+ pax_close_kernel();
79255 spin_unlock(&nls_lock);
79256 return 0;
79257 }
79258@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
79259 return -EINVAL;
79260 }
79261
79262-static struct nls_table *find_nls(char *charset)
79263+static struct nls_table *find_nls(const char *charset)
79264 {
79265 struct nls_table *nls;
79266 spin_lock(&nls_lock);
79267@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
79268 return nls;
79269 }
79270
79271-struct nls_table *load_nls(char *charset)
79272+struct nls_table *load_nls(const char *charset)
79273 {
79274 return try_then_request_module(find_nls(charset), "nls_%s", charset);
79275 }
79276diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
79277index 162b3f1..6076a7c 100644
79278--- a/fs/nls/nls_euc-jp.c
79279+++ b/fs/nls/nls_euc-jp.c
79280@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
79281 p_nls = load_nls("cp932");
79282
79283 if (p_nls) {
79284- table.charset2upper = p_nls->charset2upper;
79285- table.charset2lower = p_nls->charset2lower;
79286+ pax_open_kernel();
79287+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79288+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79289+ pax_close_kernel();
79290 return register_nls(&table);
79291 }
79292
79293diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
79294index a80a741..7b96e1b 100644
79295--- a/fs/nls/nls_koi8-ru.c
79296+++ b/fs/nls/nls_koi8-ru.c
79297@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
79298 p_nls = load_nls("koi8-u");
79299
79300 if (p_nls) {
79301- table.charset2upper = p_nls->charset2upper;
79302- table.charset2lower = p_nls->charset2lower;
79303+ pax_open_kernel();
79304+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79305+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79306+ pax_close_kernel();
79307 return register_nls(&table);
79308 }
79309
79310diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
79311index cf27550..6c70f29d 100644
79312--- a/fs/notify/fanotify/fanotify_user.c
79313+++ b/fs/notify/fanotify/fanotify_user.c
79314@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
79315
79316 fd = fanotify_event_metadata.fd;
79317 ret = -EFAULT;
79318- if (copy_to_user(buf, &fanotify_event_metadata,
79319- fanotify_event_metadata.event_len))
79320+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
79321+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
79322 goto out_close_fd;
79323
79324 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
79325diff --git a/fs/notify/notification.c b/fs/notify/notification.c
79326index a95d8e0..a91a5fd 100644
79327--- a/fs/notify/notification.c
79328+++ b/fs/notify/notification.c
79329@@ -48,7 +48,7 @@
79330 #include <linux/fsnotify_backend.h>
79331 #include "fsnotify.h"
79332
79333-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79334+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79335
79336 /**
79337 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
79338@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79339 */
79340 u32 fsnotify_get_cookie(void)
79341 {
79342- return atomic_inc_return(&fsnotify_sync_cookie);
79343+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
79344 }
79345 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
79346
79347diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
79348index 9e38daf..5727cae 100644
79349--- a/fs/ntfs/dir.c
79350+++ b/fs/ntfs/dir.c
79351@@ -1310,7 +1310,7 @@ find_next_index_buffer:
79352 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
79353 ~(s64)(ndir->itype.index.block_size - 1)));
79354 /* Bounds checks. */
79355- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79356+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79357 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
79358 "inode 0x%lx or driver bug.", vdir->i_ino);
79359 goto err_out;
79360diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
79361index 9e1e112..241a52a 100644
79362--- a/fs/ntfs/super.c
79363+++ b/fs/ntfs/super.c
79364@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79365 if (!silent)
79366 ntfs_error(sb, "Primary boot sector is invalid.");
79367 } else if (!silent)
79368- ntfs_error(sb, read_err_str, "primary");
79369+ ntfs_error(sb, read_err_str, "%s", "primary");
79370 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
79371 if (bh_primary)
79372 brelse(bh_primary);
79373@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79374 goto hotfix_primary_boot_sector;
79375 brelse(bh_backup);
79376 } else if (!silent)
79377- ntfs_error(sb, read_err_str, "backup");
79378+ ntfs_error(sb, read_err_str, "%s", "backup");
79379 /* Try to read NT3.51- backup boot sector. */
79380 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
79381 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
79382@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79383 "sector.");
79384 brelse(bh_backup);
79385 } else if (!silent)
79386- ntfs_error(sb, read_err_str, "backup");
79387+ ntfs_error(sb, read_err_str, "%s", "backup");
79388 /* We failed. Cleanup and return. */
79389 if (bh_primary)
79390 brelse(bh_primary);
79391diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
79392index 857bbbc..3c47d15 100644
79393--- a/fs/ocfs2/localalloc.c
79394+++ b/fs/ocfs2/localalloc.c
79395@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
79396 goto bail;
79397 }
79398
79399- atomic_inc(&osb->alloc_stats.moves);
79400+ atomic_inc_unchecked(&osb->alloc_stats.moves);
79401
79402 bail:
79403 if (handle)
79404diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
79405index 460c6c3..b4ef513 100644
79406--- a/fs/ocfs2/ocfs2.h
79407+++ b/fs/ocfs2/ocfs2.h
79408@@ -247,11 +247,11 @@ enum ocfs2_vol_state
79409
79410 struct ocfs2_alloc_stats
79411 {
79412- atomic_t moves;
79413- atomic_t local_data;
79414- atomic_t bitmap_data;
79415- atomic_t bg_allocs;
79416- atomic_t bg_extends;
79417+ atomic_unchecked_t moves;
79418+ atomic_unchecked_t local_data;
79419+ atomic_unchecked_t bitmap_data;
79420+ atomic_unchecked_t bg_allocs;
79421+ atomic_unchecked_t bg_extends;
79422 };
79423
79424 enum ocfs2_local_alloc_state
79425diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
79426index 4479029..5de740b 100644
79427--- a/fs/ocfs2/suballoc.c
79428+++ b/fs/ocfs2/suballoc.c
79429@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
79430 mlog_errno(status);
79431 goto bail;
79432 }
79433- atomic_inc(&osb->alloc_stats.bg_extends);
79434+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
79435
79436 /* You should never ask for this much metadata */
79437 BUG_ON(bits_wanted >
79438@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
79439 mlog_errno(status);
79440 goto bail;
79441 }
79442- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79443+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79444
79445 *suballoc_loc = res.sr_bg_blkno;
79446 *suballoc_bit_start = res.sr_bit_offset;
79447@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
79448 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
79449 res->sr_bits);
79450
79451- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79452+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79453
79454 BUG_ON(res->sr_bits != 1);
79455
79456@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
79457 mlog_errno(status);
79458 goto bail;
79459 }
79460- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79461+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79462
79463 BUG_ON(res.sr_bits != 1);
79464
79465@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79466 cluster_start,
79467 num_clusters);
79468 if (!status)
79469- atomic_inc(&osb->alloc_stats.local_data);
79470+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
79471 } else {
79472 if (min_clusters > (osb->bitmap_cpg - 1)) {
79473 /* The only paths asking for contiguousness
79474@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79475 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
79476 res.sr_bg_blkno,
79477 res.sr_bit_offset);
79478- atomic_inc(&osb->alloc_stats.bitmap_data);
79479+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
79480 *num_clusters = res.sr_bits;
79481 }
79482 }
79483diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
79484index 403c566..6525b35 100644
79485--- a/fs/ocfs2/super.c
79486+++ b/fs/ocfs2/super.c
79487@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
79488 "%10s => GlobalAllocs: %d LocalAllocs: %d "
79489 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
79490 "Stats",
79491- atomic_read(&osb->alloc_stats.bitmap_data),
79492- atomic_read(&osb->alloc_stats.local_data),
79493- atomic_read(&osb->alloc_stats.bg_allocs),
79494- atomic_read(&osb->alloc_stats.moves),
79495- atomic_read(&osb->alloc_stats.bg_extends));
79496+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
79497+ atomic_read_unchecked(&osb->alloc_stats.local_data),
79498+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
79499+ atomic_read_unchecked(&osb->alloc_stats.moves),
79500+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
79501
79502 out += snprintf(buf + out, len - out,
79503 "%10s => State: %u Descriptor: %llu Size: %u bits "
79504@@ -2095,11 +2095,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
79505
79506 mutex_init(&osb->system_file_mutex);
79507
79508- atomic_set(&osb->alloc_stats.moves, 0);
79509- atomic_set(&osb->alloc_stats.local_data, 0);
79510- atomic_set(&osb->alloc_stats.bitmap_data, 0);
79511- atomic_set(&osb->alloc_stats.bg_allocs, 0);
79512- atomic_set(&osb->alloc_stats.bg_extends, 0);
79513+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
79514+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
79515+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
79516+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
79517+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
79518
79519 /* Copy the blockcheck stats from the superblock probe */
79520 osb->osb_ecc_stats = *stats;
79521diff --git a/fs/open.c b/fs/open.c
79522index 98e5a52..8e77e14 100644
79523--- a/fs/open.c
79524+++ b/fs/open.c
79525@@ -32,6 +32,8 @@
79526 #include <linux/dnotify.h>
79527 #include <linux/compat.h>
79528
79529+#define CREATE_TRACE_POINTS
79530+#include <trace/events/fs.h>
79531 #include "internal.h"
79532
79533 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
79534@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
79535 error = locks_verify_truncate(inode, NULL, length);
79536 if (!error)
79537 error = security_path_truncate(path);
79538+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
79539+ error = -EACCES;
79540 if (!error)
79541 error = do_truncate(path->dentry, length, 0, NULL);
79542
79543@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
79544 error = locks_verify_truncate(inode, f.file, length);
79545 if (!error)
79546 error = security_path_truncate(&f.file->f_path);
79547+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
79548+ error = -EACCES;
79549 if (!error)
79550 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
79551 sb_end_write(inode->i_sb);
79552@@ -396,6 +402,9 @@ retry:
79553 if (__mnt_is_readonly(path.mnt))
79554 res = -EROFS;
79555
79556+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
79557+ res = -EACCES;
79558+
79559 out_path_release:
79560 path_put(&path);
79561 if (retry_estale(res, lookup_flags)) {
79562@@ -427,6 +436,8 @@ retry:
79563 if (error)
79564 goto dput_and_out;
79565
79566+ gr_log_chdir(path.dentry, path.mnt);
79567+
79568 set_fs_pwd(current->fs, &path);
79569
79570 dput_and_out:
79571@@ -456,6 +467,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
79572 goto out_putf;
79573
79574 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
79575+
79576+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
79577+ error = -EPERM;
79578+
79579+ if (!error)
79580+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
79581+
79582 if (!error)
79583 set_fs_pwd(current->fs, &f.file->f_path);
79584 out_putf:
79585@@ -485,7 +503,13 @@ retry:
79586 if (error)
79587 goto dput_and_out;
79588
79589+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
79590+ goto dput_and_out;
79591+
79592 set_fs_root(current->fs, &path);
79593+
79594+ gr_handle_chroot_chdir(&path);
79595+
79596 error = 0;
79597 dput_and_out:
79598 path_put(&path);
79599@@ -509,6 +533,16 @@ static int chmod_common(struct path *path, umode_t mode)
79600 return error;
79601 retry_deleg:
79602 mutex_lock(&inode->i_mutex);
79603+
79604+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
79605+ error = -EACCES;
79606+ goto out_unlock;
79607+ }
79608+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
79609+ error = -EACCES;
79610+ goto out_unlock;
79611+ }
79612+
79613 error = security_path_chmod(path, mode);
79614 if (error)
79615 goto out_unlock;
79616@@ -574,6 +608,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
79617 uid = make_kuid(current_user_ns(), user);
79618 gid = make_kgid(current_user_ns(), group);
79619
79620+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
79621+ return -EACCES;
79622+
79623 retry_deleg:
79624 newattrs.ia_valid = ATTR_CTIME;
79625 if (user != (uid_t) -1) {
79626@@ -1018,6 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
79627 } else {
79628 fsnotify_open(f);
79629 fd_install(fd, f);
79630+ trace_do_sys_open(tmp->name, flags, mode);
79631 }
79632 }
79633 putname(tmp);
79634diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
79635index 04f1248..60b3be1 100644
79636--- a/fs/overlayfs/inode.c
79637+++ b/fs/overlayfs/inode.c
79638@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
79639 enum ovl_path_type type;
79640 bool want_write = false;
79641
79642+ if (d_is_dir(dentry))
79643+ return d_backing_inode(dentry);
79644+
79645 type = ovl_path_real(dentry, &realpath);
79646 if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
79647 want_write = true;
79648diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
79649index bf8537c..c16ef7d 100644
79650--- a/fs/overlayfs/super.c
79651+++ b/fs/overlayfs/super.c
79652@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
79653 {
79654 struct ovl_entry *oe = dentry->d_fsdata;
79655
79656- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
79657+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
79658 }
79659
79660 int ovl_want_write(struct dentry *dentry)
79661@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
79662
79663 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
79664 {
79665- struct path upperpath = { NULL, NULL };
79666- struct path workpath = { NULL, NULL };
79667+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
79668+ struct path workpath = { .dentry = NULL, .mnt = NULL };
79669 struct dentry *root_dentry;
79670 struct ovl_entry *oe;
79671 struct ovl_fs *ufs;
79672diff --git a/fs/pipe.c b/fs/pipe.c
79673index 8865f79..bd2c79b 100644
79674--- a/fs/pipe.c
79675+++ b/fs/pipe.c
79676@@ -36,7 +36,7 @@ unsigned int pipe_max_size = 1048576;
79677 /*
79678 * Minimum pipe size, as required by POSIX
79679 */
79680-unsigned int pipe_min_size = PAGE_SIZE;
79681+unsigned int pipe_min_size __read_only = PAGE_SIZE;
79682
79683 /*
79684 * We use a start+len construction, which provides full use of the
79685@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
79686
79687 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
79688 {
79689- if (pipe->files)
79690+ if (atomic_read(&pipe->files))
79691 mutex_lock_nested(&pipe->mutex, subclass);
79692 }
79693
79694@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock);
79695
79696 void pipe_unlock(struct pipe_inode_info *pipe)
79697 {
79698- if (pipe->files)
79699+ if (atomic_read(&pipe->files))
79700 mutex_unlock(&pipe->mutex);
79701 }
79702 EXPORT_SYMBOL(pipe_unlock);
79703@@ -291,9 +291,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
79704 }
79705 if (bufs) /* More to do? */
79706 continue;
79707- if (!pipe->writers)
79708+ if (!atomic_read(&pipe->writers))
79709 break;
79710- if (!pipe->waiting_writers) {
79711+ if (!atomic_read(&pipe->waiting_writers)) {
79712 /* syscall merging: Usually we must not sleep
79713 * if O_NONBLOCK is set, or if we got some data.
79714 * But if a writer sleeps in kernel space, then
79715@@ -350,7 +350,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79716
79717 __pipe_lock(pipe);
79718
79719- if (!pipe->readers) {
79720+ if (!atomic_read(&pipe->readers)) {
79721 send_sig(SIGPIPE, current, 0);
79722 ret = -EPIPE;
79723 goto out;
79724@@ -386,7 +386,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79725 for (;;) {
79726 int bufs;
79727
79728- if (!pipe->readers) {
79729+ if (!atomic_read(&pipe->readers)) {
79730 send_sig(SIGPIPE, current, 0);
79731 if (!ret)
79732 ret = -EPIPE;
79733@@ -454,9 +454,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79734 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79735 do_wakeup = 0;
79736 }
79737- pipe->waiting_writers++;
79738+ atomic_inc(&pipe->waiting_writers);
79739 pipe_wait(pipe);
79740- pipe->waiting_writers--;
79741+ atomic_dec(&pipe->waiting_writers);
79742 }
79743 out:
79744 __pipe_unlock(pipe);
79745@@ -511,7 +511,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79746 mask = 0;
79747 if (filp->f_mode & FMODE_READ) {
79748 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
79749- if (!pipe->writers && filp->f_version != pipe->w_counter)
79750+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
79751 mask |= POLLHUP;
79752 }
79753
79754@@ -521,7 +521,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79755 * Most Unices do not set POLLERR for FIFOs but on Linux they
79756 * behave exactly like pipes for poll().
79757 */
79758- if (!pipe->readers)
79759+ if (!atomic_read(&pipe->readers))
79760 mask |= POLLERR;
79761 }
79762
79763@@ -533,7 +533,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
79764 int kill = 0;
79765
79766 spin_lock(&inode->i_lock);
79767- if (!--pipe->files) {
79768+ if (atomic_dec_and_test(&pipe->files)) {
79769 inode->i_pipe = NULL;
79770 kill = 1;
79771 }
79772@@ -550,11 +550,11 @@ pipe_release(struct inode *inode, struct file *file)
79773
79774 __pipe_lock(pipe);
79775 if (file->f_mode & FMODE_READ)
79776- pipe->readers--;
79777+ atomic_dec(&pipe->readers);
79778 if (file->f_mode & FMODE_WRITE)
79779- pipe->writers--;
79780+ atomic_dec(&pipe->writers);
79781
79782- if (pipe->readers || pipe->writers) {
79783+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
79784 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
79785 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79786 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
79787@@ -619,7 +619,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
79788 kfree(pipe);
79789 }
79790
79791-static struct vfsmount *pipe_mnt __read_mostly;
79792+struct vfsmount *pipe_mnt __read_mostly;
79793
79794 /*
79795 * pipefs_dname() is called from d_path().
79796@@ -649,8 +649,9 @@ static struct inode * get_pipe_inode(void)
79797 goto fail_iput;
79798
79799 inode->i_pipe = pipe;
79800- pipe->files = 2;
79801- pipe->readers = pipe->writers = 1;
79802+ atomic_set(&pipe->files, 2);
79803+ atomic_set(&pipe->readers, 1);
79804+ atomic_set(&pipe->writers, 1);
79805 inode->i_fop = &pipefifo_fops;
79806
79807 /*
79808@@ -829,17 +830,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
79809 spin_lock(&inode->i_lock);
79810 if (inode->i_pipe) {
79811 pipe = inode->i_pipe;
79812- pipe->files++;
79813+ atomic_inc(&pipe->files);
79814 spin_unlock(&inode->i_lock);
79815 } else {
79816 spin_unlock(&inode->i_lock);
79817 pipe = alloc_pipe_info();
79818 if (!pipe)
79819 return -ENOMEM;
79820- pipe->files = 1;
79821+ atomic_set(&pipe->files, 1);
79822 spin_lock(&inode->i_lock);
79823 if (unlikely(inode->i_pipe)) {
79824- inode->i_pipe->files++;
79825+ atomic_inc(&inode->i_pipe->files);
79826 spin_unlock(&inode->i_lock);
79827 free_pipe_info(pipe);
79828 pipe = inode->i_pipe;
79829@@ -864,10 +865,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
79830 * opened, even when there is no process writing the FIFO.
79831 */
79832 pipe->r_counter++;
79833- if (pipe->readers++ == 0)
79834+ if (atomic_inc_return(&pipe->readers) == 1)
79835 wake_up_partner(pipe);
79836
79837- if (!is_pipe && !pipe->writers) {
79838+ if (!is_pipe && !atomic_read(&pipe->writers)) {
79839 if ((filp->f_flags & O_NONBLOCK)) {
79840 /* suppress POLLHUP until we have
79841 * seen a writer */
79842@@ -886,14 +887,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
79843 * errno=ENXIO when there is no process reading the FIFO.
79844 */
79845 ret = -ENXIO;
79846- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
79847+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
79848 goto err;
79849
79850 pipe->w_counter++;
79851- if (!pipe->writers++)
79852+ if (atomic_inc_return(&pipe->writers) == 1)
79853 wake_up_partner(pipe);
79854
79855- if (!is_pipe && !pipe->readers) {
79856+ if (!is_pipe && !atomic_read(&pipe->readers)) {
79857 if (wait_for_partner(pipe, &pipe->r_counter))
79858 goto err_wr;
79859 }
79860@@ -907,11 +908,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
79861 * the process can at least talk to itself.
79862 */
79863
79864- pipe->readers++;
79865- pipe->writers++;
79866+ atomic_inc(&pipe->readers);
79867+ atomic_inc(&pipe->writers);
79868 pipe->r_counter++;
79869 pipe->w_counter++;
79870- if (pipe->readers == 1 || pipe->writers == 1)
79871+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
79872 wake_up_partner(pipe);
79873 break;
79874
79875@@ -925,13 +926,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
79876 return 0;
79877
79878 err_rd:
79879- if (!--pipe->readers)
79880+ if (atomic_dec_and_test(&pipe->readers))
79881 wake_up_interruptible(&pipe->wait);
79882 ret = -ERESTARTSYS;
79883 goto err;
79884
79885 err_wr:
79886- if (!--pipe->writers)
79887+ if (atomic_dec_and_test(&pipe->writers))
79888 wake_up_interruptible(&pipe->wait);
79889 ret = -ERESTARTSYS;
79890 goto err;
79891@@ -1007,7 +1008,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
79892 * Currently we rely on the pipe array holding a power-of-2 number
79893 * of pages.
79894 */
79895-static inline unsigned int round_pipe_size(unsigned int size)
79896+static inline unsigned long round_pipe_size(unsigned long size)
79897 {
79898 unsigned long nr_pages;
79899
79900@@ -1055,13 +1056,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
79901
79902 switch (cmd) {
79903 case F_SETPIPE_SZ: {
79904- unsigned int size, nr_pages;
79905+ unsigned long size, nr_pages;
79906+
79907+ ret = -EINVAL;
79908+ if (arg < pipe_min_size)
79909+ goto out;
79910
79911 size = round_pipe_size(arg);
79912 nr_pages = size >> PAGE_SHIFT;
79913
79914- ret = -EINVAL;
79915- if (!nr_pages)
79916+ if (size < pipe_min_size)
79917 goto out;
79918
79919 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
79920diff --git a/fs/pnode.h b/fs/pnode.h
79921index 7114ce6..0fcdbe7 100644
79922--- a/fs/pnode.h
79923+++ b/fs/pnode.h
79924@@ -20,8 +20,6 @@
79925 #define SET_MNT_MARK(m) ((m)->mnt.mnt_flags |= MNT_MARKED)
79926 #define CLEAR_MNT_MARK(m) ((m)->mnt.mnt_flags &= ~MNT_MARKED)
79927 #define IS_MNT_LOCKED(m) ((m)->mnt.mnt_flags & MNT_LOCKED)
79928-#define IS_MNT_LOCKED_AND_LAZY(m) \
79929- (((m)->mnt.mnt_flags & (MNT_LOCKED|MNT_SYNC_UMOUNT)) == MNT_LOCKED)
79930
79931 #define CL_EXPIRE 0x01
79932 #define CL_SLAVE 0x02
79933diff --git a/fs/posix_acl.c b/fs/posix_acl.c
79934index 84bb65b8..4270e47 100644
79935--- a/fs/posix_acl.c
79936+++ b/fs/posix_acl.c
79937@@ -20,6 +20,7 @@
79938 #include <linux/xattr.h>
79939 #include <linux/export.h>
79940 #include <linux/user_namespace.h>
79941+#include <linux/grsecurity.h>
79942
79943 struct posix_acl **acl_by_type(struct inode *inode, int type)
79944 {
79945@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
79946 }
79947 }
79948 if (mode_p)
79949- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79950+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79951 return not_equiv;
79952 }
79953 EXPORT_SYMBOL(posix_acl_equiv_mode);
79954@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
79955 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
79956 }
79957
79958- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79959+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79960 return not_equiv;
79961 }
79962
79963@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
79964 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
79965 int err = -ENOMEM;
79966 if (clone) {
79967+ *mode_p &= ~gr_acl_umask();
79968+
79969 err = posix_acl_create_masq(clone, mode_p);
79970 if (err < 0) {
79971 posix_acl_release(clone);
79972@@ -663,11 +666,12 @@ struct posix_acl *
79973 posix_acl_from_xattr(struct user_namespace *user_ns,
79974 const void *value, size_t size)
79975 {
79976- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
79977- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
79978+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
79979+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
79980 int count;
79981 struct posix_acl *acl;
79982 struct posix_acl_entry *acl_e;
79983+ umode_t umask = gr_acl_umask();
79984
79985 if (!value)
79986 return NULL;
79987@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79988
79989 switch(acl_e->e_tag) {
79990 case ACL_USER_OBJ:
79991+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79992+ break;
79993 case ACL_GROUP_OBJ:
79994 case ACL_MASK:
79995+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79996+ break;
79997 case ACL_OTHER:
79998+ acl_e->e_perm &= ~(umask & S_IRWXO);
79999 break;
80000
80001 case ACL_USER:
80002+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
80003 acl_e->e_uid =
80004 make_kuid(user_ns,
80005 le32_to_cpu(entry->e_id));
80006@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
80007 goto fail;
80008 break;
80009 case ACL_GROUP:
80010+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
80011 acl_e->e_gid =
80012 make_kgid(user_ns,
80013 le32_to_cpu(entry->e_id));
80014diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
80015index 2183fcf..3c32a98 100644
80016--- a/fs/proc/Kconfig
80017+++ b/fs/proc/Kconfig
80018@@ -30,7 +30,7 @@ config PROC_FS
80019
80020 config PROC_KCORE
80021 bool "/proc/kcore support" if !ARM
80022- depends on PROC_FS && MMU
80023+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
80024 help
80025 Provides a virtual ELF core file of the live kernel. This can
80026 be read with gdb and other ELF tools. No modifications can be
80027@@ -38,8 +38,8 @@ config PROC_KCORE
80028
80029 config PROC_VMCORE
80030 bool "/proc/vmcore support"
80031- depends on PROC_FS && CRASH_DUMP
80032- default y
80033+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
80034+ default n
80035 help
80036 Exports the dump image of crashed kernel in ELF format.
80037
80038@@ -63,8 +63,8 @@ config PROC_SYSCTL
80039 limited in memory.
80040
80041 config PROC_PAGE_MONITOR
80042- default y
80043- depends on PROC_FS && MMU
80044+ default n
80045+ depends on PROC_FS && MMU && !GRKERNSEC
80046 bool "Enable /proc page monitoring" if EXPERT
80047 help
80048 Various /proc files exist to monitor process memory utilization:
80049diff --git a/fs/proc/array.c b/fs/proc/array.c
80050index fd02a9e..7bc9dff 100644
80051--- a/fs/proc/array.c
80052+++ b/fs/proc/array.c
80053@@ -60,6 +60,7 @@
80054 #include <linux/tty.h>
80055 #include <linux/string.h>
80056 #include <linux/mman.h>
80057+#include <linux/grsecurity.h>
80058 #include <linux/proc_fs.h>
80059 #include <linux/ioport.h>
80060 #include <linux/uaccess.h>
80061@@ -340,6 +341,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
80062 cpumask_pr_args(&task->cpus_allowed));
80063 }
80064
80065+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
80066+static inline void task_pax(struct seq_file *m, struct task_struct *p)
80067+{
80068+ if (p->mm)
80069+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
80070+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
80071+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
80072+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
80073+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
80074+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
80075+ else
80076+ seq_printf(m, "PaX:\t-----\n");
80077+}
80078+#endif
80079+
80080 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
80081 struct pid *pid, struct task_struct *task)
80082 {
80083@@ -358,9 +374,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
80084 task_cpus_allowed(m, task);
80085 cpuset_task_status_allowed(m, task);
80086 task_context_switch_counts(m, task);
80087+
80088+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
80089+ task_pax(m, task);
80090+#endif
80091+
80092+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
80093+ task_grsec_rbac(m, task);
80094+#endif
80095+
80096 return 0;
80097 }
80098
80099+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80100+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
80101+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
80102+ _mm->pax_flags & MF_PAX_SEGMEXEC))
80103+#endif
80104+
80105 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80106 struct pid *pid, struct task_struct *task, int whole)
80107 {
80108@@ -382,6 +413,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80109 char tcomm[sizeof(task->comm)];
80110 unsigned long flags;
80111
80112+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80113+ if (current->exec_id != m->exec_id) {
80114+ gr_log_badprocpid("stat");
80115+ return 0;
80116+ }
80117+#endif
80118+
80119 state = *get_task_state(task);
80120 vsize = eip = esp = 0;
80121 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
80122@@ -452,6 +490,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80123 gtime = task_gtime(task);
80124 }
80125
80126+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80127+ if (PAX_RAND_FLAGS(mm)) {
80128+ eip = 0;
80129+ esp = 0;
80130+ wchan = 0;
80131+ }
80132+#endif
80133+#ifdef CONFIG_GRKERNSEC_HIDESYM
80134+ wchan = 0;
80135+ eip =0;
80136+ esp =0;
80137+#endif
80138+
80139 /* scale priority and nice values from timeslices to -20..20 */
80140 /* to make it look like a "normal" Unix priority/nice value */
80141 priority = task_prio(task);
80142@@ -483,9 +534,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80143 seq_put_decimal_ull(m, ' ', vsize);
80144 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
80145 seq_put_decimal_ull(m, ' ', rsslim);
80146+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80147+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
80148+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
80149+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
80150+#else
80151 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
80152 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
80153 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
80154+#endif
80155 seq_put_decimal_ull(m, ' ', esp);
80156 seq_put_decimal_ull(m, ' ', eip);
80157 /* The signal information here is obsolete.
80158@@ -507,7 +564,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80159 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
80160 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
80161
80162- if (mm && permitted) {
80163+ if (mm && permitted
80164+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80165+ && !PAX_RAND_FLAGS(mm)
80166+#endif
80167+ ) {
80168 seq_put_decimal_ull(m, ' ', mm->start_data);
80169 seq_put_decimal_ull(m, ' ', mm->end_data);
80170 seq_put_decimal_ull(m, ' ', mm->start_brk);
80171@@ -545,8 +606,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
80172 struct pid *pid, struct task_struct *task)
80173 {
80174 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
80175- struct mm_struct *mm = get_task_mm(task);
80176+ struct mm_struct *mm;
80177
80178+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80179+ if (current->exec_id != m->exec_id) {
80180+ gr_log_badprocpid("statm");
80181+ return 0;
80182+ }
80183+#endif
80184+ mm = get_task_mm(task);
80185 if (mm) {
80186 size = task_statm(mm, &shared, &text, &data, &resident);
80187 mmput(mm);
80188@@ -569,6 +637,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
80189 return 0;
80190 }
80191
80192+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80193+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
80194+{
80195+ unsigned long flags;
80196+ u32 curr_ip = 0;
80197+
80198+ if (lock_task_sighand(task, &flags)) {
80199+ curr_ip = task->signal->curr_ip;
80200+ unlock_task_sighand(task, &flags);
80201+ }
80202+ return seq_printf(m, "%pI4\n", &curr_ip);
80203+}
80204+#endif
80205+
80206 #ifdef CONFIG_CHECKPOINT_RESTORE
80207 static struct pid *
80208 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
80209diff --git a/fs/proc/base.c b/fs/proc/base.c
80210index 093ca14..322f097 100644
80211--- a/fs/proc/base.c
80212+++ b/fs/proc/base.c
80213@@ -113,6 +113,14 @@ struct pid_entry {
80214 union proc_op op;
80215 };
80216
80217+struct getdents_callback {
80218+ struct linux_dirent __user * current_dir;
80219+ struct linux_dirent __user * previous;
80220+ struct file * file;
80221+ int count;
80222+ int error;
80223+};
80224+
80225 #define NOD(NAME, MODE, IOP, FOP, OP) { \
80226 .name = (NAME), \
80227 .len = sizeof(NAME) - 1, \
80228@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
80229 return 0;
80230 }
80231
80232+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80233+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
80234+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
80235+ _mm->pax_flags & MF_PAX_SEGMEXEC))
80236+#endif
80237+
80238 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
80239 struct pid *pid, struct task_struct *task)
80240 {
80241 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
80242 if (mm && !IS_ERR(mm)) {
80243 unsigned int nwords = 0;
80244+
80245+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80246+ /* allow if we're currently ptracing this task */
80247+ if (PAX_RAND_FLAGS(mm) &&
80248+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
80249+ mmput(mm);
80250+ return 0;
80251+ }
80252+#endif
80253+
80254 do {
80255 nwords += 2;
80256 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
80257@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
80258 }
80259
80260
80261-#ifdef CONFIG_KALLSYMS
80262+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80263 /*
80264 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
80265 * Returns the resolved symbol. If that fails, simply return the address.
80266@@ -267,7 +291,7 @@ static void unlock_trace(struct task_struct *task)
80267 mutex_unlock(&task->signal->cred_guard_mutex);
80268 }
80269
80270-#ifdef CONFIG_STACKTRACE
80271+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80272
80273 #define MAX_STACK_TRACE_DEPTH 64
80274
80275@@ -462,7 +486,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
80276 return 0;
80277 }
80278
80279-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80280+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80281 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80282 struct pid *pid, struct task_struct *task)
80283 {
80284@@ -495,7 +519,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80285 /************************************************************************/
80286
80287 /* permission checks */
80288-static int proc_fd_access_allowed(struct inode *inode)
80289+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
80290 {
80291 struct task_struct *task;
80292 int allowed = 0;
80293@@ -505,7 +529,10 @@ static int proc_fd_access_allowed(struct inode *inode)
80294 */
80295 task = get_proc_task(inode);
80296 if (task) {
80297- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80298+ if (log)
80299+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80300+ else
80301+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
80302 put_task_struct(task);
80303 }
80304 return allowed;
80305@@ -536,10 +563,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
80306 struct task_struct *task,
80307 int hide_pid_min)
80308 {
80309+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80310+ return false;
80311+
80312+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80313+ rcu_read_lock();
80314+ {
80315+ const struct cred *tmpcred = current_cred();
80316+ const struct cred *cred = __task_cred(task);
80317+
80318+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
80319+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80320+ || in_group_p(grsec_proc_gid)
80321+#endif
80322+ ) {
80323+ rcu_read_unlock();
80324+ return true;
80325+ }
80326+ }
80327+ rcu_read_unlock();
80328+
80329+ if (!pid->hide_pid)
80330+ return false;
80331+#endif
80332+
80333 if (pid->hide_pid < hide_pid_min)
80334 return true;
80335 if (in_group_p(pid->pid_gid))
80336 return true;
80337+
80338 return ptrace_may_access(task, PTRACE_MODE_READ);
80339 }
80340
80341@@ -557,7 +609,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
80342 put_task_struct(task);
80343
80344 if (!has_perms) {
80345+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80346+ {
80347+#else
80348 if (pid->hide_pid == 2) {
80349+#endif
80350 /*
80351 * Let's make getdents(), stat(), and open()
80352 * consistent with each other. If a process
80353@@ -618,6 +674,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
80354
80355 if (task) {
80356 mm = mm_access(task, mode);
80357+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
80358+ mmput(mm);
80359+ mm = ERR_PTR(-EPERM);
80360+ }
80361 put_task_struct(task);
80362
80363 if (!IS_ERR_OR_NULL(mm)) {
80364@@ -639,6 +699,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
80365 return PTR_ERR(mm);
80366
80367 file->private_data = mm;
80368+
80369+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80370+ file->f_version = current->exec_id;
80371+#endif
80372+
80373 return 0;
80374 }
80375
80376@@ -660,6 +725,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80377 ssize_t copied;
80378 char *page;
80379
80380+#ifdef CONFIG_GRKERNSEC
80381+ if (write)
80382+ return -EPERM;
80383+#endif
80384+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80385+ if (file->f_version != current->exec_id) {
80386+ gr_log_badprocpid("mem");
80387+ return 0;
80388+ }
80389+#endif
80390+
80391 if (!mm)
80392 return 0;
80393
80394@@ -672,7 +748,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80395 goto free;
80396
80397 while (count > 0) {
80398- int this_len = min_t(int, count, PAGE_SIZE);
80399+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
80400
80401 if (write && copy_from_user(page, buf, this_len)) {
80402 copied = -EFAULT;
80403@@ -764,6 +840,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80404 if (!mm)
80405 return 0;
80406
80407+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80408+ if (file->f_version != current->exec_id) {
80409+ gr_log_badprocpid("environ");
80410+ return 0;
80411+ }
80412+#endif
80413+
80414 page = (char *)__get_free_page(GFP_TEMPORARY);
80415 if (!page)
80416 return -ENOMEM;
80417@@ -773,7 +856,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80418 goto free;
80419 while (count > 0) {
80420 size_t this_len, max_len;
80421- int retval;
80422+ ssize_t retval;
80423
80424 if (src >= (mm->env_end - mm->env_start))
80425 break;
80426@@ -1387,7 +1470,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
80427 int error = -EACCES;
80428
80429 /* Are we allowed to snoop on the tasks file descriptors? */
80430- if (!proc_fd_access_allowed(inode))
80431+ if (!proc_fd_access_allowed(inode, 0))
80432 goto out;
80433
80434 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80435@@ -1431,8 +1514,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
80436 struct path path;
80437
80438 /* Are we allowed to snoop on the tasks file descriptors? */
80439- if (!proc_fd_access_allowed(inode))
80440- goto out;
80441+ /* logging this is needed for learning on chromium to work properly,
80442+ but we don't want to flood the logs from 'ps' which does a readlink
80443+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
80444+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
80445+ */
80446+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
80447+ if (!proc_fd_access_allowed(inode,0))
80448+ goto out;
80449+ } else {
80450+ if (!proc_fd_access_allowed(inode,1))
80451+ goto out;
80452+ }
80453
80454 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80455 if (error)
80456@@ -1482,7 +1575,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
80457 rcu_read_lock();
80458 cred = __task_cred(task);
80459 inode->i_uid = cred->euid;
80460+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80461+ inode->i_gid = grsec_proc_gid;
80462+#else
80463 inode->i_gid = cred->egid;
80464+#endif
80465 rcu_read_unlock();
80466 }
80467 security_task_to_inode(task, inode);
80468@@ -1518,10 +1615,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
80469 return -ENOENT;
80470 }
80471 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80472+#ifdef CONFIG_GRKERNSEC_PROC_USER
80473+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80474+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80475+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80476+#endif
80477 task_dumpable(task)) {
80478 cred = __task_cred(task);
80479 stat->uid = cred->euid;
80480+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80481+ stat->gid = grsec_proc_gid;
80482+#else
80483 stat->gid = cred->egid;
80484+#endif
80485 }
80486 }
80487 rcu_read_unlock();
80488@@ -1559,11 +1665,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
80489
80490 if (task) {
80491 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80492+#ifdef CONFIG_GRKERNSEC_PROC_USER
80493+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80494+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80495+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80496+#endif
80497 task_dumpable(task)) {
80498 rcu_read_lock();
80499 cred = __task_cred(task);
80500 inode->i_uid = cred->euid;
80501+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80502+ inode->i_gid = grsec_proc_gid;
80503+#else
80504 inode->i_gid = cred->egid;
80505+#endif
80506 rcu_read_unlock();
80507 } else {
80508 inode->i_uid = GLOBAL_ROOT_UID;
80509@@ -2095,6 +2210,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
80510 if (!task)
80511 goto out_no_task;
80512
80513+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80514+ goto out;
80515+
80516 /*
80517 * Yes, it does not scale. And it should not. Don't add
80518 * new entries into /proc/<tgid>/ without very good reasons.
80519@@ -2125,6 +2243,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
80520 if (!task)
80521 return -ENOENT;
80522
80523+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80524+ goto out;
80525+
80526 if (!dir_emit_dots(file, ctx))
80527 goto out;
80528
80529@@ -2569,7 +2690,7 @@ static const struct pid_entry tgid_base_stuff[] = {
80530 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
80531 #endif
80532 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80533-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80534+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80535 ONE("syscall", S_IRUSR, proc_pid_syscall),
80536 #endif
80537 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80538@@ -2594,10 +2715,10 @@ static const struct pid_entry tgid_base_stuff[] = {
80539 #ifdef CONFIG_SECURITY
80540 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80541 #endif
80542-#ifdef CONFIG_KALLSYMS
80543+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80544 ONE("wchan", S_IRUGO, proc_pid_wchan),
80545 #endif
80546-#ifdef CONFIG_STACKTRACE
80547+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80548 ONE("stack", S_IRUSR, proc_pid_stack),
80549 #endif
80550 #ifdef CONFIG_SCHEDSTATS
80551@@ -2631,6 +2752,9 @@ static const struct pid_entry tgid_base_stuff[] = {
80552 #ifdef CONFIG_HARDWALL
80553 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
80554 #endif
80555+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80556+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
80557+#endif
80558 #ifdef CONFIG_USER_NS
80559 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
80560 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
80561@@ -2763,7 +2887,14 @@ static int proc_pid_instantiate(struct inode *dir,
80562 if (!inode)
80563 goto out;
80564
80565+#ifdef CONFIG_GRKERNSEC_PROC_USER
80566+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
80567+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80568+ inode->i_gid = grsec_proc_gid;
80569+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
80570+#else
80571 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
80572+#endif
80573 inode->i_op = &proc_tgid_base_inode_operations;
80574 inode->i_fop = &proc_tgid_base_operations;
80575 inode->i_flags|=S_IMMUTABLE;
80576@@ -2801,7 +2932,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
80577 if (!task)
80578 goto out;
80579
80580+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80581+ goto out_put_task;
80582+
80583 result = proc_pid_instantiate(dir, dentry, task, NULL);
80584+out_put_task:
80585 put_task_struct(task);
80586 out:
80587 return ERR_PTR(result);
80588@@ -2915,7 +3050,7 @@ static const struct pid_entry tid_base_stuff[] = {
80589 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
80590 #endif
80591 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80592-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80593+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80594 ONE("syscall", S_IRUSR, proc_pid_syscall),
80595 #endif
80596 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80597@@ -2942,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
80598 #ifdef CONFIG_SECURITY
80599 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80600 #endif
80601-#ifdef CONFIG_KALLSYMS
80602+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80603 ONE("wchan", S_IRUGO, proc_pid_wchan),
80604 #endif
80605-#ifdef CONFIG_STACKTRACE
80606+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80607 ONE("stack", S_IRUSR, proc_pid_stack),
80608 #endif
80609 #ifdef CONFIG_SCHEDSTATS
80610diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
80611index cbd82df..c0407d2 100644
80612--- a/fs/proc/cmdline.c
80613+++ b/fs/proc/cmdline.c
80614@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
80615
80616 static int __init proc_cmdline_init(void)
80617 {
80618+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80619+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
80620+#else
80621 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
80622+#endif
80623 return 0;
80624 }
80625 fs_initcall(proc_cmdline_init);
80626diff --git a/fs/proc/devices.c b/fs/proc/devices.c
80627index 50493ed..248166b 100644
80628--- a/fs/proc/devices.c
80629+++ b/fs/proc/devices.c
80630@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
80631
80632 static int __init proc_devices_init(void)
80633 {
80634+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80635+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
80636+#else
80637 proc_create("devices", 0, NULL, &proc_devinfo_operations);
80638+#endif
80639 return 0;
80640 }
80641 fs_initcall(proc_devices_init);
80642diff --git a/fs/proc/fd.c b/fs/proc/fd.c
80643index 6e5fcd0..06ea074 100644
80644--- a/fs/proc/fd.c
80645+++ b/fs/proc/fd.c
80646@@ -27,7 +27,8 @@ static int seq_show(struct seq_file *m, void *v)
80647 if (!task)
80648 return -ENOENT;
80649
80650- files = get_files_struct(task);
80651+ if (!gr_acl_handle_procpidmem(task))
80652+ files = get_files_struct(task);
80653 put_task_struct(task);
80654
80655 if (files) {
80656@@ -291,11 +292,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
80657 */
80658 int proc_fd_permission(struct inode *inode, int mask)
80659 {
80660+ struct task_struct *task;
80661 int rv = generic_permission(inode, mask);
80662- if (rv == 0)
80663- return 0;
80664+
80665 if (task_tgid(current) == proc_pid(inode))
80666 rv = 0;
80667+
80668+ task = get_proc_task(inode);
80669+ if (task == NULL)
80670+ return rv;
80671+
80672+ if (gr_acl_handle_procpidmem(task))
80673+ rv = -EACCES;
80674+
80675+ put_task_struct(task);
80676+
80677 return rv;
80678 }
80679
80680diff --git a/fs/proc/generic.c b/fs/proc/generic.c
80681index e5dee5c..dafe21b 100644
80682--- a/fs/proc/generic.c
80683+++ b/fs/proc/generic.c
80684@@ -22,6 +22,7 @@
80685 #include <linux/bitops.h>
80686 #include <linux/spinlock.h>
80687 #include <linux/completion.h>
80688+#include <linux/grsecurity.h>
80689 #include <asm/uaccess.h>
80690
80691 #include "internal.h"
80692@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
80693 return proc_lookup_de(PDE(dir), dir, dentry);
80694 }
80695
80696+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
80697+ unsigned int flags)
80698+{
80699+ if (gr_proc_is_restricted())
80700+ return ERR_PTR(-EACCES);
80701+
80702+ return proc_lookup_de(PDE(dir), dir, dentry);
80703+}
80704+
80705 /*
80706 * This returns non-zero if at EOF, so that the /proc
80707 * root directory can use this and check if it should
80708@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
80709 return proc_readdir_de(PDE(inode), file, ctx);
80710 }
80711
80712+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
80713+{
80714+ struct inode *inode = file_inode(file);
80715+
80716+ if (gr_proc_is_restricted())
80717+ return -EACCES;
80718+
80719+ return proc_readdir_de(PDE(inode), file, ctx);
80720+}
80721+
80722 /*
80723 * These are the generic /proc directory operations. They
80724 * use the in-memory "struct proc_dir_entry" tree to parse
80725@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
80726 .iterate = proc_readdir,
80727 };
80728
80729+static const struct file_operations proc_dir_restricted_operations = {
80730+ .llseek = generic_file_llseek,
80731+ .read = generic_read_dir,
80732+ .iterate = proc_readdir_restrict,
80733+};
80734+
80735 /*
80736 * proc directories can do almost nothing..
80737 */
80738@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
80739 .setattr = proc_notify_change,
80740 };
80741
80742+static const struct inode_operations proc_dir_restricted_inode_operations = {
80743+ .lookup = proc_lookup_restrict,
80744+ .getattr = proc_getattr,
80745+ .setattr = proc_notify_change,
80746+};
80747+
80748 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
80749 {
80750 int ret;
80751@@ -445,6 +477,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
80752 }
80753 EXPORT_SYMBOL_GPL(proc_mkdir_data);
80754
80755+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
80756+ struct proc_dir_entry *parent, void *data)
80757+{
80758+ struct proc_dir_entry *ent;
80759+
80760+ if (mode == 0)
80761+ mode = S_IRUGO | S_IXUGO;
80762+
80763+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
80764+ if (ent) {
80765+ ent->data = data;
80766+ ent->restricted = 1;
80767+ ent->proc_fops = &proc_dir_restricted_operations;
80768+ ent->proc_iops = &proc_dir_restricted_inode_operations;
80769+ parent->nlink++;
80770+ if (proc_register(parent, ent) < 0) {
80771+ kfree(ent);
80772+ parent->nlink--;
80773+ ent = NULL;
80774+ }
80775+ }
80776+ return ent;
80777+}
80778+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
80779+
80780 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
80781 struct proc_dir_entry *parent)
80782 {
80783@@ -459,6 +516,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
80784 }
80785 EXPORT_SYMBOL(proc_mkdir);
80786
80787+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
80788+ struct proc_dir_entry *parent)
80789+{
80790+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
80791+}
80792+EXPORT_SYMBOL(proc_mkdir_restrict);
80793+
80794 struct proc_dir_entry *proc_create_mount_point(const char *name)
80795 {
80796 umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
80797diff --git a/fs/proc/inode.c b/fs/proc/inode.c
80798index e3eb552..bcb0f25 100644
80799--- a/fs/proc/inode.c
80800+++ b/fs/proc/inode.c
80801@@ -24,11 +24,17 @@
80802 #include <linux/mount.h>
80803 #include <linux/magic.h>
80804 #include <linux/namei.h>
80805+#include <linux/grsecurity.h>
80806
80807 #include <asm/uaccess.h>
80808
80809 #include "internal.h"
80810
80811+#ifdef CONFIG_PROC_SYSCTL
80812+extern const struct inode_operations proc_sys_inode_operations;
80813+extern const struct inode_operations proc_sys_dir_operations;
80814+#endif
80815+
80816 static void proc_evict_inode(struct inode *inode)
80817 {
80818 struct proc_dir_entry *de;
80819@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
80820 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
80821 sysctl_head_put(head);
80822 }
80823+
80824+#ifdef CONFIG_PROC_SYSCTL
80825+ if (inode->i_op == &proc_sys_inode_operations ||
80826+ inode->i_op == &proc_sys_dir_operations)
80827+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
80828+#endif
80829+
80830 }
80831
80832 static struct kmem_cache * proc_inode_cachep;
80833@@ -430,7 +443,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
80834 if (de->mode) {
80835 inode->i_mode = de->mode;
80836 inode->i_uid = de->uid;
80837+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80838+ inode->i_gid = grsec_proc_gid;
80839+#else
80840 inode->i_gid = de->gid;
80841+#endif
80842 }
80843 if (de->size)
80844 inode->i_size = de->size;
80845diff --git a/fs/proc/internal.h b/fs/proc/internal.h
80846index aa27810..9f2d3b2 100644
80847--- a/fs/proc/internal.h
80848+++ b/fs/proc/internal.h
80849@@ -47,9 +47,10 @@ struct proc_dir_entry {
80850 struct completion *pde_unload_completion;
80851 struct list_head pde_openers; /* who did ->open, but not ->release */
80852 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
80853+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
80854 u8 namelen;
80855 char name[];
80856-};
80857+} __randomize_layout;
80858
80859 union proc_op {
80860 int (*proc_get_link)(struct dentry *, struct path *);
80861@@ -67,7 +68,7 @@ struct proc_inode {
80862 struct ctl_table *sysctl_entry;
80863 const struct proc_ns_operations *ns_ops;
80864 struct inode vfs_inode;
80865-};
80866+} __randomize_layout;
80867
80868 /*
80869 * General functions
80870@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
80871 struct pid *, struct task_struct *);
80872 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
80873 struct pid *, struct task_struct *);
80874+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80875+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
80876+ struct pid *, struct task_struct *);
80877+#endif
80878
80879 /*
80880 * base.c
80881@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
80882 * generic.c
80883 */
80884 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
80885+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
80886 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
80887 struct dentry *);
80888 extern int proc_readdir(struct file *, struct dir_context *);
80889+extern int proc_readdir_restrict(struct file *, struct dir_context *);
80890 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
80891
80892 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
80893diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
80894index a352d57..cb94a5c 100644
80895--- a/fs/proc/interrupts.c
80896+++ b/fs/proc/interrupts.c
80897@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
80898
80899 static int __init proc_interrupts_init(void)
80900 {
80901+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80902+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
80903+#else
80904 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
80905+#endif
80906 return 0;
80907 }
80908 fs_initcall(proc_interrupts_init);
80909diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
80910index 91a4e64..14bf8fa 100644
80911--- a/fs/proc/kcore.c
80912+++ b/fs/proc/kcore.c
80913@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80914 * the addresses in the elf_phdr on our list.
80915 */
80916 start = kc_offset_to_vaddr(*fpos - elf_buflen);
80917- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
80918+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
80919+ if (tsz > buflen)
80920 tsz = buflen;
80921-
80922+
80923 while (buflen) {
80924 struct kcore_list *m;
80925
80926@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80927 } else {
80928 if (kern_addr_valid(start)) {
80929 unsigned long n;
80930+ char *elf_buf;
80931+ mm_segment_t oldfs;
80932
80933- n = copy_to_user(buffer, (char *)start, tsz);
80934- /*
80935- * We cannot distinguish between fault on source
80936- * and fault on destination. When this happens
80937- * we clear too and hope it will trigger the
80938- * EFAULT again.
80939- */
80940- if (n) {
80941- if (clear_user(buffer + tsz - n,
80942- n))
80943- return -EFAULT;
80944- }
80945+ elf_buf = kzalloc(tsz, GFP_KERNEL);
80946+ if (!elf_buf)
80947+ return -ENOMEM;
80948+ oldfs = get_fs();
80949+ set_fs(KERNEL_DS);
80950+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
80951+ set_fs(oldfs);
80952+ n = copy_to_user(buffer, elf_buf, tsz);
80953+ kfree(elf_buf);
80954+ if (n)
80955+ return -EFAULT;
80956 } else {
80957 if (clear_user(buffer, tsz))
80958 return -EFAULT;
80959@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80960
80961 static int open_kcore(struct inode *inode, struct file *filp)
80962 {
80963+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
80964+ return -EPERM;
80965+#endif
80966 if (!capable(CAP_SYS_RAWIO))
80967 return -EPERM;
80968 if (kcore_need_update)
80969@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
80970 return NOTIFY_OK;
80971 }
80972
80973-static struct notifier_block kcore_callback_nb __meminitdata = {
80974+static struct notifier_block kcore_callback_nb __meminitconst = {
80975 .notifier_call = kcore_callback,
80976 .priority = 0,
80977 };
80978diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
80979index d3ebf2e..6ad42d1 100644
80980--- a/fs/proc/meminfo.c
80981+++ b/fs/proc/meminfo.c
80982@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
80983 vmi.used >> 10,
80984 vmi.largest_chunk >> 10
80985 #ifdef CONFIG_MEMORY_FAILURE
80986- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80987+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80988 #endif
80989 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
80990 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
80991diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
80992index d4a3574..b421ce9 100644
80993--- a/fs/proc/nommu.c
80994+++ b/fs/proc/nommu.c
80995@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
80996
80997 if (file) {
80998 seq_pad(m, ' ');
80999- seq_path(m, &file->f_path, "");
81000+ seq_path(m, &file->f_path, "\n\\");
81001 }
81002
81003 seq_putc(m, '\n');
81004diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
81005index 350984a..0fb02a9 100644
81006--- a/fs/proc/proc_net.c
81007+++ b/fs/proc/proc_net.c
81008@@ -23,9 +23,27 @@
81009 #include <linux/nsproxy.h>
81010 #include <net/net_namespace.h>
81011 #include <linux/seq_file.h>
81012+#include <linux/grsecurity.h>
81013
81014 #include "internal.h"
81015
81016+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
81017+static struct seq_operations *ipv6_seq_ops_addr;
81018+
81019+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
81020+{
81021+ ipv6_seq_ops_addr = addr;
81022+}
81023+
81024+void unregister_ipv6_seq_ops_addr(void)
81025+{
81026+ ipv6_seq_ops_addr = NULL;
81027+}
81028+
81029+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
81030+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
81031+#endif
81032+
81033 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
81034 {
81035 return pde->parent->data;
81036@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
81037 return maybe_get_net(PDE_NET(PDE(inode)));
81038 }
81039
81040+extern const struct seq_operations dev_seq_ops;
81041+
81042 int seq_open_net(struct inode *ino, struct file *f,
81043 const struct seq_operations *ops, int size)
81044 {
81045@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
81046
81047 BUG_ON(size < sizeof(*p));
81048
81049+ /* only permit access to /proc/net/dev */
81050+ if (
81051+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
81052+ ops != ipv6_seq_ops_addr &&
81053+#endif
81054+ ops != &dev_seq_ops && gr_proc_is_restricted())
81055+ return -EACCES;
81056+
81057 net = get_proc_net(ino);
81058 if (net == NULL)
81059 return -ENXIO;
81060@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
81061 int err;
81062 struct net *net;
81063
81064+ if (gr_proc_is_restricted())
81065+ return -EACCES;
81066+
81067 err = -ENXIO;
81068 net = get_proc_net(inode);
81069 if (net == NULL)
81070diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
81071index fdda62e..cd7c75f 100644
81072--- a/fs/proc/proc_sysctl.c
81073+++ b/fs/proc/proc_sysctl.c
81074@@ -11,13 +11,21 @@
81075 #include <linux/namei.h>
81076 #include <linux/mm.h>
81077 #include <linux/module.h>
81078+#include <linux/nsproxy.h>
81079+#ifdef CONFIG_GRKERNSEC
81080+#include <net/net_namespace.h>
81081+#endif
81082 #include "internal.h"
81083
81084+extern int gr_handle_chroot_sysctl(const int op);
81085+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
81086+ const int op);
81087+
81088 static const struct dentry_operations proc_sys_dentry_operations;
81089 static const struct file_operations proc_sys_file_operations;
81090-static const struct inode_operations proc_sys_inode_operations;
81091+const struct inode_operations proc_sys_inode_operations;
81092 static const struct file_operations proc_sys_dir_file_operations;
81093-static const struct inode_operations proc_sys_dir_operations;
81094+const struct inode_operations proc_sys_dir_operations;
81095
81096 /* Support for permanently empty directories */
81097
81098@@ -32,13 +40,17 @@ static bool is_empty_dir(struct ctl_table_header *head)
81099
81100 static void set_empty_dir(struct ctl_dir *dir)
81101 {
81102- dir->header.ctl_table[0].child = sysctl_mount_point;
81103+ pax_open_kernel();
81104+ *(const void **)&dir->header.ctl_table[0].child = sysctl_mount_point;
81105+ pax_close_kernel();
81106 }
81107
81108 static void clear_empty_dir(struct ctl_dir *dir)
81109
81110 {
81111- dir->header.ctl_table[0].child = NULL;
81112+ pax_open_kernel();
81113+ *(void **)&dir->header.ctl_table[0].child = NULL;
81114+ pax_close_kernel();
81115 }
81116
81117 void proc_sys_poll_notify(struct ctl_table_poll *poll)
81118@@ -504,6 +516,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
81119
81120 err = NULL;
81121 d_set_d_op(dentry, &proc_sys_dentry_operations);
81122+
81123+ gr_handle_proc_create(dentry, inode);
81124+
81125 d_add(dentry, inode);
81126
81127 out:
81128@@ -519,6 +534,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81129 struct inode *inode = file_inode(filp);
81130 struct ctl_table_header *head = grab_header(inode);
81131 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
81132+ int op = write ? MAY_WRITE : MAY_READ;
81133 ssize_t error;
81134 size_t res;
81135
81136@@ -530,7 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81137 * and won't be until we finish.
81138 */
81139 error = -EPERM;
81140- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
81141+ if (sysctl_perm(head, table, op))
81142 goto out;
81143
81144 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
81145@@ -538,6 +554,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81146 if (!table->proc_handler)
81147 goto out;
81148
81149+#ifdef CONFIG_GRKERNSEC
81150+ error = -EPERM;
81151+ if (gr_handle_chroot_sysctl(op))
81152+ goto out;
81153+ dget(filp->f_path.dentry);
81154+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
81155+ dput(filp->f_path.dentry);
81156+ goto out;
81157+ }
81158+ dput(filp->f_path.dentry);
81159+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
81160+ goto out;
81161+ if (write) {
81162+ if (current->nsproxy->net_ns != table->extra2) {
81163+ if (!capable(CAP_SYS_ADMIN))
81164+ goto out;
81165+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
81166+ goto out;
81167+ }
81168+#endif
81169+
81170 /* careful: calling conventions are nasty here */
81171 res = count;
81172 error = table->proc_handler(table, write, buf, &res, ppos);
81173@@ -635,6 +672,9 @@ static bool proc_sys_fill_cache(struct file *file,
81174 return false;
81175 } else {
81176 d_set_d_op(child, &proc_sys_dentry_operations);
81177+
81178+ gr_handle_proc_create(child, inode);
81179+
81180 d_add(child, inode);
81181 }
81182 } else {
81183@@ -678,6 +718,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
81184 if ((*pos)++ < ctx->pos)
81185 return true;
81186
81187+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
81188+ return 0;
81189+
81190 if (unlikely(S_ISLNK(table->mode)))
81191 res = proc_sys_link_fill_cache(file, ctx, head, table);
81192 else
81193@@ -771,6 +814,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
81194 if (IS_ERR(head))
81195 return PTR_ERR(head);
81196
81197+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
81198+ return -ENOENT;
81199+
81200 generic_fillattr(inode, stat);
81201 if (table)
81202 stat->mode = (stat->mode & S_IFMT) | table->mode;
81203@@ -793,13 +839,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
81204 .llseek = generic_file_llseek,
81205 };
81206
81207-static const struct inode_operations proc_sys_inode_operations = {
81208+const struct inode_operations proc_sys_inode_operations = {
81209 .permission = proc_sys_permission,
81210 .setattr = proc_sys_setattr,
81211 .getattr = proc_sys_getattr,
81212 };
81213
81214-static const struct inode_operations proc_sys_dir_operations = {
81215+const struct inode_operations proc_sys_dir_operations = {
81216 .lookup = proc_sys_lookup,
81217 .permission = proc_sys_permission,
81218 .setattr = proc_sys_setattr,
81219@@ -876,7 +922,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
81220 static struct ctl_dir *new_dir(struct ctl_table_set *set,
81221 const char *name, int namelen)
81222 {
81223- struct ctl_table *table;
81224+ ctl_table_no_const *table;
81225 struct ctl_dir *new;
81226 struct ctl_node *node;
81227 char *new_name;
81228@@ -888,7 +934,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
81229 return NULL;
81230
81231 node = (struct ctl_node *)(new + 1);
81232- table = (struct ctl_table *)(node + 1);
81233+ table = (ctl_table_no_const *)(node + 1);
81234 new_name = (char *)(table + 2);
81235 memcpy(new_name, name, namelen);
81236 new_name[namelen] = '\0';
81237@@ -1057,7 +1103,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
81238 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
81239 struct ctl_table_root *link_root)
81240 {
81241- struct ctl_table *link_table, *entry, *link;
81242+ ctl_table_no_const *link_table, *link;
81243+ struct ctl_table *entry;
81244 struct ctl_table_header *links;
81245 struct ctl_node *node;
81246 char *link_name;
81247@@ -1080,7 +1127,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
81248 return NULL;
81249
81250 node = (struct ctl_node *)(links + 1);
81251- link_table = (struct ctl_table *)(node + nr_entries);
81252+ link_table = (ctl_table_no_const *)(node + nr_entries);
81253 link_name = (char *)&link_table[nr_entries + 1];
81254
81255 for (link = link_table, entry = table; entry->procname; link++, entry++) {
81256@@ -1328,8 +1375,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81257 struct ctl_table_header ***subheader, struct ctl_table_set *set,
81258 struct ctl_table *table)
81259 {
81260- struct ctl_table *ctl_table_arg = NULL;
81261- struct ctl_table *entry, *files;
81262+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
81263+ struct ctl_table *entry;
81264 int nr_files = 0;
81265 int nr_dirs = 0;
81266 int err = -ENOMEM;
81267@@ -1341,10 +1388,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81268 nr_files++;
81269 }
81270
81271- files = table;
81272 /* If there are mixed files and directories we need a new table */
81273 if (nr_dirs && nr_files) {
81274- struct ctl_table *new;
81275+ ctl_table_no_const *new;
81276 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
81277 GFP_KERNEL);
81278 if (!files)
81279@@ -1362,7 +1408,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81280 /* Register everything except a directory full of subdirectories */
81281 if (nr_files || !nr_dirs) {
81282 struct ctl_table_header *header;
81283- header = __register_sysctl_table(set, path, files);
81284+ header = __register_sysctl_table(set, path, files ? files : table);
81285 if (!header) {
81286 kfree(ctl_table_arg);
81287 goto out;
81288diff --git a/fs/proc/root.c b/fs/proc/root.c
81289index 68feb0f..2c04780 100644
81290--- a/fs/proc/root.c
81291+++ b/fs/proc/root.c
81292@@ -185,7 +185,15 @@ void __init proc_root_init(void)
81293 proc_create_mount_point("openprom");
81294 #endif
81295 proc_tty_init();
81296+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81297+#ifdef CONFIG_GRKERNSEC_PROC_USER
81298+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
81299+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81300+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
81301+#endif
81302+#else
81303 proc_mkdir("bus", NULL);
81304+#endif
81305 proc_sys_init();
81306 }
81307
81308diff --git a/fs/proc/stat.c b/fs/proc/stat.c
81309index 510413eb..34d9a8c 100644
81310--- a/fs/proc/stat.c
81311+++ b/fs/proc/stat.c
81312@@ -11,6 +11,7 @@
81313 #include <linux/irqnr.h>
81314 #include <linux/cputime.h>
81315 #include <linux/tick.h>
81316+#include <linux/grsecurity.h>
81317
81318 #ifndef arch_irq_stat_cpu
81319 #define arch_irq_stat_cpu(cpu) 0
81320@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
81321 u64 sum_softirq = 0;
81322 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
81323 struct timespec boottime;
81324+ int unrestricted = 1;
81325+
81326+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81327+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81328+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
81329+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81330+ && !in_group_p(grsec_proc_gid)
81331+#endif
81332+ )
81333+ unrestricted = 0;
81334+#endif
81335+#endif
81336
81337 user = nice = system = idle = iowait =
81338 irq = softirq = steal = 0;
81339@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
81340 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81341 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81342 idle += get_idle_time(i);
81343- iowait += get_iowait_time(i);
81344- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81345- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81346- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81347- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81348- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81349- sum += kstat_cpu_irqs_sum(i);
81350- sum += arch_irq_stat_cpu(i);
81351+ if (unrestricted) {
81352+ iowait += get_iowait_time(i);
81353+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81354+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81355+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81356+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81357+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81358+ sum += kstat_cpu_irqs_sum(i);
81359+ sum += arch_irq_stat_cpu(i);
81360+ for (j = 0; j < NR_SOFTIRQS; j++) {
81361+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81362
81363- for (j = 0; j < NR_SOFTIRQS; j++) {
81364- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81365-
81366- per_softirq_sums[j] += softirq_stat;
81367- sum_softirq += softirq_stat;
81368+ per_softirq_sums[j] += softirq_stat;
81369+ sum_softirq += softirq_stat;
81370+ }
81371 }
81372 }
81373- sum += arch_irq_stat();
81374+ if (unrestricted)
81375+ sum += arch_irq_stat();
81376
81377 seq_puts(p, "cpu ");
81378 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81379@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
81380 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81381 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81382 idle = get_idle_time(i);
81383- iowait = get_iowait_time(i);
81384- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81385- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81386- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81387- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81388- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81389+ if (unrestricted) {
81390+ iowait = get_iowait_time(i);
81391+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81392+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81393+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81394+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81395+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81396+ }
81397 seq_printf(p, "cpu%d", i);
81398 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81399 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
81400@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
81401
81402 /* sum again ? it could be updated? */
81403 for_each_irq_nr(j)
81404- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
81405+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
81406
81407 seq_printf(p,
81408 "\nctxt %llu\n"
81409@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
81410 "processes %lu\n"
81411 "procs_running %lu\n"
81412 "procs_blocked %lu\n",
81413- nr_context_switches(),
81414+ unrestricted ? nr_context_switches() : 0ULL,
81415 (unsigned long)jif,
81416- total_forks,
81417- nr_running(),
81418- nr_iowait());
81419+ unrestricted ? total_forks : 0UL,
81420+ unrestricted ? nr_running() : 0UL,
81421+ unrestricted ? nr_iowait() : 0UL);
81422
81423 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
81424
81425diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
81426index 6dee68d..1b4add0 100644
81427--- a/fs/proc/task_mmu.c
81428+++ b/fs/proc/task_mmu.c
81429@@ -13,12 +13,19 @@
81430 #include <linux/swap.h>
81431 #include <linux/swapops.h>
81432 #include <linux/mmu_notifier.h>
81433+#include <linux/grsecurity.h>
81434
81435 #include <asm/elf.h>
81436 #include <asm/uaccess.h>
81437 #include <asm/tlbflush.h>
81438 #include "internal.h"
81439
81440+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81441+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
81442+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
81443+ _mm->pax_flags & MF_PAX_SEGMEXEC))
81444+#endif
81445+
81446 void task_mem(struct seq_file *m, struct mm_struct *mm)
81447 {
81448 unsigned long data, text, lib, swap, ptes, pmds;
81449@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81450 "VmLib:\t%8lu kB\n"
81451 "VmPTE:\t%8lu kB\n"
81452 "VmPMD:\t%8lu kB\n"
81453- "VmSwap:\t%8lu kB\n",
81454- hiwater_vm << (PAGE_SHIFT-10),
81455+ "VmSwap:\t%8lu kB\n"
81456+
81457+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81458+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
81459+#endif
81460+
81461+ ,hiwater_vm << (PAGE_SHIFT-10),
81462 total_vm << (PAGE_SHIFT-10),
81463 mm->locked_vm << (PAGE_SHIFT-10),
81464 mm->pinned_vm << (PAGE_SHIFT-10),
81465@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81466 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
81467 ptes >> 10,
81468 pmds >> 10,
81469- swap << (PAGE_SHIFT-10));
81470+ swap << (PAGE_SHIFT-10)
81471+
81472+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81473+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81474+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
81475+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
81476+#else
81477+ , mm->context.user_cs_base
81478+ , mm->context.user_cs_limit
81479+#endif
81480+#endif
81481+
81482+ );
81483 }
81484
81485 unsigned long task_vsize(struct mm_struct *mm)
81486@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81487 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
81488 }
81489
81490- /* We don't show the stack guard page in /proc/maps */
81491+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81492+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
81493+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
81494+#else
81495 start = vma->vm_start;
81496- if (stack_guard_page_start(vma, start))
81497- start += PAGE_SIZE;
81498 end = vma->vm_end;
81499- if (stack_guard_page_end(vma, end))
81500- end -= PAGE_SIZE;
81501+#endif
81502
81503 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
81504 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
81505@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81506 flags & VM_WRITE ? 'w' : '-',
81507 flags & VM_EXEC ? 'x' : '-',
81508 flags & VM_MAYSHARE ? 's' : 'p',
81509+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81510+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
81511+#else
81512 pgoff,
81513+#endif
81514 MAJOR(dev), MINOR(dev), ino);
81515
81516 /*
81517@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81518 */
81519 if (file) {
81520 seq_pad(m, ' ');
81521- seq_path(m, &file->f_path, "\n");
81522+ seq_path(m, &file->f_path, "\n\\");
81523 goto done;
81524 }
81525
81526@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81527 * Thread stack in /proc/PID/task/TID/maps or
81528 * the main process stack.
81529 */
81530- if (!is_pid || (vma->vm_start <= mm->start_stack &&
81531- vma->vm_end >= mm->start_stack)) {
81532+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
81533+ (vma->vm_start <= mm->start_stack &&
81534+ vma->vm_end >= mm->start_stack)) {
81535 name = "[stack]";
81536 } else {
81537 /* Thread stack in /proc/PID/maps */
81538@@ -362,6 +391,12 @@ done:
81539
81540 static int show_map(struct seq_file *m, void *v, int is_pid)
81541 {
81542+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81543+ if (current->exec_id != m->exec_id) {
81544+ gr_log_badprocpid("maps");
81545+ return 0;
81546+ }
81547+#endif
81548 show_map_vma(m, v, is_pid);
81549 m_cache_vma(m, v);
81550 return 0;
81551@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81552 .private = &mss,
81553 };
81554
81555+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81556+ if (current->exec_id != m->exec_id) {
81557+ gr_log_badprocpid("smaps");
81558+ return 0;
81559+ }
81560+#endif
81561 memset(&mss, 0, sizeof mss);
81562- /* mmap_sem is held in m_start */
81563- walk_page_vma(vma, &smaps_walk);
81564+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81565+ if (!PAX_RAND_FLAGS(vma->vm_mm))
81566+#endif
81567+ /* mmap_sem is held in m_start */
81568+ walk_page_vma(vma, &smaps_walk);
81569
81570 show_map_vma(m, vma, is_pid);
81571
81572@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81573 "KernelPageSize: %8lu kB\n"
81574 "MMUPageSize: %8lu kB\n"
81575 "Locked: %8lu kB\n",
81576+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81577+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
81578+#else
81579 (vma->vm_end - vma->vm_start) >> 10,
81580+#endif
81581 mss.resident >> 10,
81582 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
81583 mss.shared_clean >> 10,
81584@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81585 char buffer[64];
81586 int nid;
81587
81588+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81589+ if (current->exec_id != m->exec_id) {
81590+ gr_log_badprocpid("numa_maps");
81591+ return 0;
81592+ }
81593+#endif
81594+
81595 if (!mm)
81596 return 0;
81597
81598@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81599 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
81600 }
81601
81602+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81603+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
81604+#else
81605 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
81606+#endif
81607
81608 if (file) {
81609 seq_puts(m, " file=");
81610- seq_path(m, &file->f_path, "\n\t= ");
81611+ seq_path(m, &file->f_path, "\n\t\\= ");
81612 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
81613 seq_puts(m, " heap");
81614 } else {
81615diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
81616index 599ec2e..f1413ae 100644
81617--- a/fs/proc/task_nommu.c
81618+++ b/fs/proc/task_nommu.c
81619@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81620 else
81621 bytes += kobjsize(mm);
81622
81623- if (current->fs && current->fs->users > 1)
81624+ if (current->fs && atomic_read(&current->fs->users) > 1)
81625 sbytes += kobjsize(current->fs);
81626 else
81627 bytes += kobjsize(current->fs);
81628@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
81629
81630 if (file) {
81631 seq_pad(m, ' ');
81632- seq_path(m, &file->f_path, "");
81633+ seq_path(m, &file->f_path, "\n\\");
81634 } else if (mm) {
81635 pid_t tid = pid_of_stack(priv, vma, is_pid);
81636
81637diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
81638index 4e61388..1a2523d 100644
81639--- a/fs/proc/vmcore.c
81640+++ b/fs/proc/vmcore.c
81641@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
81642 nr_bytes = count;
81643
81644 /* If pfn is not ram, return zeros for sparse dump files */
81645- if (pfn_is_ram(pfn) == 0)
81646- memset(buf, 0, nr_bytes);
81647- else {
81648+ if (pfn_is_ram(pfn) == 0) {
81649+ if (userbuf) {
81650+ if (clear_user((char __force_user *)buf, nr_bytes))
81651+ return -EFAULT;
81652+ } else
81653+ memset(buf, 0, nr_bytes);
81654+ } else {
81655 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
81656 offset, userbuf);
81657 if (tmp < 0)
81658@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
81659 static int copy_to(void *target, void *src, size_t size, int userbuf)
81660 {
81661 if (userbuf) {
81662- if (copy_to_user((char __user *) target, src, size))
81663+ if (copy_to_user((char __force_user *) target, src, size))
81664 return -EFAULT;
81665 } else {
81666 memcpy(target, src, size);
81667@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81668 if (*fpos < m->offset + m->size) {
81669 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
81670 start = m->paddr + *fpos - m->offset;
81671- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
81672+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
81673 if (tmp < 0)
81674 return tmp;
81675 buflen -= tsz;
81676@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81677 static ssize_t read_vmcore(struct file *file, char __user *buffer,
81678 size_t buflen, loff_t *fpos)
81679 {
81680- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
81681+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
81682 }
81683
81684 /*
81685diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
81686index d3fb2b6..43a8140 100644
81687--- a/fs/qnx6/qnx6.h
81688+++ b/fs/qnx6/qnx6.h
81689@@ -74,7 +74,7 @@ enum {
81690 BYTESEX_BE,
81691 };
81692
81693-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81694+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81695 {
81696 if (sbi->s_bytesex == BYTESEX_LE)
81697 return le64_to_cpu((__force __le64)n);
81698@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
81699 return (__force __fs64)cpu_to_be64(n);
81700 }
81701
81702-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81703+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81704 {
81705 if (sbi->s_bytesex == BYTESEX_LE)
81706 return le32_to_cpu((__force __le32)n);
81707diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
81708index bb2869f..d34ada8 100644
81709--- a/fs/quota/netlink.c
81710+++ b/fs/quota/netlink.c
81711@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
81712 void quota_send_warning(struct kqid qid, dev_t dev,
81713 const char warntype)
81714 {
81715- static atomic_t seq;
81716+ static atomic_unchecked_t seq;
81717 struct sk_buff *skb;
81718 void *msg_head;
81719 int ret;
81720@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
81721 "VFS: Not enough memory to send quota warning.\n");
81722 return;
81723 }
81724- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
81725+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
81726 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
81727 if (!msg_head) {
81728 printk(KERN_ERR
81729diff --git a/fs/read_write.c b/fs/read_write.c
81730index 819ef3f..f07222d 100644
81731--- a/fs/read_write.c
81732+++ b/fs/read_write.c
81733@@ -505,7 +505,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
81734
81735 old_fs = get_fs();
81736 set_fs(get_ds());
81737- p = (__force const char __user *)buf;
81738+ p = (const char __force_user *)buf;
81739 if (count > MAX_RW_COUNT)
81740 count = MAX_RW_COUNT;
81741 ret = __vfs_write(file, p, count, pos);
81742diff --git a/fs/readdir.c b/fs/readdir.c
81743index ced6791..936687b 100644
81744--- a/fs/readdir.c
81745+++ b/fs/readdir.c
81746@@ -18,6 +18,7 @@
81747 #include <linux/security.h>
81748 #include <linux/syscalls.h>
81749 #include <linux/unistd.h>
81750+#include <linux/namei.h>
81751
81752 #include <asm/uaccess.h>
81753
81754@@ -71,6 +72,7 @@ struct old_linux_dirent {
81755 struct readdir_callback {
81756 struct dir_context ctx;
81757 struct old_linux_dirent __user * dirent;
81758+ struct file * file;
81759 int result;
81760 };
81761
81762@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
81763 buf->result = -EOVERFLOW;
81764 return -EOVERFLOW;
81765 }
81766+
81767+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81768+ return 0;
81769+
81770 buf->result++;
81771 dirent = buf->dirent;
81772 if (!access_ok(VERIFY_WRITE, dirent,
81773@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
81774 if (!f.file)
81775 return -EBADF;
81776
81777+ buf.file = f.file;
81778 error = iterate_dir(f.file, &buf.ctx);
81779 if (buf.result)
81780 error = buf.result;
81781@@ -145,6 +152,7 @@ struct getdents_callback {
81782 struct dir_context ctx;
81783 struct linux_dirent __user * current_dir;
81784 struct linux_dirent __user * previous;
81785+ struct file * file;
81786 int count;
81787 int error;
81788 };
81789@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
81790 buf->error = -EOVERFLOW;
81791 return -EOVERFLOW;
81792 }
81793+
81794+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81795+ return 0;
81796+
81797 dirent = buf->previous;
81798 if (dirent) {
81799 if (__put_user(offset, &dirent->d_off))
81800@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
81801 if (!f.file)
81802 return -EBADF;
81803
81804+ buf.file = f.file;
81805 error = iterate_dir(f.file, &buf.ctx);
81806 if (error >= 0)
81807 error = buf.error;
81808@@ -230,6 +243,7 @@ struct getdents_callback64 {
81809 struct dir_context ctx;
81810 struct linux_dirent64 __user * current_dir;
81811 struct linux_dirent64 __user * previous;
81812+ struct file *file;
81813 int count;
81814 int error;
81815 };
81816@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
81817 buf->error = -EINVAL; /* only used if we fail.. */
81818 if (reclen > buf->count)
81819 return -EINVAL;
81820+
81821+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81822+ return 0;
81823+
81824 dirent = buf->previous;
81825 if (dirent) {
81826 if (__put_user(offset, &dirent->d_off))
81827@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
81828 if (!f.file)
81829 return -EBADF;
81830
81831+ buf.file = f.file;
81832 error = iterate_dir(f.file, &buf.ctx);
81833 if (error >= 0)
81834 error = buf.error;
81835diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
81836index 9c02d96..6562c10 100644
81837--- a/fs/reiserfs/do_balan.c
81838+++ b/fs/reiserfs/do_balan.c
81839@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
81840 return;
81841 }
81842
81843- atomic_inc(&fs_generation(tb->tb_sb));
81844+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
81845 do_balance_starts(tb);
81846
81847 /*
81848diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
81849index aca73dd..e3c558d 100644
81850--- a/fs/reiserfs/item_ops.c
81851+++ b/fs/reiserfs/item_ops.c
81852@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
81853 }
81854
81855 static struct item_operations errcatch_ops = {
81856- errcatch_bytes_number,
81857- errcatch_decrement_key,
81858- errcatch_is_left_mergeable,
81859- errcatch_print_item,
81860- errcatch_check_item,
81861+ .bytes_number = errcatch_bytes_number,
81862+ .decrement_key = errcatch_decrement_key,
81863+ .is_left_mergeable = errcatch_is_left_mergeable,
81864+ .print_item = errcatch_print_item,
81865+ .check_item = errcatch_check_item,
81866
81867- errcatch_create_vi,
81868- errcatch_check_left,
81869- errcatch_check_right,
81870- errcatch_part_size,
81871- errcatch_unit_num,
81872- errcatch_print_vi
81873+ .create_vi = errcatch_create_vi,
81874+ .check_left = errcatch_check_left,
81875+ .check_right = errcatch_check_right,
81876+ .part_size = errcatch_part_size,
81877+ .unit_num = errcatch_unit_num,
81878+ .print_vi = errcatch_print_vi
81879 };
81880
81881 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
81882diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
81883index 621b9f3..af527fd 100644
81884--- a/fs/reiserfs/procfs.c
81885+++ b/fs/reiserfs/procfs.c
81886@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
81887 "SMALL_TAILS " : "NO_TAILS ",
81888 replay_only(sb) ? "REPLAY_ONLY " : "",
81889 convert_reiserfs(sb) ? "CONV " : "",
81890- atomic_read(&r->s_generation_counter),
81891+ atomic_read_unchecked(&r->s_generation_counter),
81892 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
81893 SF(s_do_balance), SF(s_unneeded_left_neighbor),
81894 SF(s_good_search_by_key_reada), SF(s_bmaps),
81895diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
81896index 2adcde1..7d27bc8 100644
81897--- a/fs/reiserfs/reiserfs.h
81898+++ b/fs/reiserfs/reiserfs.h
81899@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
81900 /* Comment? -Hans */
81901 wait_queue_head_t s_wait;
81902 /* increased by one every time the tree gets re-balanced */
81903- atomic_t s_generation_counter;
81904+ atomic_unchecked_t s_generation_counter;
81905
81906 /* File system properties. Currently holds on-disk FS format */
81907 unsigned long s_properties;
81908@@ -2300,7 +2300,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
81909 #define REISERFS_USER_MEM 1 /* user memory mode */
81910
81911 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
81912-#define get_generation(s) atomic_read (&fs_generation(s))
81913+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
81914 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
81915 #define __fs_changed(gen,s) (gen != get_generation (s))
81916 #define fs_changed(gen,s) \
81917diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
81918index 0111ad0..00f4749 100644
81919--- a/fs/reiserfs/super.c
81920+++ b/fs/reiserfs/super.c
81921@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
81922 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
81923 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
81924 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
81925+#ifdef CONFIG_REISERFS_FS_XATTR
81926+ /* turn on user xattrs by default */
81927+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
81928+#endif
81929 /* no preallocation minimum, be smart in reiserfs_file_write instead */
81930 sbi->s_alloc_options.preallocmin = 0;
81931 /* Preallocate by 16 blocks (17-1) at once */
81932diff --git a/fs/select.c b/fs/select.c
81933index f684c75..4117611 100644
81934--- a/fs/select.c
81935+++ b/fs/select.c
81936@@ -20,6 +20,7 @@
81937 #include <linux/export.h>
81938 #include <linux/slab.h>
81939 #include <linux/poll.h>
81940+#include <linux/security.h>
81941 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
81942 #include <linux/file.h>
81943 #include <linux/fdtable.h>
81944@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
81945 struct poll_list *walk = head;
81946 unsigned long todo = nfds;
81947
81948+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
81949 if (nfds > rlimit(RLIMIT_NOFILE))
81950 return -EINVAL;
81951
81952diff --git a/fs/seq_file.c b/fs/seq_file.c
81953index 555f821..34684d7 100644
81954--- a/fs/seq_file.c
81955+++ b/fs/seq_file.c
81956@@ -12,6 +12,8 @@
81957 #include <linux/slab.h>
81958 #include <linux/cred.h>
81959 #include <linux/mm.h>
81960+#include <linux/sched.h>
81961+#include <linux/grsecurity.h>
81962
81963 #include <asm/uaccess.h>
81964 #include <asm/page.h>
81965@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
81966
81967 static void *seq_buf_alloc(unsigned long size)
81968 {
81969- void *buf;
81970-
81971- /*
81972- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
81973- * it's better to fall back to vmalloc() than to kill things.
81974- */
81975- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
81976- if (!buf && size > PAGE_SIZE)
81977- buf = vmalloc(size);
81978- return buf;
81979+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
81980 }
81981
81982 /**
81983@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
81984 #ifdef CONFIG_USER_NS
81985 p->user_ns = file->f_cred->user_ns;
81986 #endif
81987+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81988+ p->exec_id = current->exec_id;
81989+#endif
81990
81991 /*
81992 * Wrappers around seq_open(e.g. swaps_open) need to be
81993@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
81994 }
81995 EXPORT_SYMBOL(seq_open);
81996
81997+
81998+int seq_open_restrict(struct file *file, const struct seq_operations *op)
81999+{
82000+ if (gr_proc_is_restricted())
82001+ return -EACCES;
82002+
82003+ return seq_open(file, op);
82004+}
82005+EXPORT_SYMBOL(seq_open_restrict);
82006+
82007 static int traverse(struct seq_file *m, loff_t offset)
82008 {
82009 loff_t pos = 0, index;
82010@@ -158,7 +164,7 @@ Eoverflow:
82011 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
82012 {
82013 struct seq_file *m = file->private_data;
82014- size_t copied = 0;
82015+ ssize_t copied = 0;
82016 loff_t pos;
82017 size_t n;
82018 void *p;
82019@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
82020 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
82021 void *data)
82022 {
82023- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
82024+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
82025 int res = -ENOMEM;
82026
82027 if (op) {
82028@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
82029 }
82030 EXPORT_SYMBOL(single_open_size);
82031
82032+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
82033+ void *data)
82034+{
82035+ if (gr_proc_is_restricted())
82036+ return -EACCES;
82037+
82038+ return single_open(file, show, data);
82039+}
82040+EXPORT_SYMBOL(single_open_restrict);
82041+
82042+
82043 int single_release(struct inode *inode, struct file *file)
82044 {
82045 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
82046diff --git a/fs/splice.c b/fs/splice.c
82047index bfe62ae..a84920d 100644
82048--- a/fs/splice.c
82049+++ b/fs/splice.c
82050@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
82051 pipe_lock(pipe);
82052
82053 for (;;) {
82054- if (!pipe->readers) {
82055+ if (!atomic_read(&pipe->readers)) {
82056 send_sig(SIGPIPE, current, 0);
82057 if (!ret)
82058 ret = -EPIPE;
82059@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
82060 page_nr++;
82061 ret += buf->len;
82062
82063- if (pipe->files)
82064+ if (atomic_read(&pipe->files))
82065 do_wakeup = 1;
82066
82067 if (!--spd->nr_pages)
82068@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
82069 do_wakeup = 0;
82070 }
82071
82072- pipe->waiting_writers++;
82073+ atomic_inc(&pipe->waiting_writers);
82074 pipe_wait(pipe);
82075- pipe->waiting_writers--;
82076+ atomic_dec(&pipe->waiting_writers);
82077 }
82078
82079 pipe_unlock(pipe);
82080@@ -578,7 +578,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
82081 old_fs = get_fs();
82082 set_fs(get_ds());
82083 /* The cast to a user pointer is valid due to the set_fs() */
82084- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
82085+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
82086 set_fs(old_fs);
82087
82088 return res;
82089@@ -593,7 +593,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
82090 old_fs = get_fs();
82091 set_fs(get_ds());
82092 /* The cast to a user pointer is valid due to the set_fs() */
82093- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
82094+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
82095 set_fs(old_fs);
82096
82097 return res;
82098@@ -646,7 +646,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
82099 goto err;
82100
82101 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
82102- vec[i].iov_base = (void __user *) page_address(page);
82103+ vec[i].iov_base = (void __force_user *) page_address(page);
82104 vec[i].iov_len = this_len;
82105 spd.pages[i] = page;
82106 spd.nr_pages++;
82107@@ -785,7 +785,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
82108 ops->release(pipe, buf);
82109 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
82110 pipe->nrbufs--;
82111- if (pipe->files)
82112+ if (atomic_read(&pipe->files))
82113 sd->need_wakeup = true;
82114 }
82115
82116@@ -809,10 +809,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
82117 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
82118 {
82119 while (!pipe->nrbufs) {
82120- if (!pipe->writers)
82121+ if (!atomic_read(&pipe->writers))
82122 return 0;
82123
82124- if (!pipe->waiting_writers && sd->num_spliced)
82125+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
82126 return 0;
82127
82128 if (sd->flags & SPLICE_F_NONBLOCK)
82129@@ -1027,7 +1027,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
82130 ops->release(pipe, buf);
82131 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
82132 pipe->nrbufs--;
82133- if (pipe->files)
82134+ if (atomic_read(&pipe->files))
82135 sd.need_wakeup = true;
82136 } else {
82137 buf->offset += ret;
82138@@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
82139 * out of the pipe right after the splice_to_pipe(). So set
82140 * PIPE_READERS appropriately.
82141 */
82142- pipe->readers = 1;
82143+ atomic_set(&pipe->readers, 1);
82144
82145 current->splice_pipe = pipe;
82146 }
82147@@ -1494,6 +1494,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
82148
82149 partial[buffers].offset = off;
82150 partial[buffers].len = plen;
82151+ partial[buffers].private = 0;
82152
82153 off = 0;
82154 len -= plen;
82155@@ -1725,9 +1726,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82156 ret = -ERESTARTSYS;
82157 break;
82158 }
82159- if (!pipe->writers)
82160+ if (!atomic_read(&pipe->writers))
82161 break;
82162- if (!pipe->waiting_writers) {
82163+ if (!atomic_read(&pipe->waiting_writers)) {
82164 if (flags & SPLICE_F_NONBLOCK) {
82165 ret = -EAGAIN;
82166 break;
82167@@ -1759,7 +1760,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82168 pipe_lock(pipe);
82169
82170 while (pipe->nrbufs >= pipe->buffers) {
82171- if (!pipe->readers) {
82172+ if (!atomic_read(&pipe->readers)) {
82173 send_sig(SIGPIPE, current, 0);
82174 ret = -EPIPE;
82175 break;
82176@@ -1772,9 +1773,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82177 ret = -ERESTARTSYS;
82178 break;
82179 }
82180- pipe->waiting_writers++;
82181+ atomic_inc(&pipe->waiting_writers);
82182 pipe_wait(pipe);
82183- pipe->waiting_writers--;
82184+ atomic_dec(&pipe->waiting_writers);
82185 }
82186
82187 pipe_unlock(pipe);
82188@@ -1810,14 +1811,14 @@ retry:
82189 pipe_double_lock(ipipe, opipe);
82190
82191 do {
82192- if (!opipe->readers) {
82193+ if (!atomic_read(&opipe->readers)) {
82194 send_sig(SIGPIPE, current, 0);
82195 if (!ret)
82196 ret = -EPIPE;
82197 break;
82198 }
82199
82200- if (!ipipe->nrbufs && !ipipe->writers)
82201+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
82202 break;
82203
82204 /*
82205@@ -1914,7 +1915,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
82206 pipe_double_lock(ipipe, opipe);
82207
82208 do {
82209- if (!opipe->readers) {
82210+ if (!atomic_read(&opipe->readers)) {
82211 send_sig(SIGPIPE, current, 0);
82212 if (!ret)
82213 ret = -EPIPE;
82214@@ -1959,7 +1960,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
82215 * return EAGAIN if we have the potential of some data in the
82216 * future, otherwise just return 0
82217 */
82218- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
82219+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
82220 ret = -EAGAIN;
82221
82222 pipe_unlock(ipipe);
82223diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
82224index e5e0ddf..09598c4 100644
82225--- a/fs/squashfs/xattr.c
82226+++ b/fs/squashfs/xattr.c
82227@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82228 + msblk->xattr_table;
82229 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
82230 int count = squashfs_i(inode)->xattr_count;
82231- size_t rest = buffer_size;
82232- int err;
82233+ size_t used = 0;
82234+ ssize_t err;
82235
82236 /* check that the file system has xattrs */
82237 if (msblk->xattr_id_table == NULL)
82238@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82239 name_size = le16_to_cpu(entry.size);
82240 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
82241 if (handler)
82242- prefix_size = handler->list(d, buffer, rest, NULL,
82243+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
82244 name_size, handler->flags);
82245 if (prefix_size) {
82246 if (buffer) {
82247- if (prefix_size + name_size + 1 > rest) {
82248+ if (prefix_size + name_size + 1 > buffer_size - used) {
82249 err = -ERANGE;
82250 goto failed;
82251 }
82252@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82253 buffer[name_size] = '\0';
82254 buffer += name_size + 1;
82255 }
82256- rest -= prefix_size + name_size + 1;
82257+ used += prefix_size + name_size + 1;
82258 } else {
82259 /* no handler or insuffficient privileges, so skip */
82260 err = squashfs_read_metadata(sb, NULL, &start,
82261@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82262 if (err < 0)
82263 goto failed;
82264 }
82265- err = buffer_size - rest;
82266+ err = used;
82267
82268 failed:
82269 return err;
82270diff --git a/fs/stat.c b/fs/stat.c
82271index cccc1aa..7fe8951 100644
82272--- a/fs/stat.c
82273+++ b/fs/stat.c
82274@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
82275 stat->gid = inode->i_gid;
82276 stat->rdev = inode->i_rdev;
82277 stat->size = i_size_read(inode);
82278- stat->atime = inode->i_atime;
82279- stat->mtime = inode->i_mtime;
82280+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82281+ stat->atime = inode->i_ctime;
82282+ stat->mtime = inode->i_ctime;
82283+ } else {
82284+ stat->atime = inode->i_atime;
82285+ stat->mtime = inode->i_mtime;
82286+ }
82287 stat->ctime = inode->i_ctime;
82288 stat->blksize = (1 << inode->i_blkbits);
82289 stat->blocks = inode->i_blocks;
82290@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
82291 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
82292 {
82293 struct inode *inode = d_backing_inode(path->dentry);
82294+ int retval;
82295
82296- if (inode->i_op->getattr)
82297- return inode->i_op->getattr(path->mnt, path->dentry, stat);
82298+ if (inode->i_op->getattr) {
82299+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
82300+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82301+ stat->atime = stat->ctime;
82302+ stat->mtime = stat->ctime;
82303+ }
82304+ return retval;
82305+ }
82306
82307 generic_fillattr(inode, stat);
82308 return 0;
82309diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
82310index 94374e4..b5da3a1 100644
82311--- a/fs/sysfs/dir.c
82312+++ b/fs/sysfs/dir.c
82313@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82314 kfree(buf);
82315 }
82316
82317+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82318+extern int grsec_enable_sysfs_restrict;
82319+#endif
82320+
82321 /**
82322 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
82323 * @kobj: object we're creating directory for
82324@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82325 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82326 {
82327 struct kernfs_node *parent, *kn;
82328+ const char *name;
82329+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
82330+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82331+ const char *parent_name;
82332+#endif
82333
82334 BUG_ON(!kobj);
82335
82336+ name = kobject_name(kobj);
82337+
82338 if (kobj->parent)
82339 parent = kobj->parent->sd;
82340 else
82341@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82342 if (!parent)
82343 return -ENOENT;
82344
82345- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
82346- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
82347+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82348+ parent_name = parent->name;
82349+ mode = S_IRWXU;
82350+
82351+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
82352+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
82353+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
82354+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
82355+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82356+ if (!grsec_enable_sysfs_restrict)
82357+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82358+#endif
82359+
82360+ kn = kernfs_create_dir_ns(parent, name,
82361+ mode, kobj, ns);
82362 if (IS_ERR(kn)) {
82363 if (PTR_ERR(kn) == -EEXIST)
82364- sysfs_warn_dup(parent, kobject_name(kobj));
82365+ sysfs_warn_dup(parent, name);
82366 return PTR_ERR(kn);
82367 }
82368
82369diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
82370index 69d4889..a810bd4 100644
82371--- a/fs/sysv/sysv.h
82372+++ b/fs/sysv/sysv.h
82373@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
82374 #endif
82375 }
82376
82377-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82378+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82379 {
82380 if (sbi->s_bytesex == BYTESEX_PDP)
82381 return PDP_swab((__force __u32)n);
82382diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
82383index a43df11..c368e71 100644
82384--- a/fs/tracefs/inode.c
82385+++ b/fs/tracefs/inode.c
82386@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
82387 static struct tracefs_dir_ops {
82388 int (*mkdir)(const char *name);
82389 int (*rmdir)(const char *name);
82390-} tracefs_ops;
82391+} __no_const tracefs_ops __read_only;
82392
82393 static char *get_dname(struct dentry *dentry)
82394 {
82395@@ -490,8 +490,10 @@ struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *pare
82396 if (!dentry)
82397 return NULL;
82398
82399- tracefs_ops.mkdir = mkdir;
82400- tracefs_ops.rmdir = rmdir;
82401+ pax_open_kernel();
82402+ *(void **)&tracefs_ops.mkdir = mkdir;
82403+ *(void **)&tracefs_ops.rmdir = rmdir;
82404+ pax_close_kernel();
82405
82406 return dentry;
82407 }
82408diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
82409index 97be412..974b37f 100644
82410--- a/fs/ubifs/io.c
82411+++ b/fs/ubifs/io.c
82412@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
82413 return err;
82414 }
82415
82416-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82417+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82418 {
82419 int err;
82420
82421diff --git a/fs/udf/misc.c b/fs/udf/misc.c
82422index 71d1c25..084e2ad 100644
82423--- a/fs/udf/misc.c
82424+++ b/fs/udf/misc.c
82425@@ -288,7 +288,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
82426
82427 u8 udf_tag_checksum(const struct tag *t)
82428 {
82429- u8 *data = (u8 *)t;
82430+ const u8 *data = (const u8 *)t;
82431 u8 checksum = 0;
82432 int i;
82433 for (i = 0; i < sizeof(struct tag); ++i)
82434diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
82435index 8d974c4..b82f6ec 100644
82436--- a/fs/ufs/swab.h
82437+++ b/fs/ufs/swab.h
82438@@ -22,7 +22,7 @@ enum {
82439 BYTESEX_BE
82440 };
82441
82442-static inline u64
82443+static inline u64 __intentional_overflow(-1)
82444 fs64_to_cpu(struct super_block *sbp, __fs64 n)
82445 {
82446 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82447@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
82448 return (__force __fs64)cpu_to_be64(n);
82449 }
82450
82451-static inline u32
82452+static inline u32 __intentional_overflow(-1)
82453 fs32_to_cpu(struct super_block *sbp, __fs32 n)
82454 {
82455 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82456diff --git a/fs/utimes.c b/fs/utimes.c
82457index aa138d6..5f3a811 100644
82458--- a/fs/utimes.c
82459+++ b/fs/utimes.c
82460@@ -1,6 +1,7 @@
82461 #include <linux/compiler.h>
82462 #include <linux/file.h>
82463 #include <linux/fs.h>
82464+#include <linux/security.h>
82465 #include <linux/linkage.h>
82466 #include <linux/mount.h>
82467 #include <linux/namei.h>
82468@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
82469 }
82470 }
82471 retry_deleg:
82472+
82473+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
82474+ error = -EACCES;
82475+ goto mnt_drop_write_and_out;
82476+ }
82477+
82478 mutex_lock(&inode->i_mutex);
82479 error = notify_change(path->dentry, &newattrs, &delegated_inode);
82480 mutex_unlock(&inode->i_mutex);
82481diff --git a/fs/xattr.c b/fs/xattr.c
82482index 4ef6985..a6cd6567 100644
82483--- a/fs/xattr.c
82484+++ b/fs/xattr.c
82485@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
82486 return rc;
82487 }
82488
82489+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82490+ssize_t
82491+pax_getxattr(struct dentry *dentry, void *value, size_t size)
82492+{
82493+ struct inode *inode = dentry->d_inode;
82494+ ssize_t error;
82495+
82496+ error = inode_permission(inode, MAY_EXEC);
82497+ if (error)
82498+ return error;
82499+
82500+ if (inode->i_op->getxattr)
82501+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
82502+ else
82503+ error = -EOPNOTSUPP;
82504+
82505+ return error;
82506+}
82507+EXPORT_SYMBOL(pax_getxattr);
82508+#endif
82509+
82510 ssize_t
82511 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
82512 {
82513@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
82514 * Extended attribute SET operations
82515 */
82516 static long
82517-setxattr(struct dentry *d, const char __user *name, const void __user *value,
82518+setxattr(struct path *path, const char __user *name, const void __user *value,
82519 size_t size, int flags)
82520 {
82521 int error;
82522@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
82523 posix_acl_fix_xattr_from_user(kvalue, size);
82524 }
82525
82526- error = vfs_setxattr(d, kname, kvalue, size, flags);
82527+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
82528+ error = -EACCES;
82529+ goto out;
82530+ }
82531+
82532+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
82533 out:
82534 if (vvalue)
82535 vfree(vvalue);
82536@@ -376,7 +402,7 @@ retry:
82537 return error;
82538 error = mnt_want_write(path.mnt);
82539 if (!error) {
82540- error = setxattr(path.dentry, name, value, size, flags);
82541+ error = setxattr(&path, name, value, size, flags);
82542 mnt_drop_write(path.mnt);
82543 }
82544 path_put(&path);
82545@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
82546 audit_file(f.file);
82547 error = mnt_want_write_file(f.file);
82548 if (!error) {
82549- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
82550+ error = setxattr(&f.file->f_path, name, value, size, flags);
82551 mnt_drop_write_file(f.file);
82552 }
82553 fdput(f);
82554@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
82555 * Extended attribute REMOVE operations
82556 */
82557 static long
82558-removexattr(struct dentry *d, const char __user *name)
82559+removexattr(struct path *path, const char __user *name)
82560 {
82561 int error;
82562 char kname[XATTR_NAME_MAX + 1];
82563@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
82564 if (error < 0)
82565 return error;
82566
82567- return vfs_removexattr(d, kname);
82568+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
82569+ return -EACCES;
82570+
82571+ return vfs_removexattr(path->dentry, kname);
82572 }
82573
82574 static int path_removexattr(const char __user *pathname,
82575@@ -623,7 +652,7 @@ retry:
82576 return error;
82577 error = mnt_want_write(path.mnt);
82578 if (!error) {
82579- error = removexattr(path.dentry, name);
82580+ error = removexattr(&path, name);
82581 mnt_drop_write(path.mnt);
82582 }
82583 path_put(&path);
82584@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
82585 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
82586 {
82587 struct fd f = fdget(fd);
82588+ struct path *path;
82589 int error = -EBADF;
82590
82591 if (!f.file)
82592 return error;
82593+ path = &f.file->f_path;
82594 audit_file(f.file);
82595 error = mnt_want_write_file(f.file);
82596 if (!error) {
82597- error = removexattr(f.file->f_path.dentry, name);
82598+ error = removexattr(path, name);
82599 mnt_drop_write_file(f.file);
82600 }
82601 fdput(f);
82602diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
82603index f1026e8..a0fbe4f 100644
82604--- a/fs/xfs/libxfs/xfs_bmap.c
82605+++ b/fs/xfs/libxfs/xfs_bmap.c
82606@@ -554,7 +554,7 @@ xfs_bmap_validate_ret(
82607
82608 #else
82609 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
82610-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
82611+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
82612 #endif /* DEBUG */
82613
82614 /*
82615diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
82616index 098cd78..724d3f8 100644
82617--- a/fs/xfs/xfs_dir2_readdir.c
82618+++ b/fs/xfs/xfs_dir2_readdir.c
82619@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
82620 ino = dp->d_ops->sf_get_ino(sfp, sfep);
82621 filetype = dp->d_ops->sf_get_ftype(sfep);
82622 ctx->pos = off & 0x7fffffff;
82623- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82624+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
82625+ char name[sfep->namelen];
82626+ memcpy(name, sfep->name, sfep->namelen);
82627+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
82628+ return 0;
82629+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82630 xfs_dir3_get_dtype(dp->i_mount, filetype)))
82631 return 0;
82632 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
82633diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
82634index 87f67c6..7e335bf 100644
82635--- a/fs/xfs/xfs_ioctl.c
82636+++ b/fs/xfs/xfs_ioctl.c
82637@@ -120,7 +120,7 @@ xfs_find_handle(
82638 }
82639
82640 error = -EFAULT;
82641- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
82642+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
82643 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
82644 goto out_put;
82645
82646diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
82647index 7c7842c..ce15222 100644
82648--- a/fs/xfs/xfs_linux.h
82649+++ b/fs/xfs/xfs_linux.h
82650@@ -225,7 +225,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
82651 * of the compiler which do not like us using do_div in the middle
82652 * of large functions.
82653 */
82654-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82655+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82656 {
82657 __u32 mod;
82658
82659@@ -281,7 +281,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
82660 return 0;
82661 }
82662 #else
82663-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82664+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82665 {
82666 __u32 mod;
82667
82668diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
82669new file mode 100644
82670index 0000000..31f8fe4
82671--- /dev/null
82672+++ b/grsecurity/Kconfig
82673@@ -0,0 +1,1182 @@
82674+#
82675+# grecurity configuration
82676+#
82677+menu "Memory Protections"
82678+depends on GRKERNSEC
82679+
82680+config GRKERNSEC_KMEM
82681+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
82682+ default y if GRKERNSEC_CONFIG_AUTO
82683+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
82684+ help
82685+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
82686+ be written to or read from to modify or leak the contents of the running
82687+ kernel. /dev/port will also not be allowed to be opened, writing to
82688+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
82689+ If you have module support disabled, enabling this will close up several
82690+ ways that are currently used to insert malicious code into the running
82691+ kernel.
82692+
82693+ Even with this feature enabled, we still highly recommend that
82694+ you use the RBAC system, as it is still possible for an attacker to
82695+ modify the running kernel through other more obscure methods.
82696+
82697+ It is highly recommended that you say Y here if you meet all the
82698+ conditions above.
82699+
82700+config GRKERNSEC_VM86
82701+ bool "Restrict VM86 mode"
82702+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82703+ depends on X86_32
82704+
82705+ help
82706+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
82707+ make use of a special execution mode on 32bit x86 processors called
82708+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
82709+ video cards and will still work with this option enabled. The purpose
82710+ of the option is to prevent exploitation of emulation errors in
82711+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
82712+ Nearly all users should be able to enable this option.
82713+
82714+config GRKERNSEC_IO
82715+ bool "Disable privileged I/O"
82716+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82717+ depends on X86
82718+ select RTC_CLASS
82719+ select RTC_INTF_DEV
82720+ select RTC_DRV_CMOS
82721+
82722+ help
82723+ If you say Y here, all ioperm and iopl calls will return an error.
82724+ Ioperm and iopl can be used to modify the running kernel.
82725+ Unfortunately, some programs need this access to operate properly,
82726+ the most notable of which are XFree86 and hwclock. hwclock can be
82727+ remedied by having RTC support in the kernel, so real-time
82728+ clock support is enabled if this option is enabled, to ensure
82729+ that hwclock operates correctly. If hwclock still does not work,
82730+ either update udev or symlink /dev/rtc to /dev/rtc0.
82731+
82732+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
82733+ you may not be able to boot into a graphical environment with this
82734+ option enabled. In this case, you should use the RBAC system instead.
82735+
82736+config GRKERNSEC_BPF_HARDEN
82737+ bool "Harden BPF interpreter"
82738+ default y if GRKERNSEC_CONFIG_AUTO
82739+ help
82740+ Unlike previous versions of grsecurity that hardened both the BPF
82741+ interpreted code against corruption at rest as well as the JIT code
82742+ against JIT-spray attacks and attacker-controlled immediate values
82743+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
82744+ and will ensure the interpreted code is read-only at rest. This feature
82745+ may be removed at a later time when eBPF stabilizes to entirely revert
82746+ back to the more secure pre-3.16 BPF interpreter/JIT.
82747+
82748+ If you're using KERNEXEC, it's recommended that you enable this option
82749+ to supplement the hardening of the kernel.
82750+
82751+config GRKERNSEC_PERF_HARDEN
82752+ bool "Disable unprivileged PERF_EVENTS usage by default"
82753+ default y if GRKERNSEC_CONFIG_AUTO
82754+ depends on PERF_EVENTS
82755+ help
82756+ If you say Y here, the range of acceptable values for the
82757+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
82758+ default to a new value: 3. When the sysctl is set to this value, no
82759+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
82760+
82761+ Though PERF_EVENTS can be used legitimately for performance monitoring
82762+ and low-level application profiling, it is forced on regardless of
82763+ configuration, has been at fault for several vulnerabilities, and
82764+ creates new opportunities for side channels and other information leaks.
82765+
82766+ This feature puts PERF_EVENTS into a secure default state and permits
82767+ the administrator to change out of it temporarily if unprivileged
82768+ application profiling is needed.
82769+
82770+config GRKERNSEC_RAND_THREADSTACK
82771+ bool "Insert random gaps between thread stacks"
82772+ default y if GRKERNSEC_CONFIG_AUTO
82773+ depends on PAX_RANDMMAP && !PPC
82774+ help
82775+ If you say Y here, a random-sized gap will be enforced between allocated
82776+ thread stacks. Glibc's NPTL and other threading libraries that
82777+ pass MAP_STACK to the kernel for thread stack allocation are supported.
82778+ The implementation currently provides 8 bits of entropy for the gap.
82779+
82780+ Many distributions do not compile threaded remote services with the
82781+ -fstack-check argument to GCC, causing the variable-sized stack-based
82782+ allocator, alloca(), to not probe the stack on allocation. This
82783+ permits an unbounded alloca() to skip over any guard page and potentially
82784+ modify another thread's stack reliably. An enforced random gap
82785+ reduces the reliability of such an attack and increases the chance
82786+ that such a read/write to another thread's stack instead lands in
82787+ an unmapped area, causing a crash and triggering grsecurity's
82788+ anti-bruteforcing logic.
82789+
82790+config GRKERNSEC_PROC_MEMMAP
82791+ bool "Harden ASLR against information leaks and entropy reduction"
82792+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
82793+ depends on PAX_NOEXEC || PAX_ASLR
82794+ help
82795+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
82796+ give no information about the addresses of its mappings if
82797+ PaX features that rely on random addresses are enabled on the task.
82798+ In addition to sanitizing this information and disabling other
82799+ dangerous sources of information, this option causes reads of sensitive
82800+ /proc/<pid> entries where the file descriptor was opened in a different
82801+ task than the one performing the read. Such attempts are logged.
82802+ This option also limits argv/env strings for suid/sgid binaries
82803+ to 512KB to prevent a complete exhaustion of the stack entropy provided
82804+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
82805+ binaries to prevent alternative mmap layouts from being abused.
82806+
82807+ If you use PaX it is essential that you say Y here as it closes up
82808+ several holes that make full ASLR useless locally.
82809+
82810+
82811+config GRKERNSEC_KSTACKOVERFLOW
82812+ bool "Prevent kernel stack overflows"
82813+ default y if GRKERNSEC_CONFIG_AUTO
82814+ depends on !IA64 && 64BIT
82815+ help
82816+ If you say Y here, the kernel's process stacks will be allocated
82817+ with vmalloc instead of the kernel's default allocator. This
82818+ introduces guard pages that in combination with the alloca checking
82819+ of the STACKLEAK feature prevents all forms of kernel process stack
82820+ overflow abuse. Note that this is different from kernel stack
82821+ buffer overflows.
82822+
82823+config GRKERNSEC_BRUTE
82824+ bool "Deter exploit bruteforcing"
82825+ default y if GRKERNSEC_CONFIG_AUTO
82826+ help
82827+ If you say Y here, attempts to bruteforce exploits against forking
82828+ daemons such as apache or sshd, as well as against suid/sgid binaries
82829+ will be deterred. When a child of a forking daemon is killed by PaX
82830+ or crashes due to an illegal instruction or other suspicious signal,
82831+ the parent process will be delayed 30 seconds upon every subsequent
82832+ fork until the administrator is able to assess the situation and
82833+ restart the daemon.
82834+ In the suid/sgid case, the attempt is logged, the user has all their
82835+ existing instances of the suid/sgid binary terminated and will
82836+ be unable to execute any suid/sgid binaries for 15 minutes.
82837+
82838+ It is recommended that you also enable signal logging in the auditing
82839+ section so that logs are generated when a process triggers a suspicious
82840+ signal.
82841+ If the sysctl option is enabled, a sysctl option with name
82842+ "deter_bruteforce" is created.
82843+
82844+config GRKERNSEC_MODHARDEN
82845+ bool "Harden module auto-loading"
82846+ default y if GRKERNSEC_CONFIG_AUTO
82847+ depends on MODULES
82848+ help
82849+ If you say Y here, module auto-loading in response to use of some
82850+ feature implemented by an unloaded module will be restricted to
82851+ root users. Enabling this option helps defend against attacks
82852+ by unprivileged users who abuse the auto-loading behavior to
82853+ cause a vulnerable module to load that is then exploited.
82854+
82855+ If this option prevents a legitimate use of auto-loading for a
82856+ non-root user, the administrator can execute modprobe manually
82857+ with the exact name of the module mentioned in the alert log.
82858+ Alternatively, the administrator can add the module to the list
82859+ of modules loaded at boot by modifying init scripts.
82860+
82861+ Modification of init scripts will most likely be needed on
82862+ Ubuntu servers with encrypted home directory support enabled,
82863+ as the first non-root user logging in will cause the ecb(aes),
82864+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
82865+
82866+config GRKERNSEC_HIDESYM
82867+ bool "Hide kernel symbols"
82868+ default y if GRKERNSEC_CONFIG_AUTO
82869+ select PAX_USERCOPY_SLABS
82870+ help
82871+ If you say Y here, getting information on loaded modules, and
82872+ displaying all kernel symbols through a syscall will be restricted
82873+ to users with CAP_SYS_MODULE. For software compatibility reasons,
82874+ /proc/kallsyms will be restricted to the root user. The RBAC
82875+ system can hide that entry even from root.
82876+
82877+ This option also prevents leaking of kernel addresses through
82878+ several /proc entries.
82879+
82880+ Note that this option is only effective provided the following
82881+ conditions are met:
82882+ 1) The kernel using grsecurity is not precompiled by some distribution
82883+ 2) You have also enabled GRKERNSEC_DMESG
82884+ 3) You are using the RBAC system and hiding other files such as your
82885+ kernel image and System.map. Alternatively, enabling this option
82886+ causes the permissions on /boot, /lib/modules, and the kernel
82887+ source directory to change at compile time to prevent
82888+ reading by non-root users.
82889+ If the above conditions are met, this option will aid in providing a
82890+ useful protection against local kernel exploitation of overflows
82891+ and arbitrary read/write vulnerabilities.
82892+
82893+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
82894+ in addition to this feature.
82895+
82896+config GRKERNSEC_RANDSTRUCT
82897+ bool "Randomize layout of sensitive kernel structures"
82898+ default y if GRKERNSEC_CONFIG_AUTO
82899+ select GRKERNSEC_HIDESYM
82900+ select MODVERSIONS if MODULES
82901+ help
82902+ If you say Y here, the layouts of a number of sensitive kernel
82903+ structures (task, fs, cred, etc) and all structures composed entirely
82904+ of function pointers (aka "ops" structs) will be randomized at compile-time.
82905+ This can introduce the requirement of an additional infoleak
82906+ vulnerability for exploits targeting these structure types.
82907+
82908+ Enabling this feature will introduce some performance impact, slightly
82909+ increase memory usage, and prevent the use of forensic tools like
82910+ Volatility against the system (unless the kernel source tree isn't
82911+ cleaned after kernel installation).
82912+
82913+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
82914+ It remains after a make clean to allow for external modules to be compiled
82915+ with the existing seed and will be removed by a make mrproper or
82916+ make distclean.
82917+
82918+ Note that the implementation requires gcc 4.6.4. or newer. You may need
82919+ to install the supporting headers explicitly in addition to the normal
82920+ gcc package.
82921+
82922+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
82923+ bool "Use cacheline-aware structure randomization"
82924+ depends on GRKERNSEC_RANDSTRUCT
82925+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
82926+ help
82927+ If you say Y here, the RANDSTRUCT randomization will make a best effort
82928+ at restricting randomization to cacheline-sized groups of elements. It
82929+ will further not randomize bitfields in structures. This reduces the
82930+ performance hit of RANDSTRUCT at the cost of weakened randomization.
82931+
82932+config GRKERNSEC_KERN_LOCKOUT
82933+ bool "Active kernel exploit response"
82934+ default y if GRKERNSEC_CONFIG_AUTO
82935+ depends on X86 || ARM || PPC || SPARC
82936+ help
82937+ If you say Y here, when a PaX alert is triggered due to suspicious
82938+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
82939+ or an OOPS occurs due to bad memory accesses, instead of just
82940+ terminating the offending process (and potentially allowing
82941+ a subsequent exploit from the same user), we will take one of two
82942+ actions:
82943+ If the user was root, we will panic the system
82944+ If the user was non-root, we will log the attempt, terminate
82945+ all processes owned by the user, then prevent them from creating
82946+ any new processes until the system is restarted
82947+ This deters repeated kernel exploitation/bruteforcing attempts
82948+ and is useful for later forensics.
82949+
82950+config GRKERNSEC_OLD_ARM_USERLAND
82951+ bool "Old ARM userland compatibility"
82952+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
82953+ help
82954+ If you say Y here, stubs of executable code to perform such operations
82955+ as "compare-exchange" will be placed at fixed locations in the ARM vector
82956+ table. This is unfortunately needed for old ARM userland meant to run
82957+ across a wide range of processors. Without this option enabled,
82958+ the get_tls and data memory barrier stubs will be emulated by the kernel,
82959+ which is enough for Linaro userlands or other userlands designed for v6
82960+ and newer ARM CPUs. It's recommended that you try without this option enabled
82961+ first, and only enable it if your userland does not boot (it will likely fail
82962+ at init time).
82963+
82964+endmenu
82965+menu "Role Based Access Control Options"
82966+depends on GRKERNSEC
82967+
82968+config GRKERNSEC_RBAC_DEBUG
82969+ bool
82970+
82971+config GRKERNSEC_NO_RBAC
82972+ bool "Disable RBAC system"
82973+ help
82974+ If you say Y here, the /dev/grsec device will be removed from the kernel,
82975+ preventing the RBAC system from being enabled. You should only say Y
82976+ here if you have no intention of using the RBAC system, so as to prevent
82977+ an attacker with root access from misusing the RBAC system to hide files
82978+ and processes when loadable module support and /dev/[k]mem have been
82979+ locked down.
82980+
82981+config GRKERNSEC_ACL_HIDEKERN
82982+ bool "Hide kernel processes"
82983+ help
82984+ If you say Y here, all kernel threads will be hidden to all
82985+ processes but those whose subject has the "view hidden processes"
82986+ flag.
82987+
82988+config GRKERNSEC_ACL_MAXTRIES
82989+ int "Maximum tries before password lockout"
82990+ default 3
82991+ help
82992+ This option enforces the maximum number of times a user can attempt
82993+ to authorize themselves with the grsecurity RBAC system before being
82994+ denied the ability to attempt authorization again for a specified time.
82995+ The lower the number, the harder it will be to brute-force a password.
82996+
82997+config GRKERNSEC_ACL_TIMEOUT
82998+ int "Time to wait after max password tries, in seconds"
82999+ default 30
83000+ help
83001+ This option specifies the time the user must wait after attempting to
83002+ authorize to the RBAC system with the maximum number of invalid
83003+ passwords. The higher the number, the harder it will be to brute-force
83004+ a password.
83005+
83006+endmenu
83007+menu "Filesystem Protections"
83008+depends on GRKERNSEC
83009+
83010+config GRKERNSEC_PROC
83011+ bool "Proc restrictions"
83012+ default y if GRKERNSEC_CONFIG_AUTO
83013+ help
83014+ If you say Y here, the permissions of the /proc filesystem
83015+ will be altered to enhance system security and privacy. You MUST
83016+ choose either a user only restriction or a user and group restriction.
83017+ Depending upon the option you choose, you can either restrict users to
83018+ see only the processes they themselves run, or choose a group that can
83019+ view all processes and files normally restricted to root if you choose
83020+ the "restrict to user only" option. NOTE: If you're running identd or
83021+ ntpd as a non-root user, you will have to run it as the group you
83022+ specify here.
83023+
83024+config GRKERNSEC_PROC_USER
83025+ bool "Restrict /proc to user only"
83026+ depends on GRKERNSEC_PROC
83027+ help
83028+ If you say Y here, non-root users will only be able to view their own
83029+ processes, and restricts them from viewing network-related information,
83030+ and viewing kernel symbol and module information.
83031+
83032+config GRKERNSEC_PROC_USERGROUP
83033+ bool "Allow special group"
83034+ default y if GRKERNSEC_CONFIG_AUTO
83035+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
83036+ help
83037+ If you say Y here, you will be able to select a group that will be
83038+ able to view all processes and network-related information. If you've
83039+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
83040+ remain hidden. This option is useful if you want to run identd as
83041+ a non-root user. The group you select may also be chosen at boot time
83042+ via "grsec_proc_gid=" on the kernel commandline.
83043+
83044+config GRKERNSEC_PROC_GID
83045+ int "GID for special group"
83046+ depends on GRKERNSEC_PROC_USERGROUP
83047+ default 1001
83048+
83049+config GRKERNSEC_PROC_ADD
83050+ bool "Additional restrictions"
83051+ default y if GRKERNSEC_CONFIG_AUTO
83052+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
83053+ help
83054+ If you say Y here, additional restrictions will be placed on
83055+ /proc that keep normal users from viewing device information and
83056+ slabinfo information that could be useful for exploits.
83057+
83058+config GRKERNSEC_LINK
83059+ bool "Linking restrictions"
83060+ default y if GRKERNSEC_CONFIG_AUTO
83061+ help
83062+ If you say Y here, /tmp race exploits will be prevented, since users
83063+ will no longer be able to follow symlinks owned by other users in
83064+ world-writable +t directories (e.g. /tmp), unless the owner of the
83065+ symlink is the owner of the directory. users will also not be
83066+ able to hardlink to files they do not own. If the sysctl option is
83067+ enabled, a sysctl option with name "linking_restrictions" is created.
83068+
83069+config GRKERNSEC_SYMLINKOWN
83070+ bool "Kernel-enforced SymlinksIfOwnerMatch"
83071+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83072+ help
83073+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
83074+ that prevents it from being used as a security feature. As Apache
83075+ verifies the symlink by performing a stat() against the target of
83076+ the symlink before it is followed, an attacker can setup a symlink
83077+ to point to a same-owned file, then replace the symlink with one
83078+ that targets another user's file just after Apache "validates" the
83079+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
83080+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
83081+ will be in place for the group you specify. If the sysctl option
83082+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
83083+ created.
83084+
83085+config GRKERNSEC_SYMLINKOWN_GID
83086+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
83087+ depends on GRKERNSEC_SYMLINKOWN
83088+ default 1006
83089+ help
83090+ Setting this GID determines what group kernel-enforced
83091+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
83092+ is enabled, a sysctl option with name "symlinkown_gid" is created.
83093+
83094+config GRKERNSEC_FIFO
83095+ bool "FIFO restrictions"
83096+ default y if GRKERNSEC_CONFIG_AUTO
83097+ help
83098+ If you say Y here, users will not be able to write to FIFOs they don't
83099+ own in world-writable +t directories (e.g. /tmp), unless the owner of
83100+ the FIFO is the same owner of the directory it's held in. If the sysctl
83101+ option is enabled, a sysctl option with name "fifo_restrictions" is
83102+ created.
83103+
83104+config GRKERNSEC_SYSFS_RESTRICT
83105+ bool "Sysfs/debugfs restriction"
83106+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
83107+ depends on SYSFS
83108+ help
83109+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
83110+ any filesystem normally mounted under it (e.g. debugfs) will be
83111+ mostly accessible only by root. These filesystems generally provide access
83112+ to hardware and debug information that isn't appropriate for unprivileged
83113+ users of the system. Sysfs and debugfs have also become a large source
83114+ of new vulnerabilities, ranging from infoleaks to local compromise.
83115+ There has been very little oversight with an eye toward security involved
83116+ in adding new exporters of information to these filesystems, so their
83117+ use is discouraged.
83118+ For reasons of compatibility, a few directories have been whitelisted
83119+ for access by non-root users:
83120+ /sys/fs/selinux
83121+ /sys/fs/fuse
83122+ /sys/devices/system/cpu
83123+
83124+config GRKERNSEC_ROFS
83125+ bool "Runtime read-only mount protection"
83126+ depends on SYSCTL
83127+ help
83128+ If you say Y here, a sysctl option with name "romount_protect" will
83129+ be created. By setting this option to 1 at runtime, filesystems
83130+ will be protected in the following ways:
83131+ * No new writable mounts will be allowed
83132+ * Existing read-only mounts won't be able to be remounted read/write
83133+ * Write operations will be denied on all block devices
83134+ This option acts independently of grsec_lock: once it is set to 1,
83135+ it cannot be turned off. Therefore, please be mindful of the resulting
83136+ behavior if this option is enabled in an init script on a read-only
83137+ filesystem.
83138+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
83139+ and GRKERNSEC_IO should be enabled and module loading disabled via
83140+ config or at runtime.
83141+ This feature is mainly intended for secure embedded systems.
83142+
83143+
83144+config GRKERNSEC_DEVICE_SIDECHANNEL
83145+ bool "Eliminate stat/notify-based device sidechannels"
83146+ default y if GRKERNSEC_CONFIG_AUTO
83147+ help
83148+ If you say Y here, timing analyses on block or character
83149+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
83150+ will be thwarted for unprivileged users. If a process without
83151+ CAP_MKNOD stats such a device, the last access and last modify times
83152+ will match the device's create time. No access or modify events
83153+ will be triggered through inotify/dnotify/fanotify for such devices.
83154+ This feature will prevent attacks that may at a minimum
83155+ allow an attacker to determine the administrator's password length.
83156+
83157+config GRKERNSEC_CHROOT
83158+ bool "Chroot jail restrictions"
83159+ default y if GRKERNSEC_CONFIG_AUTO
83160+ help
83161+ If you say Y here, you will be able to choose several options that will
83162+ make breaking out of a chrooted jail much more difficult. If you
83163+ encounter no software incompatibilities with the following options, it
83164+ is recommended that you enable each one.
83165+
83166+ Note that the chroot restrictions are not intended to apply to "chroots"
83167+ to directories that are simple bind mounts of the global root filesystem.
83168+ For several other reasons, a user shouldn't expect any significant
83169+ security by performing such a chroot.
83170+
83171+config GRKERNSEC_CHROOT_MOUNT
83172+ bool "Deny mounts"
83173+ default y if GRKERNSEC_CONFIG_AUTO
83174+ depends on GRKERNSEC_CHROOT
83175+ help
83176+ If you say Y here, processes inside a chroot will not be able to
83177+ mount or remount filesystems. If the sysctl option is enabled, a
83178+ sysctl option with name "chroot_deny_mount" is created.
83179+
83180+config GRKERNSEC_CHROOT_DOUBLE
83181+ bool "Deny double-chroots"
83182+ default y if GRKERNSEC_CONFIG_AUTO
83183+ depends on GRKERNSEC_CHROOT
83184+ help
83185+ If you say Y here, processes inside a chroot will not be able to chroot
83186+ again outside the chroot. This is a widely used method of breaking
83187+ out of a chroot jail and should not be allowed. If the sysctl
83188+ option is enabled, a sysctl option with name
83189+ "chroot_deny_chroot" is created.
83190+
83191+config GRKERNSEC_CHROOT_PIVOT
83192+ bool "Deny pivot_root in chroot"
83193+ default y if GRKERNSEC_CONFIG_AUTO
83194+ depends on GRKERNSEC_CHROOT
83195+ help
83196+ If you say Y here, processes inside a chroot will not be able to use
83197+ a function called pivot_root() that was introduced in Linux 2.3.41. It
83198+ works similar to chroot in that it changes the root filesystem. This
83199+ function could be misused in a chrooted process to attempt to break out
83200+ of the chroot, and therefore should not be allowed. If the sysctl
83201+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
83202+ created.
83203+
83204+config GRKERNSEC_CHROOT_CHDIR
83205+ bool "Enforce chdir(\"/\") on all chroots"
83206+ default y if GRKERNSEC_CONFIG_AUTO
83207+ depends on GRKERNSEC_CHROOT
83208+ help
83209+ If you say Y here, the current working directory of all newly-chrooted
83210+ applications will be set to the the root directory of the chroot.
83211+ The man page on chroot(2) states:
83212+ Note that this call does not change the current working
83213+ directory, so that `.' can be outside the tree rooted at
83214+ `/'. In particular, the super-user can escape from a
83215+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
83216+
83217+ It is recommended that you say Y here, since it's not known to break
83218+ any software. If the sysctl option is enabled, a sysctl option with
83219+ name "chroot_enforce_chdir" is created.
83220+
83221+config GRKERNSEC_CHROOT_CHMOD
83222+ bool "Deny (f)chmod +s"
83223+ default y if GRKERNSEC_CONFIG_AUTO
83224+ depends on GRKERNSEC_CHROOT
83225+ help
83226+ If you say Y here, processes inside a chroot will not be able to chmod
83227+ or fchmod files to make them have suid or sgid bits. This protects
83228+ against another published method of breaking a chroot. If the sysctl
83229+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
83230+ created.
83231+
83232+config GRKERNSEC_CHROOT_FCHDIR
83233+ bool "Deny fchdir and fhandle out of chroot"
83234+ default y if GRKERNSEC_CONFIG_AUTO
83235+ depends on GRKERNSEC_CHROOT
83236+ help
83237+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
83238+ to a file descriptor of the chrooting process that points to a directory
83239+ outside the filesystem will be stopped. Additionally, this option prevents
83240+ use of the recently-created syscall for opening files by a guessable "file
83241+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
83242+ with name "chroot_deny_fchdir" is created.
83243+
83244+config GRKERNSEC_CHROOT_MKNOD
83245+ bool "Deny mknod"
83246+ default y if GRKERNSEC_CONFIG_AUTO
83247+ depends on GRKERNSEC_CHROOT
83248+ help
83249+ If you say Y here, processes inside a chroot will not be allowed to
83250+ mknod. The problem with using mknod inside a chroot is that it
83251+ would allow an attacker to create a device entry that is the same
83252+ as one on the physical root of your system, which could range from
83253+ anything from the console device to a device for your harddrive (which
83254+ they could then use to wipe the drive or steal data). It is recommended
83255+ that you say Y here, unless you run into software incompatibilities.
83256+ If the sysctl option is enabled, a sysctl option with name
83257+ "chroot_deny_mknod" is created.
83258+
83259+config GRKERNSEC_CHROOT_SHMAT
83260+ bool "Deny shmat() out of chroot"
83261+ default y if GRKERNSEC_CONFIG_AUTO
83262+ depends on GRKERNSEC_CHROOT
83263+ help
83264+ If you say Y here, processes inside a chroot will not be able to attach
83265+ to shared memory segments that were created outside of the chroot jail.
83266+ It is recommended that you say Y here. If the sysctl option is enabled,
83267+ a sysctl option with name "chroot_deny_shmat" is created.
83268+
83269+config GRKERNSEC_CHROOT_UNIX
83270+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
83271+ default y if GRKERNSEC_CONFIG_AUTO
83272+ depends on GRKERNSEC_CHROOT
83273+ help
83274+ If you say Y here, processes inside a chroot will not be able to
83275+ connect to abstract (meaning not belonging to a filesystem) Unix
83276+ domain sockets that were bound outside of a chroot. It is recommended
83277+ that you say Y here. If the sysctl option is enabled, a sysctl option
83278+ with name "chroot_deny_unix" is created.
83279+
83280+config GRKERNSEC_CHROOT_FINDTASK
83281+ bool "Protect outside processes"
83282+ default y if GRKERNSEC_CONFIG_AUTO
83283+ depends on GRKERNSEC_CHROOT
83284+ help
83285+ If you say Y here, processes inside a chroot will not be able to
83286+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
83287+ getsid, or view any process outside of the chroot. If the sysctl
83288+ option is enabled, a sysctl option with name "chroot_findtask" is
83289+ created.
83290+
83291+config GRKERNSEC_CHROOT_NICE
83292+ bool "Restrict priority changes"
83293+ default y if GRKERNSEC_CONFIG_AUTO
83294+ depends on GRKERNSEC_CHROOT
83295+ help
83296+ If you say Y here, processes inside a chroot will not be able to raise
83297+ the priority of processes in the chroot, or alter the priority of
83298+ processes outside the chroot. This provides more security than simply
83299+ removing CAP_SYS_NICE from the process' capability set. If the
83300+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
83301+ is created.
83302+
83303+config GRKERNSEC_CHROOT_SYSCTL
83304+ bool "Deny sysctl writes"
83305+ default y if GRKERNSEC_CONFIG_AUTO
83306+ depends on GRKERNSEC_CHROOT
83307+ help
83308+ If you say Y here, an attacker in a chroot will not be able to
83309+ write to sysctl entries, either by sysctl(2) or through a /proc
83310+ interface. It is strongly recommended that you say Y here. If the
83311+ sysctl option is enabled, a sysctl option with name
83312+ "chroot_deny_sysctl" is created.
83313+
83314+config GRKERNSEC_CHROOT_RENAME
83315+ bool "Deny bad renames"
83316+ default y if GRKERNSEC_CONFIG_AUTO
83317+ depends on GRKERNSEC_CHROOT
83318+ help
83319+ If you say Y here, an attacker in a chroot will not be able to
83320+ abuse the ability to create double chroots to break out of the
83321+ chroot by exploiting a race condition between a rename of a directory
83322+ within a chroot against an open of a symlink with relative path
83323+ components. This feature will likewise prevent an accomplice outside
83324+ a chroot from enabling a user inside the chroot to break out and make
83325+ use of their credentials on the global filesystem. Enabling this
83326+ feature is essential to prevent root users from breaking out of a
83327+ chroot. If the sysctl option is enabled, a sysctl option with name
83328+ "chroot_deny_bad_rename" is created.
83329+
83330+config GRKERNSEC_CHROOT_CAPS
83331+ bool "Capability restrictions"
83332+ default y if GRKERNSEC_CONFIG_AUTO
83333+ depends on GRKERNSEC_CHROOT
83334+ help
83335+ If you say Y here, the capabilities on all processes within a
83336+ chroot jail will be lowered to stop module insertion, raw i/o,
83337+ system and net admin tasks, rebooting the system, modifying immutable
83338+ files, modifying IPC owned by another, and changing the system time.
83339+ This is left an option because it can break some apps. Disable this
83340+ if your chrooted apps are having problems performing those kinds of
83341+ tasks. If the sysctl option is enabled, a sysctl option with
83342+ name "chroot_caps" is created.
83343+
83344+config GRKERNSEC_CHROOT_INITRD
83345+ bool "Exempt initrd tasks from restrictions"
83346+ default y if GRKERNSEC_CONFIG_AUTO
83347+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
83348+ help
83349+ If you say Y here, tasks started prior to init will be exempted from
83350+ grsecurity's chroot restrictions. This option is mainly meant to
83351+ resolve Plymouth's performing privileged operations unnecessarily
83352+ in a chroot.
83353+
83354+endmenu
83355+menu "Kernel Auditing"
83356+depends on GRKERNSEC
83357+
83358+config GRKERNSEC_AUDIT_GROUP
83359+ bool "Single group for auditing"
83360+ help
83361+ If you say Y here, the exec and chdir logging features will only operate
83362+ on a group you specify. This option is recommended if you only want to
83363+ watch certain users instead of having a large amount of logs from the
83364+ entire system. If the sysctl option is enabled, a sysctl option with
83365+ name "audit_group" is created.
83366+
83367+config GRKERNSEC_AUDIT_GID
83368+ int "GID for auditing"
83369+ depends on GRKERNSEC_AUDIT_GROUP
83370+ default 1007
83371+
83372+config GRKERNSEC_EXECLOG
83373+ bool "Exec logging"
83374+ help
83375+ If you say Y here, all execve() calls will be logged (since the
83376+ other exec*() calls are frontends to execve(), all execution
83377+ will be logged). Useful for shell-servers that like to keep track
83378+ of their users. If the sysctl option is enabled, a sysctl option with
83379+ name "exec_logging" is created.
83380+ WARNING: This option when enabled will produce a LOT of logs, especially
83381+ on an active system.
83382+
83383+config GRKERNSEC_RESLOG
83384+ bool "Resource logging"
83385+ default y if GRKERNSEC_CONFIG_AUTO
83386+ help
83387+ If you say Y here, all attempts to overstep resource limits will
83388+ be logged with the resource name, the requested size, and the current
83389+ limit. It is highly recommended that you say Y here. If the sysctl
83390+ option is enabled, a sysctl option with name "resource_logging" is
83391+ created. If the RBAC system is enabled, the sysctl value is ignored.
83392+
83393+config GRKERNSEC_CHROOT_EXECLOG
83394+ bool "Log execs within chroot"
83395+ help
83396+ If you say Y here, all executions inside a chroot jail will be logged
83397+ to syslog. This can cause a large amount of logs if certain
83398+ applications (eg. djb's daemontools) are installed on the system, and
83399+ is therefore left as an option. If the sysctl option is enabled, a
83400+ sysctl option with name "chroot_execlog" is created.
83401+
83402+config GRKERNSEC_AUDIT_PTRACE
83403+ bool "Ptrace logging"
83404+ help
83405+ If you say Y here, all attempts to attach to a process via ptrace
83406+ will be logged. If the sysctl option is enabled, a sysctl option
83407+ with name "audit_ptrace" is created.
83408+
83409+config GRKERNSEC_AUDIT_CHDIR
83410+ bool "Chdir logging"
83411+ help
83412+ If you say Y here, all chdir() calls will be logged. If the sysctl
83413+ option is enabled, a sysctl option with name "audit_chdir" is created.
83414+
83415+config GRKERNSEC_AUDIT_MOUNT
83416+ bool "(Un)Mount logging"
83417+ help
83418+ If you say Y here, all mounts and unmounts will be logged. If the
83419+ sysctl option is enabled, a sysctl option with name "audit_mount" is
83420+ created.
83421+
83422+config GRKERNSEC_SIGNAL
83423+ bool "Signal logging"
83424+ default y if GRKERNSEC_CONFIG_AUTO
83425+ help
83426+ If you say Y here, certain important signals will be logged, such as
83427+ SIGSEGV, which will as a result inform you of when a error in a program
83428+ occurred, which in some cases could mean a possible exploit attempt.
83429+ If the sysctl option is enabled, a sysctl option with name
83430+ "signal_logging" is created.
83431+
83432+config GRKERNSEC_FORKFAIL
83433+ bool "Fork failure logging"
83434+ help
83435+ If you say Y here, all failed fork() attempts will be logged.
83436+ This could suggest a fork bomb, or someone attempting to overstep
83437+ their process limit. If the sysctl option is enabled, a sysctl option
83438+ with name "forkfail_logging" is created.
83439+
83440+config GRKERNSEC_TIME
83441+ bool "Time change logging"
83442+ default y if GRKERNSEC_CONFIG_AUTO
83443+ help
83444+ If you say Y here, any changes of the system clock will be logged.
83445+ If the sysctl option is enabled, a sysctl option with name
83446+ "timechange_logging" is created.
83447+
83448+config GRKERNSEC_PROC_IPADDR
83449+ bool "/proc/<pid>/ipaddr support"
83450+ default y if GRKERNSEC_CONFIG_AUTO
83451+ help
83452+ If you say Y here, a new entry will be added to each /proc/<pid>
83453+ directory that contains the IP address of the person using the task.
83454+ The IP is carried across local TCP and AF_UNIX stream sockets.
83455+ This information can be useful for IDS/IPSes to perform remote response
83456+ to a local attack. The entry is readable by only the owner of the
83457+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
83458+ the RBAC system), and thus does not create privacy concerns.
83459+
83460+config GRKERNSEC_RWXMAP_LOG
83461+ bool 'Denied RWX mmap/mprotect logging'
83462+ default y if GRKERNSEC_CONFIG_AUTO
83463+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
83464+ help
83465+ If you say Y here, calls to mmap() and mprotect() with explicit
83466+ usage of PROT_WRITE and PROT_EXEC together will be logged when
83467+ denied by the PAX_MPROTECT feature. This feature will also
83468+ log other problematic scenarios that can occur when PAX_MPROTECT
83469+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
83470+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
83471+ is created.
83472+
83473+endmenu
83474+
83475+menu "Executable Protections"
83476+depends on GRKERNSEC
83477+
83478+config GRKERNSEC_DMESG
83479+ bool "Dmesg(8) restriction"
83480+ default y if GRKERNSEC_CONFIG_AUTO
83481+ help
83482+ If you say Y here, non-root users will not be able to use dmesg(8)
83483+ to view the contents of the kernel's circular log buffer.
83484+ The kernel's log buffer often contains kernel addresses and other
83485+ identifying information useful to an attacker in fingerprinting a
83486+ system for a targeted exploit.
83487+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
83488+ created.
83489+
83490+config GRKERNSEC_HARDEN_PTRACE
83491+ bool "Deter ptrace-based process snooping"
83492+ default y if GRKERNSEC_CONFIG_AUTO
83493+ help
83494+ If you say Y here, TTY sniffers and other malicious monitoring
83495+ programs implemented through ptrace will be defeated. If you
83496+ have been using the RBAC system, this option has already been
83497+ enabled for several years for all users, with the ability to make
83498+ fine-grained exceptions.
83499+
83500+ This option only affects the ability of non-root users to ptrace
83501+ processes that are not a descendent of the ptracing process.
83502+ This means that strace ./binary and gdb ./binary will still work,
83503+ but attaching to arbitrary processes will not. If the sysctl
83504+ option is enabled, a sysctl option with name "harden_ptrace" is
83505+ created.
83506+
83507+config GRKERNSEC_PTRACE_READEXEC
83508+ bool "Require read access to ptrace sensitive binaries"
83509+ default y if GRKERNSEC_CONFIG_AUTO
83510+ help
83511+ If you say Y here, unprivileged users will not be able to ptrace unreadable
83512+ binaries. This option is useful in environments that
83513+ remove the read bits (e.g. file mode 4711) from suid binaries to
83514+ prevent infoleaking of their contents. This option adds
83515+ consistency to the use of that file mode, as the binary could normally
83516+ be read out when run without privileges while ptracing.
83517+
83518+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
83519+ is created.
83520+
83521+config GRKERNSEC_SETXID
83522+ bool "Enforce consistent multithreaded privileges"
83523+ default y if GRKERNSEC_CONFIG_AUTO
83524+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
83525+ help
83526+ If you say Y here, a change from a root uid to a non-root uid
83527+ in a multithreaded application will cause the resulting uids,
83528+ gids, supplementary groups, and capabilities in that thread
83529+ to be propagated to the other threads of the process. In most
83530+ cases this is unnecessary, as glibc will emulate this behavior
83531+ on behalf of the application. Other libcs do not act in the
83532+ same way, allowing the other threads of the process to continue
83533+ running with root privileges. If the sysctl option is enabled,
83534+ a sysctl option with name "consistent_setxid" is created.
83535+
83536+config GRKERNSEC_HARDEN_IPC
83537+ bool "Disallow access to overly-permissive IPC objects"
83538+ default y if GRKERNSEC_CONFIG_AUTO
83539+ depends on SYSVIPC
83540+ help
83541+ If you say Y here, access to overly-permissive IPC objects (shared
83542+ memory, message queues, and semaphores) will be denied for processes
83543+ given the following criteria beyond normal permission checks:
83544+ 1) If the IPC object is world-accessible and the euid doesn't match
83545+ that of the creator or current uid for the IPC object
83546+ 2) If the IPC object is group-accessible and the egid doesn't
83547+ match that of the creator or current gid for the IPC object
83548+ It's a common error to grant too much permission to these objects,
83549+ with impact ranging from denial of service and information leaking to
83550+ privilege escalation. This feature was developed in response to
83551+ research by Tim Brown:
83552+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
83553+ who found hundreds of such insecure usages. Processes with
83554+ CAP_IPC_OWNER are still permitted to access these IPC objects.
83555+ If the sysctl option is enabled, a sysctl option with name
83556+ "harden_ipc" is created.
83557+
83558+config GRKERNSEC_TPE
83559+ bool "Trusted Path Execution (TPE)"
83560+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83561+ help
83562+ If you say Y here, you will be able to choose a gid to add to the
83563+ supplementary groups of users you want to mark as "untrusted."
83564+ These users will not be able to execute any files that are not in
83565+ root-owned directories writable only by root. If the sysctl option
83566+ is enabled, a sysctl option with name "tpe" is created.
83567+
83568+config GRKERNSEC_TPE_ALL
83569+ bool "Partially restrict all non-root users"
83570+ depends on GRKERNSEC_TPE
83571+ help
83572+ If you say Y here, all non-root users will be covered under
83573+ a weaker TPE restriction. This is separate from, and in addition to,
83574+ the main TPE options that you have selected elsewhere. Thus, if a
83575+ "trusted" GID is chosen, this restriction applies to even that GID.
83576+ Under this restriction, all non-root users will only be allowed to
83577+ execute files in directories they own that are not group or
83578+ world-writable, or in directories owned by root and writable only by
83579+ root. If the sysctl option is enabled, a sysctl option with name
83580+ "tpe_restrict_all" is created.
83581+
83582+config GRKERNSEC_TPE_INVERT
83583+ bool "Invert GID option"
83584+ depends on GRKERNSEC_TPE
83585+ help
83586+ If you say Y here, the group you specify in the TPE configuration will
83587+ decide what group TPE restrictions will be *disabled* for. This
83588+ option is useful if you want TPE restrictions to be applied to most
83589+ users on the system. If the sysctl option is enabled, a sysctl option
83590+ with name "tpe_invert" is created. Unlike other sysctl options, this
83591+ entry will default to on for backward-compatibility.
83592+
83593+config GRKERNSEC_TPE_GID
83594+ int
83595+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
83596+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
83597+
83598+config GRKERNSEC_TPE_UNTRUSTED_GID
83599+ int "GID for TPE-untrusted users"
83600+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
83601+ default 1005
83602+ help
83603+ Setting this GID determines what group TPE restrictions will be
83604+ *enabled* for. If the sysctl option is enabled, a sysctl option
83605+ with name "tpe_gid" is created.
83606+
83607+config GRKERNSEC_TPE_TRUSTED_GID
83608+ int "GID for TPE-trusted users"
83609+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
83610+ default 1005
83611+ help
83612+ Setting this GID determines what group TPE restrictions will be
83613+ *disabled* for. If the sysctl option is enabled, a sysctl option
83614+ with name "tpe_gid" is created.
83615+
83616+endmenu
83617+menu "Network Protections"
83618+depends on GRKERNSEC
83619+
83620+config GRKERNSEC_BLACKHOLE
83621+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
83622+ default y if GRKERNSEC_CONFIG_AUTO
83623+ depends on NET
83624+ help
83625+ If you say Y here, neither TCP resets nor ICMP
83626+ destination-unreachable packets will be sent in response to packets
83627+ sent to ports for which no associated listening process exists.
83628+ It will also prevent the sending of ICMP protocol unreachable packets
83629+ in response to packets with unknown protocols.
83630+ This feature supports both IPV4 and IPV6 and exempts the
83631+ loopback interface from blackholing. Enabling this feature
83632+ makes a host more resilient to DoS attacks and reduces network
83633+ visibility against scanners.
83634+
83635+ The blackhole feature as-implemented is equivalent to the FreeBSD
83636+ blackhole feature, as it prevents RST responses to all packets, not
83637+ just SYNs. Under most application behavior this causes no
83638+ problems, but applications (like haproxy) may not close certain
83639+ connections in a way that cleanly terminates them on the remote
83640+ end, leaving the remote host in LAST_ACK state. Because of this
83641+ side-effect and to prevent intentional LAST_ACK DoSes, this
83642+ feature also adds automatic mitigation against such attacks.
83643+ The mitigation drastically reduces the amount of time a socket
83644+ can spend in LAST_ACK state. If you're using haproxy and not
83645+ all servers it connects to have this option enabled, consider
83646+ disabling this feature on the haproxy host.
83647+
83648+ If the sysctl option is enabled, two sysctl options with names
83649+ "ip_blackhole" and "lastack_retries" will be created.
83650+ While "ip_blackhole" takes the standard zero/non-zero on/off
83651+ toggle, "lastack_retries" uses the same kinds of values as
83652+ "tcp_retries1" and "tcp_retries2". The default value of 4
83653+ prevents a socket from lasting more than 45 seconds in LAST_ACK
83654+ state.
83655+
83656+config GRKERNSEC_NO_SIMULT_CONNECT
83657+ bool "Disable TCP Simultaneous Connect"
83658+ default y if GRKERNSEC_CONFIG_AUTO
83659+ depends on NET
83660+ help
83661+ If you say Y here, a feature by Willy Tarreau will be enabled that
83662+ removes a weakness in Linux's strict implementation of TCP that
83663+ allows two clients to connect to each other without either entering
83664+ a listening state. The weakness allows an attacker to easily prevent
83665+ a client from connecting to a known server provided the source port
83666+ for the connection is guessed correctly.
83667+
83668+ As the weakness could be used to prevent an antivirus or IPS from
83669+ fetching updates, or prevent an SSL gateway from fetching a CRL,
83670+ it should be eliminated by enabling this option. Though Linux is
83671+ one of few operating systems supporting simultaneous connect, it
83672+ has no legitimate use in practice and is rarely supported by firewalls.
83673+
83674+config GRKERNSEC_SOCKET
83675+ bool "Socket restrictions"
83676+ depends on NET
83677+ help
83678+ If you say Y here, you will be able to choose from several options.
83679+ If you assign a GID on your system and add it to the supplementary
83680+ groups of users you want to restrict socket access to, this patch
83681+ will perform up to three things, based on the option(s) you choose.
83682+
83683+config GRKERNSEC_SOCKET_ALL
83684+ bool "Deny any sockets to group"
83685+ depends on GRKERNSEC_SOCKET
83686+ help
83687+ If you say Y here, you will be able to choose a GID of whose users will
83688+ be unable to connect to other hosts from your machine or run server
83689+ applications from your machine. If the sysctl option is enabled, a
83690+ sysctl option with name "socket_all" is created.
83691+
83692+config GRKERNSEC_SOCKET_ALL_GID
83693+ int "GID to deny all sockets for"
83694+ depends on GRKERNSEC_SOCKET_ALL
83695+ default 1004
83696+ help
83697+ Here you can choose the GID to disable socket access for. Remember to
83698+ add the users you want socket access disabled for to the GID
83699+ specified here. If the sysctl option is enabled, a sysctl option
83700+ with name "socket_all_gid" is created.
83701+
83702+config GRKERNSEC_SOCKET_CLIENT
83703+ bool "Deny client sockets to group"
83704+ depends on GRKERNSEC_SOCKET
83705+ help
83706+ If you say Y here, you will be able to choose a GID of whose users will
83707+ be unable to connect to other hosts from your machine, but will be
83708+ able to run servers. If this option is enabled, all users in the group
83709+ you specify will have to use passive mode when initiating ftp transfers
83710+ from the shell on your machine. If the sysctl option is enabled, a
83711+ sysctl option with name "socket_client" is created.
83712+
83713+config GRKERNSEC_SOCKET_CLIENT_GID
83714+ int "GID to deny client sockets for"
83715+ depends on GRKERNSEC_SOCKET_CLIENT
83716+ default 1003
83717+ help
83718+ Here you can choose the GID to disable client socket access for.
83719+ Remember to add the users you want client socket access disabled for to
83720+ the GID specified here. If the sysctl option is enabled, a sysctl
83721+ option with name "socket_client_gid" is created.
83722+
83723+config GRKERNSEC_SOCKET_SERVER
83724+ bool "Deny server sockets to group"
83725+ depends on GRKERNSEC_SOCKET
83726+ help
83727+ If you say Y here, you will be able to choose a GID of whose users will
83728+ be unable to run server applications from your machine. If the sysctl
83729+ option is enabled, a sysctl option with name "socket_server" is created.
83730+
83731+config GRKERNSEC_SOCKET_SERVER_GID
83732+ int "GID to deny server sockets for"
83733+ depends on GRKERNSEC_SOCKET_SERVER
83734+ default 1002
83735+ help
83736+ Here you can choose the GID to disable server socket access for.
83737+ Remember to add the users you want server socket access disabled for to
83738+ the GID specified here. If the sysctl option is enabled, a sysctl
83739+ option with name "socket_server_gid" is created.
83740+
83741+endmenu
83742+
83743+menu "Physical Protections"
83744+depends on GRKERNSEC
83745+
83746+config GRKERNSEC_DENYUSB
83747+ bool "Deny new USB connections after toggle"
83748+ default y if GRKERNSEC_CONFIG_AUTO
83749+ depends on SYSCTL && USB_SUPPORT
83750+ help
83751+ If you say Y here, a new sysctl option with name "deny_new_usb"
83752+ will be created. Setting its value to 1 will prevent any new
83753+ USB devices from being recognized by the OS. Any attempted USB
83754+ device insertion will be logged. This option is intended to be
83755+ used against custom USB devices designed to exploit vulnerabilities
83756+ in various USB device drivers.
83757+
83758+ For greatest effectiveness, this sysctl should be set after any
83759+ relevant init scripts. This option is safe to enable in distros
83760+ as each user can choose whether or not to toggle the sysctl.
83761+
83762+config GRKERNSEC_DENYUSB_FORCE
83763+ bool "Reject all USB devices not connected at boot"
83764+ select USB
83765+ depends on GRKERNSEC_DENYUSB
83766+ help
83767+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
83768+ that doesn't involve a sysctl entry. This option should only be
83769+ enabled if you're sure you want to deny all new USB connections
83770+ at runtime and don't want to modify init scripts. This should not
83771+ be enabled by distros. It forces the core USB code to be built
83772+ into the kernel image so that all devices connected at boot time
83773+ can be recognized and new USB device connections can be prevented
83774+ prior to init running.
83775+
83776+endmenu
83777+
83778+menu "Sysctl Support"
83779+depends on GRKERNSEC && SYSCTL
83780+
83781+config GRKERNSEC_SYSCTL
83782+ bool "Sysctl support"
83783+ default y if GRKERNSEC_CONFIG_AUTO
83784+ help
83785+ If you say Y here, you will be able to change the options that
83786+ grsecurity runs with at bootup, without having to recompile your
83787+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
83788+ to enable (1) or disable (0) various features. All the sysctl entries
83789+ are mutable until the "grsec_lock" entry is set to a non-zero value.
83790+ All features enabled in the kernel configuration are disabled at boot
83791+ if you do not say Y to the "Turn on features by default" option.
83792+ All options should be set at startup, and the grsec_lock entry should
83793+ be set to a non-zero value after all the options are set.
83794+ *THIS IS EXTREMELY IMPORTANT*
83795+
83796+config GRKERNSEC_SYSCTL_DISTRO
83797+ bool "Extra sysctl support for distro makers (READ HELP)"
83798+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
83799+ help
83800+ If you say Y here, additional sysctl options will be created
83801+ for features that affect processes running as root. Therefore,
83802+ it is critical when using this option that the grsec_lock entry be
83803+ enabled after boot. Only distros with prebuilt kernel packages
83804+ with this option enabled that can ensure grsec_lock is enabled
83805+ after boot should use this option.
83806+ *Failure to set grsec_lock after boot makes all grsec features
83807+ this option covers useless*
83808+
83809+ Currently this option creates the following sysctl entries:
83810+ "Disable Privileged I/O": "disable_priv_io"
83811+
83812+config GRKERNSEC_SYSCTL_ON
83813+ bool "Turn on features by default"
83814+ default y if GRKERNSEC_CONFIG_AUTO
83815+ depends on GRKERNSEC_SYSCTL
83816+ help
83817+ If you say Y here, instead of having all features enabled in the
83818+ kernel configuration disabled at boot time, the features will be
83819+ enabled at boot time. It is recommended you say Y here unless
83820+ there is some reason you would want all sysctl-tunable features to
83821+ be disabled by default. As mentioned elsewhere, it is important
83822+ to enable the grsec_lock entry once you have finished modifying
83823+ the sysctl entries.
83824+
83825+endmenu
83826+menu "Logging Options"
83827+depends on GRKERNSEC
83828+
83829+config GRKERNSEC_FLOODTIME
83830+ int "Seconds in between log messages (minimum)"
83831+ default 10
83832+ help
83833+ This option allows you to enforce the number of seconds between
83834+ grsecurity log messages. The default should be suitable for most
83835+ people, however, if you choose to change it, choose a value small enough
83836+ to allow informative logs to be produced, but large enough to
83837+ prevent flooding.
83838+
83839+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
83840+ any rate limiting on grsecurity log messages.
83841+
83842+config GRKERNSEC_FLOODBURST
83843+ int "Number of messages in a burst (maximum)"
83844+ default 6
83845+ help
83846+ This option allows you to choose the maximum number of messages allowed
83847+ within the flood time interval you chose in a separate option. The
83848+ default should be suitable for most people, however if you find that
83849+ many of your logs are being interpreted as flooding, you may want to
83850+ raise this value.
83851+
83852+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
83853+ any rate limiting on grsecurity log messages.
83854+
83855+endmenu
83856diff --git a/grsecurity/Makefile b/grsecurity/Makefile
83857new file mode 100644
83858index 0000000..30ababb
83859--- /dev/null
83860+++ b/grsecurity/Makefile
83861@@ -0,0 +1,54 @@
83862+# grsecurity – access control and security hardening for Linux
83863+# All code in this directory and various hooks located throughout the Linux kernel are
83864+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
83865+# http://www.grsecurity.net spender@grsecurity.net
83866+#
83867+# This program is free software; you can redistribute it and/or
83868+# modify it under the terms of the GNU General Public License version 2
83869+# as published by the Free Software Foundation.
83870+#
83871+# This program is distributed in the hope that it will be useful,
83872+# but WITHOUT ANY WARRANTY; without even the implied warranty of
83873+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83874+# GNU General Public License for more details.
83875+#
83876+# You should have received a copy of the GNU General Public License
83877+# along with this program; if not, write to the Free Software
83878+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
83879+
83880+KBUILD_CFLAGS += -Werror
83881+
83882+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
83883+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
83884+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
83885+ grsec_usb.o grsec_ipc.o grsec_proc.o
83886+
83887+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
83888+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
83889+ gracl_learn.o grsec_log.o gracl_policy.o
83890+ifdef CONFIG_COMPAT
83891+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
83892+endif
83893+
83894+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
83895+
83896+ifdef CONFIG_NET
83897+obj-y += grsec_sock.o
83898+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
83899+endif
83900+
83901+ifndef CONFIG_GRKERNSEC
83902+obj-y += grsec_disabled.o
83903+endif
83904+
83905+ifdef CONFIG_GRKERNSEC_HIDESYM
83906+extra-y := grsec_hidesym.o
83907+$(obj)/grsec_hidesym.o:
83908+ @-chmod -f 500 /boot
83909+ @-chmod -f 500 /lib/modules
83910+ @-chmod -f 500 /lib64/modules
83911+ @-chmod -f 500 /lib32/modules
83912+ @-chmod -f 700 .
83913+ @-chmod -f 700 $(objtree)
83914+ @echo ' grsec: protected kernel image paths'
83915+endif
83916diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
83917new file mode 100644
83918index 0000000..7ad630a
83919--- /dev/null
83920+++ b/grsecurity/gracl.c
83921@@ -0,0 +1,2757 @@
83922+#include <linux/kernel.h>
83923+#include <linux/module.h>
83924+#include <linux/sched.h>
83925+#include <linux/mm.h>
83926+#include <linux/file.h>
83927+#include <linux/fs.h>
83928+#include <linux/namei.h>
83929+#include <linux/mount.h>
83930+#include <linux/tty.h>
83931+#include <linux/proc_fs.h>
83932+#include <linux/lglock.h>
83933+#include <linux/slab.h>
83934+#include <linux/vmalloc.h>
83935+#include <linux/types.h>
83936+#include <linux/sysctl.h>
83937+#include <linux/netdevice.h>
83938+#include <linux/ptrace.h>
83939+#include <linux/gracl.h>
83940+#include <linux/gralloc.h>
83941+#include <linux/security.h>
83942+#include <linux/grinternal.h>
83943+#include <linux/pid_namespace.h>
83944+#include <linux/stop_machine.h>
83945+#include <linux/fdtable.h>
83946+#include <linux/percpu.h>
83947+#include <linux/lglock.h>
83948+#include <linux/hugetlb.h>
83949+#include <linux/posix-timers.h>
83950+#include <linux/prefetch.h>
83951+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83952+#include <linux/magic.h>
83953+#include <linux/pagemap.h>
83954+#include "../fs/btrfs/async-thread.h"
83955+#include "../fs/btrfs/ctree.h"
83956+#include "../fs/btrfs/btrfs_inode.h"
83957+#endif
83958+#include "../fs/mount.h"
83959+
83960+#include <asm/uaccess.h>
83961+#include <asm/errno.h>
83962+#include <asm/mman.h>
83963+
83964+#define FOR_EACH_ROLE_START(role) \
83965+ role = running_polstate.role_list; \
83966+ while (role) {
83967+
83968+#define FOR_EACH_ROLE_END(role) \
83969+ role = role->prev; \
83970+ }
83971+
83972+extern struct path gr_real_root;
83973+
83974+static struct gr_policy_state running_polstate;
83975+struct gr_policy_state *polstate = &running_polstate;
83976+extern struct gr_alloc_state *current_alloc_state;
83977+
83978+extern char *gr_shared_page[4];
83979+DEFINE_RWLOCK(gr_inode_lock);
83980+
83981+static unsigned int gr_status __read_only = GR_STATUS_INIT;
83982+
83983+#ifdef CONFIG_NET
83984+extern struct vfsmount *sock_mnt;
83985+#endif
83986+
83987+extern struct vfsmount *pipe_mnt;
83988+extern struct vfsmount *shm_mnt;
83989+
83990+#ifdef CONFIG_HUGETLBFS
83991+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
83992+#endif
83993+
83994+extern u16 acl_sp_role_value;
83995+extern struct acl_object_label *fakefs_obj_rw;
83996+extern struct acl_object_label *fakefs_obj_rwx;
83997+
83998+int gr_acl_is_enabled(void)
83999+{
84000+ return (gr_status & GR_READY);
84001+}
84002+
84003+void gr_enable_rbac_system(void)
84004+{
84005+ pax_open_kernel();
84006+ gr_status |= GR_READY;
84007+ pax_close_kernel();
84008+}
84009+
84010+int gr_rbac_disable(void *unused)
84011+{
84012+ pax_open_kernel();
84013+ gr_status &= ~GR_READY;
84014+ pax_close_kernel();
84015+
84016+ return 0;
84017+}
84018+
84019+static inline dev_t __get_dev(const struct dentry *dentry)
84020+{
84021+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
84022+
84023+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
84024+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
84025+ return BTRFS_I(d_inode(ldentry))->root->anon_dev;
84026+ else
84027+#endif
84028+ return d_inode(ldentry)->i_sb->s_dev;
84029+}
84030+
84031+static inline u64 __get_ino(const struct dentry *dentry)
84032+{
84033+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
84034+
84035+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
84036+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
84037+ return btrfs_ino(d_inode(dentry));
84038+ else
84039+#endif
84040+ return d_inode(ldentry)->i_ino;
84041+}
84042+
84043+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
84044+{
84045+ return __get_dev(dentry);
84046+}
84047+
84048+u64 gr_get_ino_from_dentry(struct dentry *dentry)
84049+{
84050+ return __get_ino(dentry);
84051+}
84052+
84053+static char gr_task_roletype_to_char(struct task_struct *task)
84054+{
84055+ switch (task->role->roletype &
84056+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
84057+ GR_ROLE_SPECIAL)) {
84058+ case GR_ROLE_DEFAULT:
84059+ return 'D';
84060+ case GR_ROLE_USER:
84061+ return 'U';
84062+ case GR_ROLE_GROUP:
84063+ return 'G';
84064+ case GR_ROLE_SPECIAL:
84065+ return 'S';
84066+ }
84067+
84068+ return 'X';
84069+}
84070+
84071+char gr_roletype_to_char(void)
84072+{
84073+ return gr_task_roletype_to_char(current);
84074+}
84075+
84076+int
84077+gr_acl_tpe_check(void)
84078+{
84079+ if (unlikely(!(gr_status & GR_READY)))
84080+ return 0;
84081+ if (current->role->roletype & GR_ROLE_TPE)
84082+ return 1;
84083+ else
84084+ return 0;
84085+}
84086+
84087+int
84088+gr_handle_rawio(const struct inode *inode)
84089+{
84090+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84091+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
84092+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
84093+ !capable(CAP_SYS_RAWIO))
84094+ return 1;
84095+#endif
84096+ return 0;
84097+}
84098+
84099+int
84100+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
84101+{
84102+ if (likely(lena != lenb))
84103+ return 0;
84104+
84105+ return !memcmp(a, b, lena);
84106+}
84107+
84108+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
84109+{
84110+ *buflen -= namelen;
84111+ if (*buflen < 0)
84112+ return -ENAMETOOLONG;
84113+ *buffer -= namelen;
84114+ memcpy(*buffer, str, namelen);
84115+ return 0;
84116+}
84117+
84118+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
84119+{
84120+ return prepend(buffer, buflen, name->name, name->len);
84121+}
84122+
84123+static int prepend_path(const struct path *path, struct path *root,
84124+ char **buffer, int *buflen)
84125+{
84126+ struct dentry *dentry = path->dentry;
84127+ struct vfsmount *vfsmnt = path->mnt;
84128+ struct mount *mnt = real_mount(vfsmnt);
84129+ bool slash = false;
84130+ int error = 0;
84131+
84132+ while (dentry != root->dentry || vfsmnt != root->mnt) {
84133+ struct dentry * parent;
84134+
84135+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
84136+ /* Global root? */
84137+ if (!mnt_has_parent(mnt)) {
84138+ goto out;
84139+ }
84140+ dentry = mnt->mnt_mountpoint;
84141+ mnt = mnt->mnt_parent;
84142+ vfsmnt = &mnt->mnt;
84143+ continue;
84144+ }
84145+ parent = dentry->d_parent;
84146+ prefetch(parent);
84147+ spin_lock(&dentry->d_lock);
84148+ error = prepend_name(buffer, buflen, &dentry->d_name);
84149+ spin_unlock(&dentry->d_lock);
84150+ if (!error)
84151+ error = prepend(buffer, buflen, "/", 1);
84152+ if (error)
84153+ break;
84154+
84155+ slash = true;
84156+ dentry = parent;
84157+ }
84158+
84159+out:
84160+ if (!error && !slash)
84161+ error = prepend(buffer, buflen, "/", 1);
84162+
84163+ return error;
84164+}
84165+
84166+/* this must be called with mount_lock and rename_lock held */
84167+
84168+static char *__our_d_path(const struct path *path, struct path *root,
84169+ char *buf, int buflen)
84170+{
84171+ char *res = buf + buflen;
84172+ int error;
84173+
84174+ prepend(&res, &buflen, "\0", 1);
84175+ error = prepend_path(path, root, &res, &buflen);
84176+ if (error)
84177+ return ERR_PTR(error);
84178+
84179+ return res;
84180+}
84181+
84182+static char *
84183+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
84184+{
84185+ char *retval;
84186+
84187+ retval = __our_d_path(path, root, buf, buflen);
84188+ if (unlikely(IS_ERR(retval)))
84189+ retval = strcpy(buf, "<path too long>");
84190+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
84191+ retval[1] = '\0';
84192+
84193+ return retval;
84194+}
84195+
84196+static char *
84197+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
84198+ char *buf, int buflen)
84199+{
84200+ struct path path;
84201+ char *res;
84202+
84203+ path.dentry = (struct dentry *)dentry;
84204+ path.mnt = (struct vfsmount *)vfsmnt;
84205+
84206+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
84207+ by the RBAC system */
84208+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
84209+
84210+ return res;
84211+}
84212+
84213+static char *
84214+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
84215+ char *buf, int buflen)
84216+{
84217+ char *res;
84218+ struct path path;
84219+ struct path root;
84220+ struct task_struct *reaper = init_pid_ns.child_reaper;
84221+
84222+ path.dentry = (struct dentry *)dentry;
84223+ path.mnt = (struct vfsmount *)vfsmnt;
84224+
84225+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
84226+ get_fs_root(reaper->fs, &root);
84227+
84228+ read_seqlock_excl(&mount_lock);
84229+ write_seqlock(&rename_lock);
84230+ res = gen_full_path(&path, &root, buf, buflen);
84231+ write_sequnlock(&rename_lock);
84232+ read_sequnlock_excl(&mount_lock);
84233+
84234+ path_put(&root);
84235+ return res;
84236+}
84237+
84238+char *
84239+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
84240+{
84241+ char *ret;
84242+ read_seqlock_excl(&mount_lock);
84243+ write_seqlock(&rename_lock);
84244+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
84245+ PAGE_SIZE);
84246+ write_sequnlock(&rename_lock);
84247+ read_sequnlock_excl(&mount_lock);
84248+ return ret;
84249+}
84250+
84251+static char *
84252+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
84253+{
84254+ char *ret;
84255+ char *buf;
84256+ int buflen;
84257+
84258+ read_seqlock_excl(&mount_lock);
84259+ write_seqlock(&rename_lock);
84260+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
84261+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
84262+ buflen = (int)(ret - buf);
84263+ if (buflen >= 5)
84264+ prepend(&ret, &buflen, "/proc", 5);
84265+ else
84266+ ret = strcpy(buf, "<path too long>");
84267+ write_sequnlock(&rename_lock);
84268+ read_sequnlock_excl(&mount_lock);
84269+ return ret;
84270+}
84271+
84272+char *
84273+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
84274+{
84275+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
84276+ PAGE_SIZE);
84277+}
84278+
84279+char *
84280+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
84281+{
84282+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
84283+ PAGE_SIZE);
84284+}
84285+
84286+char *
84287+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
84288+{
84289+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
84290+ PAGE_SIZE);
84291+}
84292+
84293+char *
84294+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
84295+{
84296+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
84297+ PAGE_SIZE);
84298+}
84299+
84300+char *
84301+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
84302+{
84303+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
84304+ PAGE_SIZE);
84305+}
84306+
84307+__u32
84308+to_gr_audit(const __u32 reqmode)
84309+{
84310+ /* masks off auditable permission flags, then shifts them to create
84311+ auditing flags, and adds the special case of append auditing if
84312+ we're requesting write */
84313+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
84314+}
84315+
84316+struct acl_role_label *
84317+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
84318+ const gid_t gid)
84319+{
84320+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
84321+ struct acl_role_label *match;
84322+ struct role_allowed_ip *ipp;
84323+ unsigned int x;
84324+ u32 curr_ip = task->signal->saved_ip;
84325+
84326+ match = state->acl_role_set.r_hash[index];
84327+
84328+ while (match) {
84329+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
84330+ for (x = 0; x < match->domain_child_num; x++) {
84331+ if (match->domain_children[x] == uid)
84332+ goto found;
84333+ }
84334+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
84335+ break;
84336+ match = match->next;
84337+ }
84338+found:
84339+ if (match == NULL) {
84340+ try_group:
84341+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
84342+ match = state->acl_role_set.r_hash[index];
84343+
84344+ while (match) {
84345+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
84346+ for (x = 0; x < match->domain_child_num; x++) {
84347+ if (match->domain_children[x] == gid)
84348+ goto found2;
84349+ }
84350+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
84351+ break;
84352+ match = match->next;
84353+ }
84354+found2:
84355+ if (match == NULL)
84356+ match = state->default_role;
84357+ if (match->allowed_ips == NULL)
84358+ return match;
84359+ else {
84360+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84361+ if (likely
84362+ ((ntohl(curr_ip) & ipp->netmask) ==
84363+ (ntohl(ipp->addr) & ipp->netmask)))
84364+ return match;
84365+ }
84366+ match = state->default_role;
84367+ }
84368+ } else if (match->allowed_ips == NULL) {
84369+ return match;
84370+ } else {
84371+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84372+ if (likely
84373+ ((ntohl(curr_ip) & ipp->netmask) ==
84374+ (ntohl(ipp->addr) & ipp->netmask)))
84375+ return match;
84376+ }
84377+ goto try_group;
84378+ }
84379+
84380+ return match;
84381+}
84382+
84383+static struct acl_role_label *
84384+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
84385+ const gid_t gid)
84386+{
84387+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
84388+}
84389+
84390+struct acl_subject_label *
84391+lookup_acl_subj_label(const u64 ino, const dev_t dev,
84392+ const struct acl_role_label *role)
84393+{
84394+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84395+ struct acl_subject_label *match;
84396+
84397+ match = role->subj_hash[index];
84398+
84399+ while (match && (match->inode != ino || match->device != dev ||
84400+ (match->mode & GR_DELETED))) {
84401+ match = match->next;
84402+ }
84403+
84404+ if (match && !(match->mode & GR_DELETED))
84405+ return match;
84406+ else
84407+ return NULL;
84408+}
84409+
84410+struct acl_subject_label *
84411+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
84412+ const struct acl_role_label *role)
84413+{
84414+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84415+ struct acl_subject_label *match;
84416+
84417+ match = role->subj_hash[index];
84418+
84419+ while (match && (match->inode != ino || match->device != dev ||
84420+ !(match->mode & GR_DELETED))) {
84421+ match = match->next;
84422+ }
84423+
84424+ if (match && (match->mode & GR_DELETED))
84425+ return match;
84426+ else
84427+ return NULL;
84428+}
84429+
84430+static struct acl_object_label *
84431+lookup_acl_obj_label(const u64 ino, const dev_t dev,
84432+ const struct acl_subject_label *subj)
84433+{
84434+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84435+ struct acl_object_label *match;
84436+
84437+ match = subj->obj_hash[index];
84438+
84439+ while (match && (match->inode != ino || match->device != dev ||
84440+ (match->mode & GR_DELETED))) {
84441+ match = match->next;
84442+ }
84443+
84444+ if (match && !(match->mode & GR_DELETED))
84445+ return match;
84446+ else
84447+ return NULL;
84448+}
84449+
84450+static struct acl_object_label *
84451+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
84452+ const struct acl_subject_label *subj)
84453+{
84454+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84455+ struct acl_object_label *match;
84456+
84457+ match = subj->obj_hash[index];
84458+
84459+ while (match && (match->inode != ino || match->device != dev ||
84460+ !(match->mode & GR_DELETED))) {
84461+ match = match->next;
84462+ }
84463+
84464+ if (match && (match->mode & GR_DELETED))
84465+ return match;
84466+
84467+ match = subj->obj_hash[index];
84468+
84469+ while (match && (match->inode != ino || match->device != dev ||
84470+ (match->mode & GR_DELETED))) {
84471+ match = match->next;
84472+ }
84473+
84474+ if (match && !(match->mode & GR_DELETED))
84475+ return match;
84476+ else
84477+ return NULL;
84478+}
84479+
84480+struct name_entry *
84481+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
84482+{
84483+ unsigned int len = strlen(name);
84484+ unsigned int key = full_name_hash(name, len);
84485+ unsigned int index = key % state->name_set.n_size;
84486+ struct name_entry *match;
84487+
84488+ match = state->name_set.n_hash[index];
84489+
84490+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
84491+ match = match->next;
84492+
84493+ return match;
84494+}
84495+
84496+static struct name_entry *
84497+lookup_name_entry(const char *name)
84498+{
84499+ return __lookup_name_entry(&running_polstate, name);
84500+}
84501+
84502+static struct name_entry *
84503+lookup_name_entry_create(const char *name)
84504+{
84505+ unsigned int len = strlen(name);
84506+ unsigned int key = full_name_hash(name, len);
84507+ unsigned int index = key % running_polstate.name_set.n_size;
84508+ struct name_entry *match;
84509+
84510+ match = running_polstate.name_set.n_hash[index];
84511+
84512+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84513+ !match->deleted))
84514+ match = match->next;
84515+
84516+ if (match && match->deleted)
84517+ return match;
84518+
84519+ match = running_polstate.name_set.n_hash[index];
84520+
84521+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84522+ match->deleted))
84523+ match = match->next;
84524+
84525+ if (match && !match->deleted)
84526+ return match;
84527+ else
84528+ return NULL;
84529+}
84530+
84531+static struct inodev_entry *
84532+lookup_inodev_entry(const u64 ino, const dev_t dev)
84533+{
84534+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
84535+ struct inodev_entry *match;
84536+
84537+ match = running_polstate.inodev_set.i_hash[index];
84538+
84539+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
84540+ match = match->next;
84541+
84542+ return match;
84543+}
84544+
84545+void
84546+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
84547+{
84548+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
84549+ state->inodev_set.i_size);
84550+ struct inodev_entry **curr;
84551+
84552+ entry->prev = NULL;
84553+
84554+ curr = &state->inodev_set.i_hash[index];
84555+ if (*curr != NULL)
84556+ (*curr)->prev = entry;
84557+
84558+ entry->next = *curr;
84559+ *curr = entry;
84560+
84561+ return;
84562+}
84563+
84564+static void
84565+insert_inodev_entry(struct inodev_entry *entry)
84566+{
84567+ __insert_inodev_entry(&running_polstate, entry);
84568+}
84569+
84570+void
84571+insert_acl_obj_label(struct acl_object_label *obj,
84572+ struct acl_subject_label *subj)
84573+{
84574+ unsigned int index =
84575+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
84576+ struct acl_object_label **curr;
84577+
84578+ obj->prev = NULL;
84579+
84580+ curr = &subj->obj_hash[index];
84581+ if (*curr != NULL)
84582+ (*curr)->prev = obj;
84583+
84584+ obj->next = *curr;
84585+ *curr = obj;
84586+
84587+ return;
84588+}
84589+
84590+void
84591+insert_acl_subj_label(struct acl_subject_label *obj,
84592+ struct acl_role_label *role)
84593+{
84594+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
84595+ struct acl_subject_label **curr;
84596+
84597+ obj->prev = NULL;
84598+
84599+ curr = &role->subj_hash[index];
84600+ if (*curr != NULL)
84601+ (*curr)->prev = obj;
84602+
84603+ obj->next = *curr;
84604+ *curr = obj;
84605+
84606+ return;
84607+}
84608+
84609+/* derived from glibc fnmatch() 0: match, 1: no match*/
84610+
84611+static int
84612+glob_match(const char *p, const char *n)
84613+{
84614+ char c;
84615+
84616+ while ((c = *p++) != '\0') {
84617+ switch (c) {
84618+ case '?':
84619+ if (*n == '\0')
84620+ return 1;
84621+ else if (*n == '/')
84622+ return 1;
84623+ break;
84624+ case '\\':
84625+ if (*n != c)
84626+ return 1;
84627+ break;
84628+ case '*':
84629+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
84630+ if (*n == '/')
84631+ return 1;
84632+ else if (c == '?') {
84633+ if (*n == '\0')
84634+ return 1;
84635+ else
84636+ ++n;
84637+ }
84638+ }
84639+ if (c == '\0') {
84640+ return 0;
84641+ } else {
84642+ const char *endp;
84643+
84644+ if ((endp = strchr(n, '/')) == NULL)
84645+ endp = n + strlen(n);
84646+
84647+ if (c == '[') {
84648+ for (--p; n < endp; ++n)
84649+ if (!glob_match(p, n))
84650+ return 0;
84651+ } else if (c == '/') {
84652+ while (*n != '\0' && *n != '/')
84653+ ++n;
84654+ if (*n == '/' && !glob_match(p, n + 1))
84655+ return 0;
84656+ } else {
84657+ for (--p; n < endp; ++n)
84658+ if (*n == c && !glob_match(p, n))
84659+ return 0;
84660+ }
84661+
84662+ return 1;
84663+ }
84664+ case '[':
84665+ {
84666+ int not;
84667+ char cold;
84668+
84669+ if (*n == '\0' || *n == '/')
84670+ return 1;
84671+
84672+ not = (*p == '!' || *p == '^');
84673+ if (not)
84674+ ++p;
84675+
84676+ c = *p++;
84677+ for (;;) {
84678+ unsigned char fn = (unsigned char)*n;
84679+
84680+ if (c == '\0')
84681+ return 1;
84682+ else {
84683+ if (c == fn)
84684+ goto matched;
84685+ cold = c;
84686+ c = *p++;
84687+
84688+ if (c == '-' && *p != ']') {
84689+ unsigned char cend = *p++;
84690+
84691+ if (cend == '\0')
84692+ return 1;
84693+
84694+ if (cold <= fn && fn <= cend)
84695+ goto matched;
84696+
84697+ c = *p++;
84698+ }
84699+ }
84700+
84701+ if (c == ']')
84702+ break;
84703+ }
84704+ if (!not)
84705+ return 1;
84706+ break;
84707+ matched:
84708+ while (c != ']') {
84709+ if (c == '\0')
84710+ return 1;
84711+
84712+ c = *p++;
84713+ }
84714+ if (not)
84715+ return 1;
84716+ }
84717+ break;
84718+ default:
84719+ if (c != *n)
84720+ return 1;
84721+ }
84722+
84723+ ++n;
84724+ }
84725+
84726+ if (*n == '\0')
84727+ return 0;
84728+
84729+ if (*n == '/')
84730+ return 0;
84731+
84732+ return 1;
84733+}
84734+
84735+static struct acl_object_label *
84736+chk_glob_label(struct acl_object_label *globbed,
84737+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
84738+{
84739+ struct acl_object_label *tmp;
84740+
84741+ if (*path == NULL)
84742+ *path = gr_to_filename_nolock(dentry, mnt);
84743+
84744+ tmp = globbed;
84745+
84746+ while (tmp) {
84747+ if (!glob_match(tmp->filename, *path))
84748+ return tmp;
84749+ tmp = tmp->next;
84750+ }
84751+
84752+ return NULL;
84753+}
84754+
84755+static struct acl_object_label *
84756+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84757+ const u64 curr_ino, const dev_t curr_dev,
84758+ const struct acl_subject_label *subj, char **path, const int checkglob)
84759+{
84760+ struct acl_subject_label *tmpsubj;
84761+ struct acl_object_label *retval;
84762+ struct acl_object_label *retval2;
84763+
84764+ tmpsubj = (struct acl_subject_label *) subj;
84765+ read_lock(&gr_inode_lock);
84766+ do {
84767+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
84768+ if (retval) {
84769+ if (checkglob && retval->globbed) {
84770+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
84771+ if (retval2)
84772+ retval = retval2;
84773+ }
84774+ break;
84775+ }
84776+ } while ((tmpsubj = tmpsubj->parent_subject));
84777+ read_unlock(&gr_inode_lock);
84778+
84779+ return retval;
84780+}
84781+
84782+static struct acl_object_label *
84783+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84784+ struct dentry *curr_dentry,
84785+ const struct acl_subject_label *subj, char **path, const int checkglob)
84786+{
84787+ int newglob = checkglob;
84788+ u64 inode;
84789+ dev_t device;
84790+
84791+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
84792+ as we don't want a / * rule to match instead of the / object
84793+ don't do this for create lookups that call this function though, since they're looking up
84794+ on the parent and thus need globbing checks on all paths
84795+ */
84796+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
84797+ newglob = GR_NO_GLOB;
84798+
84799+ spin_lock(&curr_dentry->d_lock);
84800+ inode = __get_ino(curr_dentry);
84801+ device = __get_dev(curr_dentry);
84802+ spin_unlock(&curr_dentry->d_lock);
84803+
84804+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
84805+}
84806+
84807+#ifdef CONFIG_HUGETLBFS
84808+static inline bool
84809+is_hugetlbfs_mnt(const struct vfsmount *mnt)
84810+{
84811+ int i;
84812+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
84813+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
84814+ return true;
84815+ }
84816+
84817+ return false;
84818+}
84819+#endif
84820+
84821+static struct acl_object_label *
84822+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84823+ const struct acl_subject_label *subj, char *path, const int checkglob)
84824+{
84825+ struct dentry *dentry = (struct dentry *) l_dentry;
84826+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84827+ struct inode * inode = d_backing_inode(dentry);
84828+ struct mount *real_mnt = real_mount(mnt);
84829+ struct acl_object_label *retval;
84830+ struct dentry *parent;
84831+
84832+ read_seqlock_excl(&mount_lock);
84833+ write_seqlock(&rename_lock);
84834+
84835+ if (unlikely((mnt == shm_mnt && inode->i_nlink == 0) || mnt == pipe_mnt ||
84836+#ifdef CONFIG_NET
84837+ mnt == sock_mnt ||
84838+#endif
84839+#ifdef CONFIG_HUGETLBFS
84840+ (is_hugetlbfs_mnt(mnt) && inode->i_nlink == 0) ||
84841+#endif
84842+ /* ignore Eric Biederman */
84843+ IS_PRIVATE(inode))) {
84844+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
84845+ goto out;
84846+ }
84847+
84848+ for (;;) {
84849+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84850+ break;
84851+
84852+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84853+ if (!mnt_has_parent(real_mnt))
84854+ break;
84855+
84856+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84857+ if (retval != NULL)
84858+ goto out;
84859+
84860+ dentry = real_mnt->mnt_mountpoint;
84861+ real_mnt = real_mnt->mnt_parent;
84862+ mnt = &real_mnt->mnt;
84863+ continue;
84864+ }
84865+
84866+ parent = dentry->d_parent;
84867+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84868+ if (retval != NULL)
84869+ goto out;
84870+
84871+ dentry = parent;
84872+ }
84873+
84874+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84875+
84876+ /* gr_real_root is pinned so we don't have to hold a reference */
84877+ if (retval == NULL)
84878+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
84879+out:
84880+ write_sequnlock(&rename_lock);
84881+ read_sequnlock_excl(&mount_lock);
84882+
84883+ BUG_ON(retval == NULL);
84884+
84885+ return retval;
84886+}
84887+
84888+static struct acl_object_label *
84889+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84890+ const struct acl_subject_label *subj)
84891+{
84892+ char *path = NULL;
84893+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
84894+}
84895+
84896+static struct acl_object_label *
84897+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84898+ const struct acl_subject_label *subj)
84899+{
84900+ char *path = NULL;
84901+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
84902+}
84903+
84904+static struct acl_object_label *
84905+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84906+ const struct acl_subject_label *subj, char *path)
84907+{
84908+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
84909+}
84910+
84911+struct acl_subject_label *
84912+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84913+ const struct acl_role_label *role)
84914+{
84915+ struct dentry *dentry = (struct dentry *) l_dentry;
84916+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84917+ struct mount *real_mnt = real_mount(mnt);
84918+ struct acl_subject_label *retval;
84919+ struct dentry *parent;
84920+
84921+ read_seqlock_excl(&mount_lock);
84922+ write_seqlock(&rename_lock);
84923+
84924+ for (;;) {
84925+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84926+ break;
84927+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84928+ if (!mnt_has_parent(real_mnt))
84929+ break;
84930+
84931+ spin_lock(&dentry->d_lock);
84932+ read_lock(&gr_inode_lock);
84933+ retval =
84934+ lookup_acl_subj_label(__get_ino(dentry),
84935+ __get_dev(dentry), role);
84936+ read_unlock(&gr_inode_lock);
84937+ spin_unlock(&dentry->d_lock);
84938+ if (retval != NULL)
84939+ goto out;
84940+
84941+ dentry = real_mnt->mnt_mountpoint;
84942+ real_mnt = real_mnt->mnt_parent;
84943+ mnt = &real_mnt->mnt;
84944+ continue;
84945+ }
84946+
84947+ spin_lock(&dentry->d_lock);
84948+ read_lock(&gr_inode_lock);
84949+ retval = lookup_acl_subj_label(__get_ino(dentry),
84950+ __get_dev(dentry), role);
84951+ read_unlock(&gr_inode_lock);
84952+ parent = dentry->d_parent;
84953+ spin_unlock(&dentry->d_lock);
84954+
84955+ if (retval != NULL)
84956+ goto out;
84957+
84958+ dentry = parent;
84959+ }
84960+
84961+ spin_lock(&dentry->d_lock);
84962+ read_lock(&gr_inode_lock);
84963+ retval = lookup_acl_subj_label(__get_ino(dentry),
84964+ __get_dev(dentry), role);
84965+ read_unlock(&gr_inode_lock);
84966+ spin_unlock(&dentry->d_lock);
84967+
84968+ if (unlikely(retval == NULL)) {
84969+ /* gr_real_root is pinned, we don't need to hold a reference */
84970+ read_lock(&gr_inode_lock);
84971+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
84972+ __get_dev(gr_real_root.dentry), role);
84973+ read_unlock(&gr_inode_lock);
84974+ }
84975+out:
84976+ write_sequnlock(&rename_lock);
84977+ read_sequnlock_excl(&mount_lock);
84978+
84979+ BUG_ON(retval == NULL);
84980+
84981+ return retval;
84982+}
84983+
84984+void
84985+assign_special_role(const char *rolename)
84986+{
84987+ struct acl_object_label *obj;
84988+ struct acl_role_label *r;
84989+ struct acl_role_label *assigned = NULL;
84990+ struct task_struct *tsk;
84991+ struct file *filp;
84992+
84993+ FOR_EACH_ROLE_START(r)
84994+ if (!strcmp(rolename, r->rolename) &&
84995+ (r->roletype & GR_ROLE_SPECIAL)) {
84996+ assigned = r;
84997+ break;
84998+ }
84999+ FOR_EACH_ROLE_END(r)
85000+
85001+ if (!assigned)
85002+ return;
85003+
85004+ read_lock(&tasklist_lock);
85005+ read_lock(&grsec_exec_file_lock);
85006+
85007+ tsk = current->real_parent;
85008+ if (tsk == NULL)
85009+ goto out_unlock;
85010+
85011+ filp = tsk->exec_file;
85012+ if (filp == NULL)
85013+ goto out_unlock;
85014+
85015+ tsk->is_writable = 0;
85016+ tsk->inherited = 0;
85017+
85018+ tsk->acl_sp_role = 1;
85019+ tsk->acl_role_id = ++acl_sp_role_value;
85020+ tsk->role = assigned;
85021+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
85022+
85023+ /* ignore additional mmap checks for processes that are writable
85024+ by the default ACL */
85025+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85026+ if (unlikely(obj->mode & GR_WRITE))
85027+ tsk->is_writable = 1;
85028+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
85029+ if (unlikely(obj->mode & GR_WRITE))
85030+ tsk->is_writable = 1;
85031+
85032+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85033+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
85034+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
85035+#endif
85036+
85037+out_unlock:
85038+ read_unlock(&grsec_exec_file_lock);
85039+ read_unlock(&tasklist_lock);
85040+ return;
85041+}
85042+
85043+
85044+static void
85045+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
85046+{
85047+ struct task_struct *task = current;
85048+ const struct cred *cred = current_cred();
85049+
85050+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
85051+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
85052+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
85053+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
85054+
85055+ return;
85056+}
85057+
85058+static void
85059+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
85060+{
85061+ struct task_struct *task = current;
85062+ const struct cred *cred = current_cred();
85063+
85064+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
85065+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
85066+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
85067+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
85068+
85069+ return;
85070+}
85071+
85072+static void
85073+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
85074+{
85075+ struct task_struct *task = current;
85076+ const struct cred *cred = current_cred();
85077+
85078+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
85079+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
85080+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
85081+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
85082+
85083+ return;
85084+}
85085+
85086+static void
85087+gr_set_proc_res(struct task_struct *task)
85088+{
85089+ struct acl_subject_label *proc;
85090+ unsigned short i;
85091+
85092+ proc = task->acl;
85093+
85094+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
85095+ return;
85096+
85097+ for (i = 0; i < RLIM_NLIMITS; i++) {
85098+ unsigned long rlim_cur, rlim_max;
85099+
85100+ if (!(proc->resmask & (1U << i)))
85101+ continue;
85102+
85103+ rlim_cur = proc->res[i].rlim_cur;
85104+ rlim_max = proc->res[i].rlim_max;
85105+
85106+ if (i == RLIMIT_NOFILE) {
85107+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
85108+ if (rlim_cur > saved_sysctl_nr_open)
85109+ rlim_cur = saved_sysctl_nr_open;
85110+ if (rlim_max > saved_sysctl_nr_open)
85111+ rlim_max = saved_sysctl_nr_open;
85112+ }
85113+
85114+ task->signal->rlim[i].rlim_cur = rlim_cur;
85115+ task->signal->rlim[i].rlim_max = rlim_max;
85116+
85117+ if (i == RLIMIT_CPU)
85118+ update_rlimit_cpu(task, rlim_cur);
85119+ }
85120+
85121+ return;
85122+}
85123+
85124+/* both of the below must be called with
85125+ rcu_read_lock();
85126+ read_lock(&tasklist_lock);
85127+ read_lock(&grsec_exec_file_lock);
85128+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
85129+*/
85130+
85131+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
85132+{
85133+ char *tmpname;
85134+ struct acl_subject_label *tmpsubj;
85135+ struct file *filp;
85136+ struct name_entry *nmatch;
85137+
85138+ filp = task->exec_file;
85139+ if (filp == NULL)
85140+ return NULL;
85141+
85142+ /* the following is to apply the correct subject
85143+ on binaries running when the RBAC system
85144+ is enabled, when the binaries have been
85145+ replaced or deleted since their execution
85146+ -----
85147+ when the RBAC system starts, the inode/dev
85148+ from exec_file will be one the RBAC system
85149+ is unaware of. It only knows the inode/dev
85150+ of the present file on disk, or the absence
85151+ of it.
85152+ */
85153+
85154+ if (filename)
85155+ nmatch = __lookup_name_entry(state, filename);
85156+ else {
85157+ preempt_disable();
85158+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
85159+
85160+ nmatch = __lookup_name_entry(state, tmpname);
85161+ preempt_enable();
85162+ }
85163+ tmpsubj = NULL;
85164+ if (nmatch) {
85165+ if (nmatch->deleted)
85166+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
85167+ else
85168+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
85169+ }
85170+ /* this also works for the reload case -- if we don't match a potentially inherited subject
85171+ then we fall back to a normal lookup based on the binary's ino/dev
85172+ */
85173+ if (tmpsubj == NULL && fallback)
85174+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
85175+
85176+ return tmpsubj;
85177+}
85178+
85179+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
85180+{
85181+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
85182+}
85183+
85184+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
85185+{
85186+ struct acl_object_label *obj;
85187+ struct file *filp;
85188+
85189+ filp = task->exec_file;
85190+
85191+ task->acl = subj;
85192+ task->is_writable = 0;
85193+ /* ignore additional mmap checks for processes that are writable
85194+ by the default ACL */
85195+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
85196+ if (unlikely(obj->mode & GR_WRITE))
85197+ task->is_writable = 1;
85198+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85199+ if (unlikely(obj->mode & GR_WRITE))
85200+ task->is_writable = 1;
85201+
85202+ gr_set_proc_res(task);
85203+
85204+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85205+ 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);
85206+#endif
85207+}
85208+
85209+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
85210+{
85211+ __gr_apply_subject_to_task(&running_polstate, task, subj);
85212+}
85213+
85214+__u32
85215+gr_search_file(const struct dentry * dentry, const __u32 mode,
85216+ const struct vfsmount * mnt)
85217+{
85218+ __u32 retval = mode;
85219+ struct acl_subject_label *curracl;
85220+ struct acl_object_label *currobj;
85221+
85222+ if (unlikely(!(gr_status & GR_READY)))
85223+ return (mode & ~GR_AUDITS);
85224+
85225+ curracl = current->acl;
85226+
85227+ currobj = chk_obj_label(dentry, mnt, curracl);
85228+ retval = currobj->mode & mode;
85229+
85230+ /* if we're opening a specified transfer file for writing
85231+ (e.g. /dev/initctl), then transfer our role to init
85232+ */
85233+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
85234+ current->role->roletype & GR_ROLE_PERSIST)) {
85235+ struct task_struct *task = init_pid_ns.child_reaper;
85236+
85237+ if (task->role != current->role) {
85238+ struct acl_subject_label *subj;
85239+
85240+ task->acl_sp_role = 0;
85241+ task->acl_role_id = current->acl_role_id;
85242+ task->role = current->role;
85243+ rcu_read_lock();
85244+ read_lock(&grsec_exec_file_lock);
85245+ subj = gr_get_subject_for_task(task, NULL, 1);
85246+ gr_apply_subject_to_task(task, subj);
85247+ read_unlock(&grsec_exec_file_lock);
85248+ rcu_read_unlock();
85249+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
85250+ }
85251+ }
85252+
85253+ if (unlikely
85254+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
85255+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
85256+ __u32 new_mode = mode;
85257+
85258+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85259+
85260+ retval = new_mode;
85261+
85262+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
85263+ new_mode |= GR_INHERIT;
85264+
85265+ if (!(mode & GR_NOLEARN))
85266+ gr_log_learn(dentry, mnt, new_mode);
85267+ }
85268+
85269+ return retval;
85270+}
85271+
85272+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
85273+ const struct dentry *parent,
85274+ const struct vfsmount *mnt)
85275+{
85276+ struct name_entry *match;
85277+ struct acl_object_label *matchpo;
85278+ struct acl_subject_label *curracl;
85279+ char *path;
85280+
85281+ if (unlikely(!(gr_status & GR_READY)))
85282+ return NULL;
85283+
85284+ preempt_disable();
85285+ path = gr_to_filename_rbac(new_dentry, mnt);
85286+ match = lookup_name_entry_create(path);
85287+
85288+ curracl = current->acl;
85289+
85290+ if (match) {
85291+ read_lock(&gr_inode_lock);
85292+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
85293+ read_unlock(&gr_inode_lock);
85294+
85295+ if (matchpo) {
85296+ preempt_enable();
85297+ return matchpo;
85298+ }
85299+ }
85300+
85301+ // lookup parent
85302+
85303+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
85304+
85305+ preempt_enable();
85306+ return matchpo;
85307+}
85308+
85309+__u32
85310+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
85311+ const struct vfsmount * mnt, const __u32 mode)
85312+{
85313+ struct acl_object_label *matchpo;
85314+ __u32 retval;
85315+
85316+ if (unlikely(!(gr_status & GR_READY)))
85317+ return (mode & ~GR_AUDITS);
85318+
85319+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
85320+
85321+ retval = matchpo->mode & mode;
85322+
85323+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
85324+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85325+ __u32 new_mode = mode;
85326+
85327+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85328+
85329+ gr_log_learn(new_dentry, mnt, new_mode);
85330+ return new_mode;
85331+ }
85332+
85333+ return retval;
85334+}
85335+
85336+__u32
85337+gr_check_link(const struct dentry * new_dentry,
85338+ const struct dentry * parent_dentry,
85339+ const struct vfsmount * parent_mnt,
85340+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
85341+{
85342+ struct acl_object_label *obj;
85343+ __u32 oldmode, newmode;
85344+ __u32 needmode;
85345+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
85346+ GR_DELETE | GR_INHERIT;
85347+
85348+ if (unlikely(!(gr_status & GR_READY)))
85349+ return (GR_CREATE | GR_LINK);
85350+
85351+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
85352+ oldmode = obj->mode;
85353+
85354+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
85355+ newmode = obj->mode;
85356+
85357+ needmode = newmode & checkmodes;
85358+
85359+ // old name for hardlink must have at least the permissions of the new name
85360+ if ((oldmode & needmode) != needmode)
85361+ goto bad;
85362+
85363+ // if old name had restrictions/auditing, make sure the new name does as well
85364+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
85365+
85366+ // don't allow hardlinking of suid/sgid/fcapped files without permission
85367+ if (is_privileged_binary(old_dentry))
85368+ needmode |= GR_SETID;
85369+
85370+ if ((newmode & needmode) != needmode)
85371+ goto bad;
85372+
85373+ // enforce minimum permissions
85374+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
85375+ return newmode;
85376+bad:
85377+ needmode = oldmode;
85378+ if (is_privileged_binary(old_dentry))
85379+ needmode |= GR_SETID;
85380+
85381+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
85382+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
85383+ return (GR_CREATE | GR_LINK);
85384+ } else if (newmode & GR_SUPPRESS)
85385+ return GR_SUPPRESS;
85386+ else
85387+ return 0;
85388+}
85389+
85390+int
85391+gr_check_hidden_task(const struct task_struct *task)
85392+{
85393+ if (unlikely(!(gr_status & GR_READY)))
85394+ return 0;
85395+
85396+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
85397+ return 1;
85398+
85399+ return 0;
85400+}
85401+
85402+int
85403+gr_check_protected_task(const struct task_struct *task)
85404+{
85405+ if (unlikely(!(gr_status & GR_READY) || !task))
85406+ return 0;
85407+
85408+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85409+ task->acl != current->acl)
85410+ return 1;
85411+
85412+ return 0;
85413+}
85414+
85415+int
85416+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
85417+{
85418+ struct task_struct *p;
85419+ int ret = 0;
85420+
85421+ if (unlikely(!(gr_status & GR_READY) || !pid))
85422+ return ret;
85423+
85424+ read_lock(&tasklist_lock);
85425+ do_each_pid_task(pid, type, p) {
85426+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85427+ p->acl != current->acl) {
85428+ ret = 1;
85429+ goto out;
85430+ }
85431+ } while_each_pid_task(pid, type, p);
85432+out:
85433+ read_unlock(&tasklist_lock);
85434+
85435+ return ret;
85436+}
85437+
85438+void
85439+gr_copy_label(struct task_struct *tsk)
85440+{
85441+ struct task_struct *p = current;
85442+
85443+ tsk->inherited = p->inherited;
85444+ tsk->acl_sp_role = 0;
85445+ tsk->acl_role_id = p->acl_role_id;
85446+ tsk->acl = p->acl;
85447+ tsk->role = p->role;
85448+ tsk->signal->used_accept = 0;
85449+ tsk->signal->curr_ip = p->signal->curr_ip;
85450+ tsk->signal->saved_ip = p->signal->saved_ip;
85451+ if (p->exec_file)
85452+ get_file(p->exec_file);
85453+ tsk->exec_file = p->exec_file;
85454+ tsk->is_writable = p->is_writable;
85455+ if (unlikely(p->signal->used_accept)) {
85456+ p->signal->curr_ip = 0;
85457+ p->signal->saved_ip = 0;
85458+ }
85459+
85460+ return;
85461+}
85462+
85463+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
85464+
85465+int
85466+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85467+{
85468+ unsigned int i;
85469+ __u16 num;
85470+ uid_t *uidlist;
85471+ uid_t curuid;
85472+ int realok = 0;
85473+ int effectiveok = 0;
85474+ int fsok = 0;
85475+ uid_t globalreal, globaleffective, globalfs;
85476+
85477+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
85478+ struct user_struct *user;
85479+
85480+ if (!uid_valid(real))
85481+ goto skipit;
85482+
85483+ /* find user based on global namespace */
85484+
85485+ globalreal = GR_GLOBAL_UID(real);
85486+
85487+ user = find_user(make_kuid(&init_user_ns, globalreal));
85488+ if (user == NULL)
85489+ goto skipit;
85490+
85491+ if (gr_process_kernel_setuid_ban(user)) {
85492+ /* for find_user */
85493+ free_uid(user);
85494+ return 1;
85495+ }
85496+
85497+ /* for find_user */
85498+ free_uid(user);
85499+
85500+skipit:
85501+#endif
85502+
85503+ if (unlikely(!(gr_status & GR_READY)))
85504+ return 0;
85505+
85506+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85507+ gr_log_learn_uid_change(real, effective, fs);
85508+
85509+ num = current->acl->user_trans_num;
85510+ uidlist = current->acl->user_transitions;
85511+
85512+ if (uidlist == NULL)
85513+ return 0;
85514+
85515+ if (!uid_valid(real)) {
85516+ realok = 1;
85517+ globalreal = (uid_t)-1;
85518+ } else {
85519+ globalreal = GR_GLOBAL_UID(real);
85520+ }
85521+ if (!uid_valid(effective)) {
85522+ effectiveok = 1;
85523+ globaleffective = (uid_t)-1;
85524+ } else {
85525+ globaleffective = GR_GLOBAL_UID(effective);
85526+ }
85527+ if (!uid_valid(fs)) {
85528+ fsok = 1;
85529+ globalfs = (uid_t)-1;
85530+ } else {
85531+ globalfs = GR_GLOBAL_UID(fs);
85532+ }
85533+
85534+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
85535+ for (i = 0; i < num; i++) {
85536+ curuid = uidlist[i];
85537+ if (globalreal == curuid)
85538+ realok = 1;
85539+ if (globaleffective == curuid)
85540+ effectiveok = 1;
85541+ if (globalfs == curuid)
85542+ fsok = 1;
85543+ }
85544+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
85545+ for (i = 0; i < num; i++) {
85546+ curuid = uidlist[i];
85547+ if (globalreal == curuid)
85548+ break;
85549+ if (globaleffective == curuid)
85550+ break;
85551+ if (globalfs == curuid)
85552+ break;
85553+ }
85554+ /* not in deny list */
85555+ if (i == num) {
85556+ realok = 1;
85557+ effectiveok = 1;
85558+ fsok = 1;
85559+ }
85560+ }
85561+
85562+ if (realok && effectiveok && fsok)
85563+ return 0;
85564+ else {
85565+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85566+ return 1;
85567+ }
85568+}
85569+
85570+int
85571+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85572+{
85573+ unsigned int i;
85574+ __u16 num;
85575+ gid_t *gidlist;
85576+ gid_t curgid;
85577+ int realok = 0;
85578+ int effectiveok = 0;
85579+ int fsok = 0;
85580+ gid_t globalreal, globaleffective, globalfs;
85581+
85582+ if (unlikely(!(gr_status & GR_READY)))
85583+ return 0;
85584+
85585+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85586+ gr_log_learn_gid_change(real, effective, fs);
85587+
85588+ num = current->acl->group_trans_num;
85589+ gidlist = current->acl->group_transitions;
85590+
85591+ if (gidlist == NULL)
85592+ return 0;
85593+
85594+ if (!gid_valid(real)) {
85595+ realok = 1;
85596+ globalreal = (gid_t)-1;
85597+ } else {
85598+ globalreal = GR_GLOBAL_GID(real);
85599+ }
85600+ if (!gid_valid(effective)) {
85601+ effectiveok = 1;
85602+ globaleffective = (gid_t)-1;
85603+ } else {
85604+ globaleffective = GR_GLOBAL_GID(effective);
85605+ }
85606+ if (!gid_valid(fs)) {
85607+ fsok = 1;
85608+ globalfs = (gid_t)-1;
85609+ } else {
85610+ globalfs = GR_GLOBAL_GID(fs);
85611+ }
85612+
85613+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
85614+ for (i = 0; i < num; i++) {
85615+ curgid = gidlist[i];
85616+ if (globalreal == curgid)
85617+ realok = 1;
85618+ if (globaleffective == curgid)
85619+ effectiveok = 1;
85620+ if (globalfs == curgid)
85621+ fsok = 1;
85622+ }
85623+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
85624+ for (i = 0; i < num; i++) {
85625+ curgid = gidlist[i];
85626+ if (globalreal == curgid)
85627+ break;
85628+ if (globaleffective == curgid)
85629+ break;
85630+ if (globalfs == curgid)
85631+ break;
85632+ }
85633+ /* not in deny list */
85634+ if (i == num) {
85635+ realok = 1;
85636+ effectiveok = 1;
85637+ fsok = 1;
85638+ }
85639+ }
85640+
85641+ if (realok && effectiveok && fsok)
85642+ return 0;
85643+ else {
85644+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85645+ return 1;
85646+ }
85647+}
85648+
85649+extern int gr_acl_is_capable(const int cap);
85650+
85651+void
85652+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
85653+{
85654+ struct acl_role_label *role = task->role;
85655+ struct acl_role_label *origrole = role;
85656+ struct acl_subject_label *subj = NULL;
85657+ struct acl_object_label *obj;
85658+ struct file *filp;
85659+ uid_t uid;
85660+ gid_t gid;
85661+
85662+ if (unlikely(!(gr_status & GR_READY)))
85663+ return;
85664+
85665+ uid = GR_GLOBAL_UID(kuid);
85666+ gid = GR_GLOBAL_GID(kgid);
85667+
85668+ filp = task->exec_file;
85669+
85670+ /* kernel process, we'll give them the kernel role */
85671+ if (unlikely(!filp)) {
85672+ task->role = running_polstate.kernel_role;
85673+ task->acl = running_polstate.kernel_role->root_label;
85674+ return;
85675+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
85676+ /* save the current ip at time of role lookup so that the proper
85677+ IP will be learned for role_allowed_ip */
85678+ task->signal->saved_ip = task->signal->curr_ip;
85679+ role = lookup_acl_role_label(task, uid, gid);
85680+ }
85681+
85682+ /* don't change the role if we're not a privileged process */
85683+ if (role && task->role != role &&
85684+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
85685+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
85686+ return;
85687+
85688+ task->role = role;
85689+
85690+ if (task->inherited) {
85691+ /* if we reached our subject through inheritance, then first see
85692+ if there's a subject of the same name in the new role that has
85693+ an object that would result in the same inherited subject
85694+ */
85695+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
85696+ if (subj) {
85697+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
85698+ if (!(obj->mode & GR_INHERIT))
85699+ subj = NULL;
85700+ }
85701+
85702+ }
85703+ if (subj == NULL) {
85704+ /* otherwise:
85705+ perform subject lookup in possibly new role
85706+ we can use this result below in the case where role == task->role
85707+ */
85708+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
85709+ }
85710+
85711+ /* if we changed uid/gid, but result in the same role
85712+ and are using inheritance, don't lose the inherited subject
85713+ if current subject is other than what normal lookup
85714+ would result in, we arrived via inheritance, don't
85715+ lose subject
85716+ */
85717+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
85718+ (subj == task->acl)))
85719+ task->acl = subj;
85720+
85721+ /* leave task->inherited unaffected */
85722+
85723+ task->is_writable = 0;
85724+
85725+ /* ignore additional mmap checks for processes that are writable
85726+ by the default ACL */
85727+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85728+ if (unlikely(obj->mode & GR_WRITE))
85729+ task->is_writable = 1;
85730+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85731+ if (unlikely(obj->mode & GR_WRITE))
85732+ task->is_writable = 1;
85733+
85734+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85735+ 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);
85736+#endif
85737+
85738+ gr_set_proc_res(task);
85739+
85740+ return;
85741+}
85742+
85743+int
85744+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
85745+ const int unsafe_flags)
85746+{
85747+ struct task_struct *task = current;
85748+ struct acl_subject_label *newacl;
85749+ struct acl_object_label *obj;
85750+ __u32 retmode;
85751+
85752+ if (unlikely(!(gr_status & GR_READY)))
85753+ return 0;
85754+
85755+ newacl = chk_subj_label(dentry, mnt, task->role);
85756+
85757+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
85758+ did an exec
85759+ */
85760+ rcu_read_lock();
85761+ read_lock(&tasklist_lock);
85762+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
85763+ (task->parent->acl->mode & GR_POVERRIDE))) {
85764+ read_unlock(&tasklist_lock);
85765+ rcu_read_unlock();
85766+ goto skip_check;
85767+ }
85768+ read_unlock(&tasklist_lock);
85769+ rcu_read_unlock();
85770+
85771+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
85772+ !(task->role->roletype & GR_ROLE_GOD) &&
85773+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
85774+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85775+ if (unsafe_flags & LSM_UNSAFE_SHARE)
85776+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
85777+ else
85778+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
85779+ return -EACCES;
85780+ }
85781+
85782+skip_check:
85783+
85784+ obj = chk_obj_label(dentry, mnt, task->acl);
85785+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
85786+
85787+ if (!(task->acl->mode & GR_INHERITLEARN) &&
85788+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
85789+ if (obj->nested)
85790+ task->acl = obj->nested;
85791+ else
85792+ task->acl = newacl;
85793+ task->inherited = 0;
85794+ } else {
85795+ task->inherited = 1;
85796+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
85797+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
85798+ }
85799+
85800+ task->is_writable = 0;
85801+
85802+ /* ignore additional mmap checks for processes that are writable
85803+ by the default ACL */
85804+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
85805+ if (unlikely(obj->mode & GR_WRITE))
85806+ task->is_writable = 1;
85807+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
85808+ if (unlikely(obj->mode & GR_WRITE))
85809+ task->is_writable = 1;
85810+
85811+ gr_set_proc_res(task);
85812+
85813+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85814+ 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);
85815+#endif
85816+ return 0;
85817+}
85818+
85819+/* always called with valid inodev ptr */
85820+static void
85821+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
85822+{
85823+ struct acl_object_label *matchpo;
85824+ struct acl_subject_label *matchps;
85825+ struct acl_subject_label *subj;
85826+ struct acl_role_label *role;
85827+ unsigned int x;
85828+
85829+ FOR_EACH_ROLE_START(role)
85830+ FOR_EACH_SUBJECT_START(role, subj, x)
85831+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85832+ matchpo->mode |= GR_DELETED;
85833+ FOR_EACH_SUBJECT_END(subj,x)
85834+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85835+ /* nested subjects aren't in the role's subj_hash table */
85836+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85837+ matchpo->mode |= GR_DELETED;
85838+ FOR_EACH_NESTED_SUBJECT_END(subj)
85839+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
85840+ matchps->mode |= GR_DELETED;
85841+ FOR_EACH_ROLE_END(role)
85842+
85843+ inodev->nentry->deleted = 1;
85844+
85845+ return;
85846+}
85847+
85848+void
85849+gr_handle_delete(const u64 ino, const dev_t dev)
85850+{
85851+ struct inodev_entry *inodev;
85852+
85853+ if (unlikely(!(gr_status & GR_READY)))
85854+ return;
85855+
85856+ write_lock(&gr_inode_lock);
85857+ inodev = lookup_inodev_entry(ino, dev);
85858+ if (inodev != NULL)
85859+ do_handle_delete(inodev, ino, dev);
85860+ write_unlock(&gr_inode_lock);
85861+
85862+ return;
85863+}
85864+
85865+static void
85866+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
85867+ const u64 newinode, const dev_t newdevice,
85868+ struct acl_subject_label *subj)
85869+{
85870+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
85871+ struct acl_object_label *match;
85872+
85873+ match = subj->obj_hash[index];
85874+
85875+ while (match && (match->inode != oldinode ||
85876+ match->device != olddevice ||
85877+ !(match->mode & GR_DELETED)))
85878+ match = match->next;
85879+
85880+ if (match && (match->inode == oldinode)
85881+ && (match->device == olddevice)
85882+ && (match->mode & GR_DELETED)) {
85883+ if (match->prev == NULL) {
85884+ subj->obj_hash[index] = match->next;
85885+ if (match->next != NULL)
85886+ match->next->prev = NULL;
85887+ } else {
85888+ match->prev->next = match->next;
85889+ if (match->next != NULL)
85890+ match->next->prev = match->prev;
85891+ }
85892+ match->prev = NULL;
85893+ match->next = NULL;
85894+ match->inode = newinode;
85895+ match->device = newdevice;
85896+ match->mode &= ~GR_DELETED;
85897+
85898+ insert_acl_obj_label(match, subj);
85899+ }
85900+
85901+ return;
85902+}
85903+
85904+static void
85905+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
85906+ const u64 newinode, const dev_t newdevice,
85907+ struct acl_role_label *role)
85908+{
85909+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
85910+ struct acl_subject_label *match;
85911+
85912+ match = role->subj_hash[index];
85913+
85914+ while (match && (match->inode != oldinode ||
85915+ match->device != olddevice ||
85916+ !(match->mode & GR_DELETED)))
85917+ match = match->next;
85918+
85919+ if (match && (match->inode == oldinode)
85920+ && (match->device == olddevice)
85921+ && (match->mode & GR_DELETED)) {
85922+ if (match->prev == NULL) {
85923+ role->subj_hash[index] = match->next;
85924+ if (match->next != NULL)
85925+ match->next->prev = NULL;
85926+ } else {
85927+ match->prev->next = match->next;
85928+ if (match->next != NULL)
85929+ match->next->prev = match->prev;
85930+ }
85931+ match->prev = NULL;
85932+ match->next = NULL;
85933+ match->inode = newinode;
85934+ match->device = newdevice;
85935+ match->mode &= ~GR_DELETED;
85936+
85937+ insert_acl_subj_label(match, role);
85938+ }
85939+
85940+ return;
85941+}
85942+
85943+static void
85944+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
85945+ const u64 newinode, const dev_t newdevice)
85946+{
85947+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
85948+ struct inodev_entry *match;
85949+
85950+ match = running_polstate.inodev_set.i_hash[index];
85951+
85952+ while (match && (match->nentry->inode != oldinode ||
85953+ match->nentry->device != olddevice || !match->nentry->deleted))
85954+ match = match->next;
85955+
85956+ if (match && (match->nentry->inode == oldinode)
85957+ && (match->nentry->device == olddevice) &&
85958+ match->nentry->deleted) {
85959+ if (match->prev == NULL) {
85960+ running_polstate.inodev_set.i_hash[index] = match->next;
85961+ if (match->next != NULL)
85962+ match->next->prev = NULL;
85963+ } else {
85964+ match->prev->next = match->next;
85965+ if (match->next != NULL)
85966+ match->next->prev = match->prev;
85967+ }
85968+ match->prev = NULL;
85969+ match->next = NULL;
85970+ match->nentry->inode = newinode;
85971+ match->nentry->device = newdevice;
85972+ match->nentry->deleted = 0;
85973+
85974+ insert_inodev_entry(match);
85975+ }
85976+
85977+ return;
85978+}
85979+
85980+static void
85981+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
85982+{
85983+ struct acl_subject_label *subj;
85984+ struct acl_role_label *role;
85985+ unsigned int x;
85986+
85987+ FOR_EACH_ROLE_START(role)
85988+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
85989+
85990+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85991+ if ((subj->inode == ino) && (subj->device == dev)) {
85992+ subj->inode = ino;
85993+ subj->device = dev;
85994+ }
85995+ /* nested subjects aren't in the role's subj_hash table */
85996+ update_acl_obj_label(matchn->inode, matchn->device,
85997+ ino, dev, subj);
85998+ FOR_EACH_NESTED_SUBJECT_END(subj)
85999+ FOR_EACH_SUBJECT_START(role, subj, x)
86000+ update_acl_obj_label(matchn->inode, matchn->device,
86001+ ino, dev, subj);
86002+ FOR_EACH_SUBJECT_END(subj,x)
86003+ FOR_EACH_ROLE_END(role)
86004+
86005+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
86006+
86007+ return;
86008+}
86009+
86010+static void
86011+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
86012+ const struct vfsmount *mnt)
86013+{
86014+ u64 ino = __get_ino(dentry);
86015+ dev_t dev = __get_dev(dentry);
86016+
86017+ __do_handle_create(matchn, ino, dev);
86018+
86019+ return;
86020+}
86021+
86022+void
86023+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
86024+{
86025+ struct name_entry *matchn;
86026+
86027+ if (unlikely(!(gr_status & GR_READY)))
86028+ return;
86029+
86030+ preempt_disable();
86031+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
86032+
86033+ if (unlikely((unsigned long)matchn)) {
86034+ write_lock(&gr_inode_lock);
86035+ do_handle_create(matchn, dentry, mnt);
86036+ write_unlock(&gr_inode_lock);
86037+ }
86038+ preempt_enable();
86039+
86040+ return;
86041+}
86042+
86043+void
86044+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
86045+{
86046+ struct name_entry *matchn;
86047+
86048+ if (unlikely(!(gr_status & GR_READY)))
86049+ return;
86050+
86051+ preempt_disable();
86052+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
86053+
86054+ if (unlikely((unsigned long)matchn)) {
86055+ write_lock(&gr_inode_lock);
86056+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
86057+ write_unlock(&gr_inode_lock);
86058+ }
86059+ preempt_enable();
86060+
86061+ return;
86062+}
86063+
86064+void
86065+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
86066+ struct dentry *old_dentry,
86067+ struct dentry *new_dentry,
86068+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
86069+{
86070+ struct name_entry *matchn;
86071+ struct name_entry *matchn2 = NULL;
86072+ struct inodev_entry *inodev;
86073+ struct inode *inode = d_backing_inode(new_dentry);
86074+ struct inode *old_inode = d_backing_inode(old_dentry);
86075+ u64 old_ino = __get_ino(old_dentry);
86076+ dev_t old_dev = __get_dev(old_dentry);
86077+ unsigned int exchange = flags & RENAME_EXCHANGE;
86078+
86079+ /* vfs_rename swaps the name and parent link for old_dentry and
86080+ new_dentry
86081+ at this point, old_dentry has the new name, parent link, and inode
86082+ for the renamed file
86083+ if a file is being replaced by a rename, new_dentry has the inode
86084+ and name for the replaced file
86085+ */
86086+
86087+ if (unlikely(!(gr_status & GR_READY)))
86088+ return;
86089+
86090+ preempt_disable();
86091+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
86092+
86093+ /* exchange cases:
86094+ a filename exists for the source, but not dest
86095+ do a recreate on source
86096+ a filename exists for the dest, but not source
86097+ do a recreate on dest
86098+ a filename exists for both source and dest
86099+ delete source and dest, then create source and dest
86100+ a filename exists for neither source nor dest
86101+ no updates needed
86102+
86103+ the name entry lookups get us the old inode/dev associated with
86104+ each name, so do the deletes first (if possible) so that when
86105+ we do the create, we pick up on the right entries
86106+ */
86107+
86108+ if (exchange)
86109+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
86110+
86111+ /* we wouldn't have to check d_inode if it weren't for
86112+ NFS silly-renaming
86113+ */
86114+
86115+ write_lock(&gr_inode_lock);
86116+ if (unlikely((replace || exchange) && inode)) {
86117+ u64 new_ino = __get_ino(new_dentry);
86118+ dev_t new_dev = __get_dev(new_dentry);
86119+
86120+ inodev = lookup_inodev_entry(new_ino, new_dev);
86121+ if (inodev != NULL && ((inode->i_nlink <= 1) || d_is_dir(new_dentry)))
86122+ do_handle_delete(inodev, new_ino, new_dev);
86123+ }
86124+
86125+ inodev = lookup_inodev_entry(old_ino, old_dev);
86126+ if (inodev != NULL && ((old_inode->i_nlink <= 1) || d_is_dir(old_dentry)))
86127+ do_handle_delete(inodev, old_ino, old_dev);
86128+
86129+ if (unlikely(matchn != NULL))
86130+ do_handle_create(matchn, old_dentry, mnt);
86131+
86132+ if (unlikely(matchn2 != NULL))
86133+ do_handle_create(matchn2, new_dentry, mnt);
86134+
86135+ write_unlock(&gr_inode_lock);
86136+ preempt_enable();
86137+
86138+ return;
86139+}
86140+
86141+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
86142+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
86143+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
86144+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
86145+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
86146+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
86147+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
86148+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
86149+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
86150+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
86151+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
86152+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
86153+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
86154+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
86155+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
86156+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
86157+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
86158+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
86159+};
86160+
86161+void
86162+gr_learn_resource(const struct task_struct *task,
86163+ const int res, const unsigned long wanted, const int gt)
86164+{
86165+ struct acl_subject_label *acl;
86166+ const struct cred *cred;
86167+
86168+ if (unlikely((gr_status & GR_READY) &&
86169+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
86170+ goto skip_reslog;
86171+
86172+ gr_log_resource(task, res, wanted, gt);
86173+skip_reslog:
86174+
86175+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
86176+ return;
86177+
86178+ acl = task->acl;
86179+
86180+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
86181+ !(acl->resmask & (1U << (unsigned short) res))))
86182+ return;
86183+
86184+ if (wanted >= acl->res[res].rlim_cur) {
86185+ unsigned long res_add;
86186+
86187+ res_add = wanted + res_learn_bumps[res];
86188+
86189+ acl->res[res].rlim_cur = res_add;
86190+
86191+ if (wanted > acl->res[res].rlim_max)
86192+ acl->res[res].rlim_max = res_add;
86193+
86194+ /* only log the subject filename, since resource logging is supported for
86195+ single-subject learning only */
86196+ rcu_read_lock();
86197+ cred = __task_cred(task);
86198+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86199+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
86200+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
86201+ "", (unsigned long) res, &task->signal->saved_ip);
86202+ rcu_read_unlock();
86203+ }
86204+
86205+ return;
86206+}
86207+EXPORT_SYMBOL_GPL(gr_learn_resource);
86208+#endif
86209+
86210+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
86211+void
86212+pax_set_initial_flags(struct linux_binprm *bprm)
86213+{
86214+ struct task_struct *task = current;
86215+ struct acl_subject_label *proc;
86216+ unsigned long flags;
86217+
86218+ if (unlikely(!(gr_status & GR_READY)))
86219+ return;
86220+
86221+ flags = pax_get_flags(task);
86222+
86223+ proc = task->acl;
86224+
86225+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
86226+ flags &= ~MF_PAX_PAGEEXEC;
86227+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
86228+ flags &= ~MF_PAX_SEGMEXEC;
86229+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
86230+ flags &= ~MF_PAX_RANDMMAP;
86231+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
86232+ flags &= ~MF_PAX_EMUTRAMP;
86233+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
86234+ flags &= ~MF_PAX_MPROTECT;
86235+
86236+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
86237+ flags |= MF_PAX_PAGEEXEC;
86238+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
86239+ flags |= MF_PAX_SEGMEXEC;
86240+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
86241+ flags |= MF_PAX_RANDMMAP;
86242+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
86243+ flags |= MF_PAX_EMUTRAMP;
86244+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
86245+ flags |= MF_PAX_MPROTECT;
86246+
86247+ pax_set_flags(task, flags);
86248+
86249+ return;
86250+}
86251+#endif
86252+
86253+int
86254+gr_handle_proc_ptrace(struct task_struct *task)
86255+{
86256+ struct file *filp;
86257+ struct task_struct *tmp = task;
86258+ struct task_struct *curtemp = current;
86259+ __u32 retmode;
86260+
86261+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86262+ if (unlikely(!(gr_status & GR_READY)))
86263+ return 0;
86264+#endif
86265+
86266+ read_lock(&tasklist_lock);
86267+ read_lock(&grsec_exec_file_lock);
86268+ filp = task->exec_file;
86269+
86270+ while (task_pid_nr(tmp) > 0) {
86271+ if (tmp == curtemp)
86272+ break;
86273+ tmp = tmp->real_parent;
86274+ }
86275+
86276+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86277+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
86278+ read_unlock(&grsec_exec_file_lock);
86279+ read_unlock(&tasklist_lock);
86280+ return 1;
86281+ }
86282+
86283+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86284+ if (!(gr_status & GR_READY)) {
86285+ read_unlock(&grsec_exec_file_lock);
86286+ read_unlock(&tasklist_lock);
86287+ return 0;
86288+ }
86289+#endif
86290+
86291+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
86292+ read_unlock(&grsec_exec_file_lock);
86293+ read_unlock(&tasklist_lock);
86294+
86295+ if (retmode & GR_NOPTRACE)
86296+ return 1;
86297+
86298+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
86299+ && (current->acl != task->acl || (current->acl != current->role->root_label
86300+ && task_pid_nr(current) != task_pid_nr(task))))
86301+ return 1;
86302+
86303+ return 0;
86304+}
86305+
86306+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
86307+{
86308+ if (unlikely(!(gr_status & GR_READY)))
86309+ return;
86310+
86311+ if (!(current->role->roletype & GR_ROLE_GOD))
86312+ return;
86313+
86314+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
86315+ p->role->rolename, gr_task_roletype_to_char(p),
86316+ p->acl->filename);
86317+}
86318+
86319+int
86320+gr_handle_ptrace(struct task_struct *task, const long request)
86321+{
86322+ struct task_struct *tmp = task;
86323+ struct task_struct *curtemp = current;
86324+ __u32 retmode;
86325+
86326+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86327+ if (unlikely(!(gr_status & GR_READY)))
86328+ return 0;
86329+#endif
86330+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
86331+ read_lock(&tasklist_lock);
86332+ while (task_pid_nr(tmp) > 0) {
86333+ if (tmp == curtemp)
86334+ break;
86335+ tmp = tmp->real_parent;
86336+ }
86337+
86338+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86339+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
86340+ read_unlock(&tasklist_lock);
86341+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86342+ return 1;
86343+ }
86344+ read_unlock(&tasklist_lock);
86345+ }
86346+
86347+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86348+ if (!(gr_status & GR_READY))
86349+ return 0;
86350+#endif
86351+
86352+ read_lock(&grsec_exec_file_lock);
86353+ if (unlikely(!task->exec_file)) {
86354+ read_unlock(&grsec_exec_file_lock);
86355+ return 0;
86356+ }
86357+
86358+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
86359+ read_unlock(&grsec_exec_file_lock);
86360+
86361+ if (retmode & GR_NOPTRACE) {
86362+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86363+ return 1;
86364+ }
86365+
86366+ if (retmode & GR_PTRACERD) {
86367+ switch (request) {
86368+ case PTRACE_SEIZE:
86369+ case PTRACE_POKETEXT:
86370+ case PTRACE_POKEDATA:
86371+ case PTRACE_POKEUSR:
86372+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
86373+ case PTRACE_SETREGS:
86374+ case PTRACE_SETFPREGS:
86375+#endif
86376+#ifdef CONFIG_X86
86377+ case PTRACE_SETFPXREGS:
86378+#endif
86379+#ifdef CONFIG_ALTIVEC
86380+ case PTRACE_SETVRREGS:
86381+#endif
86382+ return 1;
86383+ default:
86384+ return 0;
86385+ }
86386+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
86387+ !(current->role->roletype & GR_ROLE_GOD) &&
86388+ (current->acl != task->acl)) {
86389+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86390+ return 1;
86391+ }
86392+
86393+ return 0;
86394+}
86395+
86396+static int is_writable_mmap(const struct file *filp)
86397+{
86398+ struct task_struct *task = current;
86399+ struct acl_object_label *obj, *obj2;
86400+ struct dentry *dentry = filp->f_path.dentry;
86401+ struct vfsmount *mnt = filp->f_path.mnt;
86402+ struct inode *inode = d_backing_inode(dentry);
86403+
86404+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
86405+ !task->is_writable && d_is_reg(dentry) && (mnt != shm_mnt || (inode->i_nlink > 0))) {
86406+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
86407+ obj2 = chk_obj_label(dentry, mnt, task->role->root_label);
86408+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
86409+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, dentry, mnt);
86410+ return 1;
86411+ }
86412+ }
86413+ return 0;
86414+}
86415+
86416+int
86417+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
86418+{
86419+ __u32 mode;
86420+
86421+ if (unlikely(!file || !(prot & PROT_EXEC)))
86422+ return 1;
86423+
86424+ if (is_writable_mmap(file))
86425+ return 0;
86426+
86427+ mode =
86428+ gr_search_file(file->f_path.dentry,
86429+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86430+ file->f_path.mnt);
86431+
86432+ if (!gr_tpe_allow(file))
86433+ return 0;
86434+
86435+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86436+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86437+ return 0;
86438+ } else if (unlikely(!(mode & GR_EXEC))) {
86439+ return 0;
86440+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86441+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86442+ return 1;
86443+ }
86444+
86445+ return 1;
86446+}
86447+
86448+int
86449+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
86450+{
86451+ __u32 mode;
86452+
86453+ if (unlikely(!file || !(prot & PROT_EXEC)))
86454+ return 1;
86455+
86456+ if (is_writable_mmap(file))
86457+ return 0;
86458+
86459+ mode =
86460+ gr_search_file(file->f_path.dentry,
86461+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86462+ file->f_path.mnt);
86463+
86464+ if (!gr_tpe_allow(file))
86465+ return 0;
86466+
86467+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86468+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86469+ return 0;
86470+ } else if (unlikely(!(mode & GR_EXEC))) {
86471+ return 0;
86472+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86473+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86474+ return 1;
86475+ }
86476+
86477+ return 1;
86478+}
86479+
86480+void
86481+gr_acl_handle_psacct(struct task_struct *task, const long code)
86482+{
86483+ unsigned long runtime, cputime;
86484+ cputime_t utime, stime;
86485+ unsigned int wday, cday;
86486+ __u8 whr, chr;
86487+ __u8 wmin, cmin;
86488+ __u8 wsec, csec;
86489+ struct timespec curtime, starttime;
86490+
86491+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
86492+ !(task->acl->mode & GR_PROCACCT)))
86493+ return;
86494+
86495+ curtime = ns_to_timespec(ktime_get_ns());
86496+ starttime = ns_to_timespec(task->start_time);
86497+ runtime = curtime.tv_sec - starttime.tv_sec;
86498+ wday = runtime / (60 * 60 * 24);
86499+ runtime -= wday * (60 * 60 * 24);
86500+ whr = runtime / (60 * 60);
86501+ runtime -= whr * (60 * 60);
86502+ wmin = runtime / 60;
86503+ runtime -= wmin * 60;
86504+ wsec = runtime;
86505+
86506+ task_cputime(task, &utime, &stime);
86507+ cputime = cputime_to_secs(utime + stime);
86508+ cday = cputime / (60 * 60 * 24);
86509+ cputime -= cday * (60 * 60 * 24);
86510+ chr = cputime / (60 * 60);
86511+ cputime -= chr * (60 * 60);
86512+ cmin = cputime / 60;
86513+ cputime -= cmin * 60;
86514+ csec = cputime;
86515+
86516+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
86517+
86518+ return;
86519+}
86520+
86521+#ifdef CONFIG_TASKSTATS
86522+int gr_is_taskstats_denied(int pid)
86523+{
86524+ struct task_struct *task;
86525+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86526+ const struct cred *cred;
86527+#endif
86528+ int ret = 0;
86529+
86530+ /* restrict taskstats viewing to un-chrooted root users
86531+ who have the 'view' subject flag if the RBAC system is enabled
86532+ */
86533+
86534+ rcu_read_lock();
86535+ read_lock(&tasklist_lock);
86536+ task = find_task_by_vpid(pid);
86537+ if (task) {
86538+#ifdef CONFIG_GRKERNSEC_CHROOT
86539+ if (proc_is_chrooted(task))
86540+ ret = -EACCES;
86541+#endif
86542+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86543+ cred = __task_cred(task);
86544+#ifdef CONFIG_GRKERNSEC_PROC_USER
86545+ if (gr_is_global_nonroot(cred->uid))
86546+ ret = -EACCES;
86547+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86548+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
86549+ ret = -EACCES;
86550+#endif
86551+#endif
86552+ if (gr_status & GR_READY) {
86553+ if (!(task->acl->mode & GR_VIEW))
86554+ ret = -EACCES;
86555+ }
86556+ } else
86557+ ret = -ENOENT;
86558+
86559+ read_unlock(&tasklist_lock);
86560+ rcu_read_unlock();
86561+
86562+ return ret;
86563+}
86564+#endif
86565+
86566+/* AUXV entries are filled via a descendant of search_binary_handler
86567+ after we've already applied the subject for the target
86568+*/
86569+int gr_acl_enable_at_secure(void)
86570+{
86571+ if (unlikely(!(gr_status & GR_READY)))
86572+ return 0;
86573+
86574+ if (current->acl->mode & GR_ATSECURE)
86575+ return 1;
86576+
86577+ return 0;
86578+}
86579+
86580+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
86581+{
86582+ struct task_struct *task = current;
86583+ struct dentry *dentry = file->f_path.dentry;
86584+ struct vfsmount *mnt = file->f_path.mnt;
86585+ struct acl_object_label *obj, *tmp;
86586+ struct acl_subject_label *subj;
86587+ unsigned int bufsize;
86588+ int is_not_root;
86589+ char *path;
86590+ dev_t dev = __get_dev(dentry);
86591+
86592+ if (unlikely(!(gr_status & GR_READY)))
86593+ return 1;
86594+
86595+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
86596+ return 1;
86597+
86598+ /* ignore Eric Biederman */
86599+ if (IS_PRIVATE(d_backing_inode(dentry)))
86600+ return 1;
86601+
86602+ subj = task->acl;
86603+ read_lock(&gr_inode_lock);
86604+ do {
86605+ obj = lookup_acl_obj_label(ino, dev, subj);
86606+ if (obj != NULL) {
86607+ read_unlock(&gr_inode_lock);
86608+ return (obj->mode & GR_FIND) ? 1 : 0;
86609+ }
86610+ } while ((subj = subj->parent_subject));
86611+ read_unlock(&gr_inode_lock);
86612+
86613+ /* this is purely an optimization since we're looking for an object
86614+ for the directory we're doing a readdir on
86615+ if it's possible for any globbed object to match the entry we're
86616+ filling into the directory, then the object we find here will be
86617+ an anchor point with attached globbed objects
86618+ */
86619+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
86620+ if (obj->globbed == NULL)
86621+ return (obj->mode & GR_FIND) ? 1 : 0;
86622+
86623+ is_not_root = ((obj->filename[0] == '/') &&
86624+ (obj->filename[1] == '\0')) ? 0 : 1;
86625+ bufsize = PAGE_SIZE - namelen - is_not_root;
86626+
86627+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
86628+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
86629+ return 1;
86630+
86631+ preempt_disable();
86632+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
86633+ bufsize);
86634+
86635+ bufsize = strlen(path);
86636+
86637+ /* if base is "/", don't append an additional slash */
86638+ if (is_not_root)
86639+ *(path + bufsize) = '/';
86640+ memcpy(path + bufsize + is_not_root, name, namelen);
86641+ *(path + bufsize + namelen + is_not_root) = '\0';
86642+
86643+ tmp = obj->globbed;
86644+ while (tmp) {
86645+ if (!glob_match(tmp->filename, path)) {
86646+ preempt_enable();
86647+ return (tmp->mode & GR_FIND) ? 1 : 0;
86648+ }
86649+ tmp = tmp->next;
86650+ }
86651+ preempt_enable();
86652+ return (obj->mode & GR_FIND) ? 1 : 0;
86653+}
86654+
86655+void gr_put_exec_file(struct task_struct *task)
86656+{
86657+ struct file *filp;
86658+
86659+ write_lock(&grsec_exec_file_lock);
86660+ filp = task->exec_file;
86661+ task->exec_file = NULL;
86662+ write_unlock(&grsec_exec_file_lock);
86663+
86664+ if (filp)
86665+ fput(filp);
86666+
86667+ return;
86668+}
86669+
86670+
86671+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
86672+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
86673+#endif
86674+#ifdef CONFIG_SECURITY
86675+EXPORT_SYMBOL_GPL(gr_check_user_change);
86676+EXPORT_SYMBOL_GPL(gr_check_group_change);
86677+#endif
86678+
86679diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
86680new file mode 100644
86681index 0000000..9adc75c
86682--- /dev/null
86683+++ b/grsecurity/gracl_alloc.c
86684@@ -0,0 +1,105 @@
86685+#include <linux/kernel.h>
86686+#include <linux/mm.h>
86687+#include <linux/slab.h>
86688+#include <linux/vmalloc.h>
86689+#include <linux/gracl.h>
86690+#include <linux/grsecurity.h>
86691+
86692+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
86693+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
86694+
86695+static int
86696+alloc_pop(void)
86697+{
86698+ if (current_alloc_state->alloc_stack_next == 1)
86699+ return 0;
86700+
86701+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
86702+
86703+ current_alloc_state->alloc_stack_next--;
86704+
86705+ return 1;
86706+}
86707+
86708+static int
86709+alloc_push(void *buf)
86710+{
86711+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
86712+ return 1;
86713+
86714+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
86715+
86716+ current_alloc_state->alloc_stack_next++;
86717+
86718+ return 0;
86719+}
86720+
86721+void *
86722+acl_alloc(unsigned long len)
86723+{
86724+ void *ret = NULL;
86725+
86726+ if (!len || len > PAGE_SIZE)
86727+ goto out;
86728+
86729+ ret = kmalloc(len, GFP_KERNEL);
86730+
86731+ if (ret) {
86732+ if (alloc_push(ret)) {
86733+ kfree(ret);
86734+ ret = NULL;
86735+ }
86736+ }
86737+
86738+out:
86739+ return ret;
86740+}
86741+
86742+void *
86743+acl_alloc_num(unsigned long num, unsigned long len)
86744+{
86745+ if (!len || (num > (PAGE_SIZE / len)))
86746+ return NULL;
86747+
86748+ return acl_alloc(num * len);
86749+}
86750+
86751+void
86752+acl_free_all(void)
86753+{
86754+ if (!current_alloc_state->alloc_stack)
86755+ return;
86756+
86757+ while (alloc_pop()) ;
86758+
86759+ if (current_alloc_state->alloc_stack) {
86760+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
86761+ kfree(current_alloc_state->alloc_stack);
86762+ else
86763+ vfree(current_alloc_state->alloc_stack);
86764+ }
86765+
86766+ current_alloc_state->alloc_stack = NULL;
86767+ current_alloc_state->alloc_stack_size = 1;
86768+ current_alloc_state->alloc_stack_next = 1;
86769+
86770+ return;
86771+}
86772+
86773+int
86774+acl_alloc_stack_init(unsigned long size)
86775+{
86776+ if ((size * sizeof (void *)) <= PAGE_SIZE)
86777+ current_alloc_state->alloc_stack =
86778+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
86779+ else
86780+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
86781+
86782+ current_alloc_state->alloc_stack_size = size;
86783+ current_alloc_state->alloc_stack_next = 1;
86784+
86785+ if (!current_alloc_state->alloc_stack)
86786+ return 0;
86787+ else
86788+ return 1;
86789+}
86790diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
86791new file mode 100644
86792index 0000000..1a94c11
86793--- /dev/null
86794+++ b/grsecurity/gracl_cap.c
86795@@ -0,0 +1,127 @@
86796+#include <linux/kernel.h>
86797+#include <linux/module.h>
86798+#include <linux/sched.h>
86799+#include <linux/gracl.h>
86800+#include <linux/grsecurity.h>
86801+#include <linux/grinternal.h>
86802+
86803+extern const char *captab_log[];
86804+extern int captab_log_entries;
86805+
86806+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
86807+{
86808+ struct acl_subject_label *curracl;
86809+
86810+ if (!gr_acl_is_enabled())
86811+ return 1;
86812+
86813+ curracl = task->acl;
86814+
86815+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
86816+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86817+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
86818+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
86819+ gr_to_filename(task->exec_file->f_path.dentry,
86820+ task->exec_file->f_path.mnt) : curracl->filename,
86821+ curracl->filename, 0UL,
86822+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
86823+ return 1;
86824+ }
86825+
86826+ return 0;
86827+}
86828+
86829+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
86830+{
86831+ struct acl_subject_label *curracl;
86832+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86833+ kernel_cap_t cap_audit = __cap_empty_set;
86834+
86835+ if (!gr_acl_is_enabled())
86836+ return 1;
86837+
86838+ curracl = task->acl;
86839+
86840+ cap_drop = curracl->cap_lower;
86841+ cap_mask = curracl->cap_mask;
86842+ cap_audit = curracl->cap_invert_audit;
86843+
86844+ while ((curracl = curracl->parent_subject)) {
86845+ /* if the cap isn't specified in the current computed mask but is specified in the
86846+ current level subject, and is lowered in the current level subject, then add
86847+ it to the set of dropped capabilities
86848+ otherwise, add the current level subject's mask to the current computed mask
86849+ */
86850+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86851+ cap_raise(cap_mask, cap);
86852+ if (cap_raised(curracl->cap_lower, cap))
86853+ cap_raise(cap_drop, cap);
86854+ if (cap_raised(curracl->cap_invert_audit, cap))
86855+ cap_raise(cap_audit, cap);
86856+ }
86857+ }
86858+
86859+ if (!cap_raised(cap_drop, cap)) {
86860+ if (cap_raised(cap_audit, cap))
86861+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
86862+ return 1;
86863+ }
86864+
86865+ /* only learn the capability use if the process has the capability in the
86866+ general case, the two uses in sys.c of gr_learn_cap are an exception
86867+ to this rule to ensure any role transition involves what the full-learned
86868+ policy believes in a privileged process
86869+ */
86870+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
86871+ return 1;
86872+
86873+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
86874+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
86875+
86876+ return 0;
86877+}
86878+
86879+int
86880+gr_acl_is_capable(const int cap)
86881+{
86882+ return gr_task_acl_is_capable(current, current_cred(), cap);
86883+}
86884+
86885+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
86886+{
86887+ struct acl_subject_label *curracl;
86888+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86889+
86890+ if (!gr_acl_is_enabled())
86891+ return 1;
86892+
86893+ curracl = task->acl;
86894+
86895+ cap_drop = curracl->cap_lower;
86896+ cap_mask = curracl->cap_mask;
86897+
86898+ while ((curracl = curracl->parent_subject)) {
86899+ /* if the cap isn't specified in the current computed mask but is specified in the
86900+ current level subject, and is lowered in the current level subject, then add
86901+ it to the set of dropped capabilities
86902+ otherwise, add the current level subject's mask to the current computed mask
86903+ */
86904+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86905+ cap_raise(cap_mask, cap);
86906+ if (cap_raised(curracl->cap_lower, cap))
86907+ cap_raise(cap_drop, cap);
86908+ }
86909+ }
86910+
86911+ if (!cap_raised(cap_drop, cap))
86912+ return 1;
86913+
86914+ return 0;
86915+}
86916+
86917+int
86918+gr_acl_is_capable_nolog(const int cap)
86919+{
86920+ return gr_task_acl_is_capable_nolog(current, cap);
86921+}
86922+
86923diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
86924new file mode 100644
86925index 0000000..a43dd06
86926--- /dev/null
86927+++ b/grsecurity/gracl_compat.c
86928@@ -0,0 +1,269 @@
86929+#include <linux/kernel.h>
86930+#include <linux/gracl.h>
86931+#include <linux/compat.h>
86932+#include <linux/gracl_compat.h>
86933+
86934+#include <asm/uaccess.h>
86935+
86936+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
86937+{
86938+ struct gr_arg_wrapper_compat uwrapcompat;
86939+
86940+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
86941+ return -EFAULT;
86942+
86943+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
86944+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
86945+ return -EINVAL;
86946+
86947+ uwrap->arg = compat_ptr(uwrapcompat.arg);
86948+ uwrap->version = uwrapcompat.version;
86949+ uwrap->size = sizeof(struct gr_arg);
86950+
86951+ return 0;
86952+}
86953+
86954+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
86955+{
86956+ struct gr_arg_compat argcompat;
86957+
86958+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
86959+ return -EFAULT;
86960+
86961+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
86962+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
86963+ arg->role_db.num_roles = argcompat.role_db.num_roles;
86964+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
86965+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
86966+ arg->role_db.num_objects = argcompat.role_db.num_objects;
86967+
86968+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
86969+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
86970+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
86971+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
86972+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
86973+ arg->segv_device = argcompat.segv_device;
86974+ arg->segv_inode = argcompat.segv_inode;
86975+ arg->segv_uid = argcompat.segv_uid;
86976+ arg->num_sprole_pws = argcompat.num_sprole_pws;
86977+ arg->mode = argcompat.mode;
86978+
86979+ return 0;
86980+}
86981+
86982+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
86983+{
86984+ struct acl_object_label_compat objcompat;
86985+
86986+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
86987+ return -EFAULT;
86988+
86989+ obj->filename = compat_ptr(objcompat.filename);
86990+ obj->inode = objcompat.inode;
86991+ obj->device = objcompat.device;
86992+ obj->mode = objcompat.mode;
86993+
86994+ obj->nested = compat_ptr(objcompat.nested);
86995+ obj->globbed = compat_ptr(objcompat.globbed);
86996+
86997+ obj->prev = compat_ptr(objcompat.prev);
86998+ obj->next = compat_ptr(objcompat.next);
86999+
87000+ return 0;
87001+}
87002+
87003+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
87004+{
87005+ unsigned int i;
87006+ struct acl_subject_label_compat subjcompat;
87007+
87008+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
87009+ return -EFAULT;
87010+
87011+ subj->filename = compat_ptr(subjcompat.filename);
87012+ subj->inode = subjcompat.inode;
87013+ subj->device = subjcompat.device;
87014+ subj->mode = subjcompat.mode;
87015+ subj->cap_mask = subjcompat.cap_mask;
87016+ subj->cap_lower = subjcompat.cap_lower;
87017+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
87018+
87019+ for (i = 0; i < GR_NLIMITS; i++) {
87020+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
87021+ subj->res[i].rlim_cur = RLIM_INFINITY;
87022+ else
87023+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
87024+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
87025+ subj->res[i].rlim_max = RLIM_INFINITY;
87026+ else
87027+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
87028+ }
87029+ subj->resmask = subjcompat.resmask;
87030+
87031+ subj->user_trans_type = subjcompat.user_trans_type;
87032+ subj->group_trans_type = subjcompat.group_trans_type;
87033+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
87034+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
87035+ subj->user_trans_num = subjcompat.user_trans_num;
87036+ subj->group_trans_num = subjcompat.group_trans_num;
87037+
87038+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
87039+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
87040+ subj->ip_type = subjcompat.ip_type;
87041+ subj->ips = compat_ptr(subjcompat.ips);
87042+ subj->ip_num = subjcompat.ip_num;
87043+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
87044+
87045+ subj->crashes = subjcompat.crashes;
87046+ subj->expires = subjcompat.expires;
87047+
87048+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
87049+ subj->hash = compat_ptr(subjcompat.hash);
87050+ subj->prev = compat_ptr(subjcompat.prev);
87051+ subj->next = compat_ptr(subjcompat.next);
87052+
87053+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
87054+ subj->obj_hash_size = subjcompat.obj_hash_size;
87055+ subj->pax_flags = subjcompat.pax_flags;
87056+
87057+ return 0;
87058+}
87059+
87060+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
87061+{
87062+ struct acl_role_label_compat rolecompat;
87063+
87064+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
87065+ return -EFAULT;
87066+
87067+ role->rolename = compat_ptr(rolecompat.rolename);
87068+ role->uidgid = rolecompat.uidgid;
87069+ role->roletype = rolecompat.roletype;
87070+
87071+ role->auth_attempts = rolecompat.auth_attempts;
87072+ role->expires = rolecompat.expires;
87073+
87074+ role->root_label = compat_ptr(rolecompat.root_label);
87075+ role->hash = compat_ptr(rolecompat.hash);
87076+
87077+ role->prev = compat_ptr(rolecompat.prev);
87078+ role->next = compat_ptr(rolecompat.next);
87079+
87080+ role->transitions = compat_ptr(rolecompat.transitions);
87081+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
87082+ role->domain_children = compat_ptr(rolecompat.domain_children);
87083+ role->domain_child_num = rolecompat.domain_child_num;
87084+
87085+ role->umask = rolecompat.umask;
87086+
87087+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
87088+ role->subj_hash_size = rolecompat.subj_hash_size;
87089+
87090+ return 0;
87091+}
87092+
87093+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
87094+{
87095+ struct role_allowed_ip_compat roleip_compat;
87096+
87097+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
87098+ return -EFAULT;
87099+
87100+ roleip->addr = roleip_compat.addr;
87101+ roleip->netmask = roleip_compat.netmask;
87102+
87103+ roleip->prev = compat_ptr(roleip_compat.prev);
87104+ roleip->next = compat_ptr(roleip_compat.next);
87105+
87106+ return 0;
87107+}
87108+
87109+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
87110+{
87111+ struct role_transition_compat trans_compat;
87112+
87113+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
87114+ return -EFAULT;
87115+
87116+ trans->rolename = compat_ptr(trans_compat.rolename);
87117+
87118+ trans->prev = compat_ptr(trans_compat.prev);
87119+ trans->next = compat_ptr(trans_compat.next);
87120+
87121+ return 0;
87122+
87123+}
87124+
87125+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
87126+{
87127+ struct gr_hash_struct_compat hash_compat;
87128+
87129+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
87130+ return -EFAULT;
87131+
87132+ hash->table = compat_ptr(hash_compat.table);
87133+ hash->nametable = compat_ptr(hash_compat.nametable);
87134+ hash->first = compat_ptr(hash_compat.first);
87135+
87136+ hash->table_size = hash_compat.table_size;
87137+ hash->used_size = hash_compat.used_size;
87138+
87139+ hash->type = hash_compat.type;
87140+
87141+ return 0;
87142+}
87143+
87144+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
87145+{
87146+ compat_uptr_t ptrcompat;
87147+
87148+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
87149+ return -EFAULT;
87150+
87151+ *(void **)ptr = compat_ptr(ptrcompat);
87152+
87153+ return 0;
87154+}
87155+
87156+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
87157+{
87158+ struct acl_ip_label_compat ip_compat;
87159+
87160+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
87161+ return -EFAULT;
87162+
87163+ ip->iface = compat_ptr(ip_compat.iface);
87164+ ip->addr = ip_compat.addr;
87165+ ip->netmask = ip_compat.netmask;
87166+ ip->low = ip_compat.low;
87167+ ip->high = ip_compat.high;
87168+ ip->mode = ip_compat.mode;
87169+ ip->type = ip_compat.type;
87170+
87171+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
87172+
87173+ ip->prev = compat_ptr(ip_compat.prev);
87174+ ip->next = compat_ptr(ip_compat.next);
87175+
87176+ return 0;
87177+}
87178+
87179+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
87180+{
87181+ struct sprole_pw_compat pw_compat;
87182+
87183+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
87184+ return -EFAULT;
87185+
87186+ pw->rolename = compat_ptr(pw_compat.rolename);
87187+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
87188+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
87189+
87190+ return 0;
87191+}
87192+
87193+size_t get_gr_arg_wrapper_size_compat(void)
87194+{
87195+ return sizeof(struct gr_arg_wrapper_compat);
87196+}
87197+
87198diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
87199new file mode 100644
87200index 0000000..fce7f71
87201--- /dev/null
87202+++ b/grsecurity/gracl_fs.c
87203@@ -0,0 +1,448 @@
87204+#include <linux/kernel.h>
87205+#include <linux/sched.h>
87206+#include <linux/types.h>
87207+#include <linux/fs.h>
87208+#include <linux/file.h>
87209+#include <linux/stat.h>
87210+#include <linux/grsecurity.h>
87211+#include <linux/grinternal.h>
87212+#include <linux/gracl.h>
87213+
87214+umode_t
87215+gr_acl_umask(void)
87216+{
87217+ if (unlikely(!gr_acl_is_enabled()))
87218+ return 0;
87219+
87220+ return current->role->umask;
87221+}
87222+
87223+__u32
87224+gr_acl_handle_hidden_file(const struct dentry * dentry,
87225+ const struct vfsmount * mnt)
87226+{
87227+ __u32 mode;
87228+
87229+ if (unlikely(d_is_negative(dentry)))
87230+ return GR_FIND;
87231+
87232+ mode =
87233+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
87234+
87235+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
87236+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
87237+ return mode;
87238+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
87239+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
87240+ return 0;
87241+ } else if (unlikely(!(mode & GR_FIND)))
87242+ return 0;
87243+
87244+ return GR_FIND;
87245+}
87246+
87247+__u32
87248+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
87249+ int acc_mode)
87250+{
87251+ __u32 reqmode = GR_FIND;
87252+ __u32 mode;
87253+
87254+ if (unlikely(d_is_negative(dentry)))
87255+ return reqmode;
87256+
87257+ if (acc_mode & MAY_APPEND)
87258+ reqmode |= GR_APPEND;
87259+ else if (acc_mode & MAY_WRITE)
87260+ reqmode |= GR_WRITE;
87261+ if ((acc_mode & MAY_READ) && !d_is_dir(dentry))
87262+ reqmode |= GR_READ;
87263+
87264+ mode =
87265+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87266+ mnt);
87267+
87268+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87269+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87270+ reqmode & GR_READ ? " reading" : "",
87271+ reqmode & GR_WRITE ? " writing" : reqmode &
87272+ GR_APPEND ? " appending" : "");
87273+ return reqmode;
87274+ } else
87275+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87276+ {
87277+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87278+ reqmode & GR_READ ? " reading" : "",
87279+ reqmode & GR_WRITE ? " writing" : reqmode &
87280+ GR_APPEND ? " appending" : "");
87281+ return 0;
87282+ } else if (unlikely((mode & reqmode) != reqmode))
87283+ return 0;
87284+
87285+ return reqmode;
87286+}
87287+
87288+__u32
87289+gr_acl_handle_creat(const struct dentry * dentry,
87290+ const struct dentry * p_dentry,
87291+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
87292+ const int imode)
87293+{
87294+ __u32 reqmode = GR_WRITE | GR_CREATE;
87295+ __u32 mode;
87296+
87297+ if (acc_mode & MAY_APPEND)
87298+ reqmode |= GR_APPEND;
87299+ // if a directory was required or the directory already exists, then
87300+ // don't count this open as a read
87301+ if ((acc_mode & MAY_READ) &&
87302+ !((open_flags & O_DIRECTORY) || d_is_dir(dentry)))
87303+ reqmode |= GR_READ;
87304+ if ((open_flags & O_CREAT) &&
87305+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87306+ reqmode |= GR_SETID;
87307+
87308+ mode =
87309+ gr_check_create(dentry, p_dentry, p_mnt,
87310+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87311+
87312+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87313+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87314+ reqmode & GR_READ ? " reading" : "",
87315+ reqmode & GR_WRITE ? " writing" : reqmode &
87316+ GR_APPEND ? " appending" : "");
87317+ return reqmode;
87318+ } else
87319+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87320+ {
87321+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87322+ reqmode & GR_READ ? " reading" : "",
87323+ reqmode & GR_WRITE ? " writing" : reqmode &
87324+ GR_APPEND ? " appending" : "");
87325+ return 0;
87326+ } else if (unlikely((mode & reqmode) != reqmode))
87327+ return 0;
87328+
87329+ return reqmode;
87330+}
87331+
87332+__u32
87333+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
87334+ const int fmode)
87335+{
87336+ __u32 mode, reqmode = GR_FIND;
87337+
87338+ if ((fmode & S_IXOTH) && !d_is_dir(dentry))
87339+ reqmode |= GR_EXEC;
87340+ if (fmode & S_IWOTH)
87341+ reqmode |= GR_WRITE;
87342+ if (fmode & S_IROTH)
87343+ reqmode |= GR_READ;
87344+
87345+ mode =
87346+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87347+ mnt);
87348+
87349+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87350+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87351+ reqmode & GR_READ ? " reading" : "",
87352+ reqmode & GR_WRITE ? " writing" : "",
87353+ reqmode & GR_EXEC ? " executing" : "");
87354+ return reqmode;
87355+ } else
87356+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87357+ {
87358+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87359+ reqmode & GR_READ ? " reading" : "",
87360+ reqmode & GR_WRITE ? " writing" : "",
87361+ reqmode & GR_EXEC ? " executing" : "");
87362+ return 0;
87363+ } else if (unlikely((mode & reqmode) != reqmode))
87364+ return 0;
87365+
87366+ return reqmode;
87367+}
87368+
87369+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
87370+{
87371+ __u32 mode;
87372+
87373+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
87374+
87375+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87376+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
87377+ return mode;
87378+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87379+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
87380+ return 0;
87381+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87382+ return 0;
87383+
87384+ return (reqmode);
87385+}
87386+
87387+__u32
87388+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
87389+{
87390+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
87391+}
87392+
87393+__u32
87394+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
87395+{
87396+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
87397+}
87398+
87399+__u32
87400+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
87401+{
87402+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
87403+}
87404+
87405+__u32
87406+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
87407+{
87408+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
87409+}
87410+
87411+__u32
87412+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
87413+ umode_t *modeptr)
87414+{
87415+ umode_t mode;
87416+ struct inode *inode = d_backing_inode(dentry);
87417+
87418+ *modeptr &= ~gr_acl_umask();
87419+ mode = *modeptr;
87420+
87421+ if (unlikely(inode && S_ISSOCK(inode->i_mode)))
87422+ return 1;
87423+
87424+ if (unlikely(!d_is_dir(dentry) &&
87425+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
87426+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
87427+ GR_CHMOD_ACL_MSG);
87428+ } else {
87429+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
87430+ }
87431+}
87432+
87433+__u32
87434+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
87435+{
87436+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
87437+}
87438+
87439+__u32
87440+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
87441+{
87442+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
87443+}
87444+
87445+__u32
87446+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
87447+{
87448+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
87449+}
87450+
87451+__u32
87452+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
87453+{
87454+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
87455+}
87456+
87457+__u32
87458+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
87459+{
87460+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
87461+ GR_UNIXCONNECT_ACL_MSG);
87462+}
87463+
87464+/* hardlinks require at minimum create and link permission,
87465+ any additional privilege required is based on the
87466+ privilege of the file being linked to
87467+*/
87468+__u32
87469+gr_acl_handle_link(const struct dentry * new_dentry,
87470+ const struct dentry * parent_dentry,
87471+ const struct vfsmount * parent_mnt,
87472+ const struct dentry * old_dentry,
87473+ const struct vfsmount * old_mnt, const struct filename *to)
87474+{
87475+ __u32 mode;
87476+ __u32 needmode = GR_CREATE | GR_LINK;
87477+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
87478+
87479+ mode =
87480+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
87481+ old_mnt);
87482+
87483+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
87484+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87485+ return mode;
87486+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87487+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87488+ return 0;
87489+ } else if (unlikely((mode & needmode) != needmode))
87490+ return 0;
87491+
87492+ return 1;
87493+}
87494+
87495+__u32
87496+gr_acl_handle_symlink(const struct dentry * new_dentry,
87497+ const struct dentry * parent_dentry,
87498+ const struct vfsmount * parent_mnt, const struct filename *from)
87499+{
87500+ __u32 needmode = GR_WRITE | GR_CREATE;
87501+ __u32 mode;
87502+
87503+ mode =
87504+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
87505+ GR_CREATE | GR_AUDIT_CREATE |
87506+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
87507+
87508+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
87509+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87510+ return mode;
87511+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87512+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87513+ return 0;
87514+ } else if (unlikely((mode & needmode) != needmode))
87515+ return 0;
87516+
87517+ return (GR_WRITE | GR_CREATE);
87518+}
87519+
87520+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)
87521+{
87522+ __u32 mode;
87523+
87524+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87525+
87526+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87527+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
87528+ return mode;
87529+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87530+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
87531+ return 0;
87532+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87533+ return 0;
87534+
87535+ return (reqmode);
87536+}
87537+
87538+__u32
87539+gr_acl_handle_mknod(const struct dentry * new_dentry,
87540+ const struct dentry * parent_dentry,
87541+ const struct vfsmount * parent_mnt,
87542+ const int mode)
87543+{
87544+ __u32 reqmode = GR_WRITE | GR_CREATE;
87545+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87546+ reqmode |= GR_SETID;
87547+
87548+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87549+ reqmode, GR_MKNOD_ACL_MSG);
87550+}
87551+
87552+__u32
87553+gr_acl_handle_mkdir(const struct dentry *new_dentry,
87554+ const struct dentry *parent_dentry,
87555+ const struct vfsmount *parent_mnt)
87556+{
87557+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87558+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
87559+}
87560+
87561+#define RENAME_CHECK_SUCCESS(old, new) \
87562+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
87563+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
87564+
87565+int
87566+gr_acl_handle_rename(struct dentry *new_dentry,
87567+ struct dentry *parent_dentry,
87568+ const struct vfsmount *parent_mnt,
87569+ struct dentry *old_dentry,
87570+ struct inode *old_parent_inode,
87571+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
87572+{
87573+ __u32 comp1, comp2;
87574+ int error = 0;
87575+
87576+ if (unlikely(!gr_acl_is_enabled()))
87577+ return 0;
87578+
87579+ if (flags & RENAME_EXCHANGE) {
87580+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87581+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87582+ GR_SUPPRESS, parent_mnt);
87583+ comp2 =
87584+ gr_search_file(old_dentry,
87585+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87586+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87587+ } else if (d_is_negative(new_dentry)) {
87588+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
87589+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
87590+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
87591+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
87592+ GR_DELETE | GR_AUDIT_DELETE |
87593+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87594+ GR_SUPPRESS, old_mnt);
87595+ } else {
87596+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87597+ GR_CREATE | GR_DELETE |
87598+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
87599+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87600+ GR_SUPPRESS, parent_mnt);
87601+ comp2 =
87602+ gr_search_file(old_dentry,
87603+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87604+ GR_DELETE | GR_AUDIT_DELETE |
87605+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87606+ }
87607+
87608+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
87609+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
87610+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87611+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
87612+ && !(comp2 & GR_SUPPRESS)) {
87613+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87614+ error = -EACCES;
87615+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
87616+ error = -EACCES;
87617+
87618+ return error;
87619+}
87620+
87621+void
87622+gr_acl_handle_exit(void)
87623+{
87624+ u16 id;
87625+ char *rolename;
87626+
87627+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
87628+ !(current->role->roletype & GR_ROLE_PERSIST))) {
87629+ id = current->acl_role_id;
87630+ rolename = current->role->rolename;
87631+ gr_set_acls(1);
87632+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
87633+ }
87634+
87635+ gr_put_exec_file(current);
87636+ return;
87637+}
87638+
87639+int
87640+gr_acl_handle_procpidmem(const struct task_struct *task)
87641+{
87642+ if (unlikely(!gr_acl_is_enabled()))
87643+ return 0;
87644+
87645+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
87646+ !(current->acl->mode & GR_POVERRIDE) &&
87647+ !(current->role->roletype & GR_ROLE_GOD))
87648+ return -EACCES;
87649+
87650+ return 0;
87651+}
87652diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
87653new file mode 100644
87654index 0000000..ed6ee43
87655--- /dev/null
87656+++ b/grsecurity/gracl_ip.c
87657@@ -0,0 +1,386 @@
87658+#include <linux/kernel.h>
87659+#include <asm/uaccess.h>
87660+#include <asm/errno.h>
87661+#include <net/sock.h>
87662+#include <linux/file.h>
87663+#include <linux/fs.h>
87664+#include <linux/net.h>
87665+#include <linux/in.h>
87666+#include <linux/skbuff.h>
87667+#include <linux/ip.h>
87668+#include <linux/udp.h>
87669+#include <linux/types.h>
87670+#include <linux/sched.h>
87671+#include <linux/netdevice.h>
87672+#include <linux/inetdevice.h>
87673+#include <linux/gracl.h>
87674+#include <linux/grsecurity.h>
87675+#include <linux/grinternal.h>
87676+
87677+#define GR_BIND 0x01
87678+#define GR_CONNECT 0x02
87679+#define GR_INVERT 0x04
87680+#define GR_BINDOVERRIDE 0x08
87681+#define GR_CONNECTOVERRIDE 0x10
87682+#define GR_SOCK_FAMILY 0x20
87683+
87684+static const char * gr_protocols[IPPROTO_MAX] = {
87685+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
87686+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
87687+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
87688+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
87689+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
87690+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
87691+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
87692+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
87693+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
87694+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
87695+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
87696+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
87697+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
87698+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
87699+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
87700+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
87701+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
87702+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
87703+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
87704+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
87705+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
87706+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
87707+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
87708+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
87709+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
87710+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
87711+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
87712+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
87713+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
87714+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
87715+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
87716+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
87717+ };
87718+
87719+static const char * gr_socktypes[SOCK_MAX] = {
87720+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
87721+ "unknown:7", "unknown:8", "unknown:9", "packet"
87722+ };
87723+
87724+static const char * gr_sockfamilies[AF_MAX+1] = {
87725+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
87726+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
87727+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
87728+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
87729+ };
87730+
87731+const char *
87732+gr_proto_to_name(unsigned char proto)
87733+{
87734+ return gr_protocols[proto];
87735+}
87736+
87737+const char *
87738+gr_socktype_to_name(unsigned char type)
87739+{
87740+ return gr_socktypes[type];
87741+}
87742+
87743+const char *
87744+gr_sockfamily_to_name(unsigned char family)
87745+{
87746+ return gr_sockfamilies[family];
87747+}
87748+
87749+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
87750+
87751+int
87752+gr_search_socket(const int domain, const int type, const int protocol)
87753+{
87754+ struct acl_subject_label *curr;
87755+ const struct cred *cred = current_cred();
87756+
87757+ if (unlikely(!gr_acl_is_enabled()))
87758+ goto exit;
87759+
87760+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
87761+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
87762+ goto exit; // let the kernel handle it
87763+
87764+ curr = current->acl;
87765+
87766+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
87767+ /* the family is allowed, if this is PF_INET allow it only if
87768+ the extra sock type/protocol checks pass */
87769+ if (domain == PF_INET)
87770+ goto inet_check;
87771+ goto exit;
87772+ } else {
87773+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87774+ __u32 fakeip = 0;
87775+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87776+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87777+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87778+ gr_to_filename(current->exec_file->f_path.dentry,
87779+ current->exec_file->f_path.mnt) :
87780+ curr->filename, curr->filename,
87781+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
87782+ &current->signal->saved_ip);
87783+ goto exit;
87784+ }
87785+ goto exit_fail;
87786+ }
87787+
87788+inet_check:
87789+ /* the rest of this checking is for IPv4 only */
87790+ if (!curr->ips)
87791+ goto exit;
87792+
87793+ if ((curr->ip_type & (1U << type)) &&
87794+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
87795+ goto exit;
87796+
87797+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87798+ /* we don't place acls on raw sockets , and sometimes
87799+ dgram/ip sockets are opened for ioctl and not
87800+ bind/connect, so we'll fake a bind learn log */
87801+ if (type == SOCK_RAW || type == SOCK_PACKET) {
87802+ __u32 fakeip = 0;
87803+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87804+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87805+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87806+ gr_to_filename(current->exec_file->f_path.dentry,
87807+ current->exec_file->f_path.mnt) :
87808+ curr->filename, curr->filename,
87809+ &fakeip, 0, type,
87810+ protocol, GR_CONNECT, &current->signal->saved_ip);
87811+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
87812+ __u32 fakeip = 0;
87813+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87814+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87815+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87816+ gr_to_filename(current->exec_file->f_path.dentry,
87817+ current->exec_file->f_path.mnt) :
87818+ curr->filename, curr->filename,
87819+ &fakeip, 0, type,
87820+ protocol, GR_BIND, &current->signal->saved_ip);
87821+ }
87822+ /* we'll log when they use connect or bind */
87823+ goto exit;
87824+ }
87825+
87826+exit_fail:
87827+ if (domain == PF_INET)
87828+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
87829+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
87830+ else if (rcu_access_pointer(net_families[domain]) != NULL)
87831+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
87832+ gr_socktype_to_name(type), protocol);
87833+
87834+ return 0;
87835+exit:
87836+ return 1;
87837+}
87838+
87839+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)
87840+{
87841+ if ((ip->mode & mode) &&
87842+ (ip_port >= ip->low) &&
87843+ (ip_port <= ip->high) &&
87844+ ((ntohl(ip_addr) & our_netmask) ==
87845+ (ntohl(our_addr) & our_netmask))
87846+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
87847+ && (ip->type & (1U << type))) {
87848+ if (ip->mode & GR_INVERT)
87849+ return 2; // specifically denied
87850+ else
87851+ return 1; // allowed
87852+ }
87853+
87854+ return 0; // not specifically allowed, may continue parsing
87855+}
87856+
87857+static int
87858+gr_search_connectbind(const int full_mode, struct sock *sk,
87859+ struct sockaddr_in *addr, const int type)
87860+{
87861+ char iface[IFNAMSIZ] = {0};
87862+ struct acl_subject_label *curr;
87863+ struct acl_ip_label *ip;
87864+ struct inet_sock *isk;
87865+ struct net_device *dev;
87866+ struct in_device *idev;
87867+ unsigned long i;
87868+ int ret;
87869+ int mode = full_mode & (GR_BIND | GR_CONNECT);
87870+ __u32 ip_addr = 0;
87871+ __u32 our_addr;
87872+ __u32 our_netmask;
87873+ char *p;
87874+ __u16 ip_port = 0;
87875+ const struct cred *cred = current_cred();
87876+
87877+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
87878+ return 0;
87879+
87880+ curr = current->acl;
87881+ isk = inet_sk(sk);
87882+
87883+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
87884+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
87885+ addr->sin_addr.s_addr = curr->inaddr_any_override;
87886+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
87887+ struct sockaddr_in saddr;
87888+ int err;
87889+
87890+ saddr.sin_family = AF_INET;
87891+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
87892+ saddr.sin_port = isk->inet_sport;
87893+
87894+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87895+ if (err)
87896+ return err;
87897+
87898+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87899+ if (err)
87900+ return err;
87901+ }
87902+
87903+ if (!curr->ips)
87904+ return 0;
87905+
87906+ ip_addr = addr->sin_addr.s_addr;
87907+ ip_port = ntohs(addr->sin_port);
87908+
87909+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87910+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87911+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87912+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87913+ gr_to_filename(current->exec_file->f_path.dentry,
87914+ current->exec_file->f_path.mnt) :
87915+ curr->filename, curr->filename,
87916+ &ip_addr, ip_port, type,
87917+ sk->sk_protocol, mode, &current->signal->saved_ip);
87918+ return 0;
87919+ }
87920+
87921+ for (i = 0; i < curr->ip_num; i++) {
87922+ ip = *(curr->ips + i);
87923+ if (ip->iface != NULL) {
87924+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
87925+ p = strchr(iface, ':');
87926+ if (p != NULL)
87927+ *p = '\0';
87928+ dev = dev_get_by_name(sock_net(sk), iface);
87929+ if (dev == NULL)
87930+ continue;
87931+ idev = in_dev_get(dev);
87932+ if (idev == NULL) {
87933+ dev_put(dev);
87934+ continue;
87935+ }
87936+ rcu_read_lock();
87937+ for_ifa(idev) {
87938+ if (!strcmp(ip->iface, ifa->ifa_label)) {
87939+ our_addr = ifa->ifa_address;
87940+ our_netmask = 0xffffffff;
87941+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87942+ if (ret == 1) {
87943+ rcu_read_unlock();
87944+ in_dev_put(idev);
87945+ dev_put(dev);
87946+ return 0;
87947+ } else if (ret == 2) {
87948+ rcu_read_unlock();
87949+ in_dev_put(idev);
87950+ dev_put(dev);
87951+ goto denied;
87952+ }
87953+ }
87954+ } endfor_ifa(idev);
87955+ rcu_read_unlock();
87956+ in_dev_put(idev);
87957+ dev_put(dev);
87958+ } else {
87959+ our_addr = ip->addr;
87960+ our_netmask = ip->netmask;
87961+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87962+ if (ret == 1)
87963+ return 0;
87964+ else if (ret == 2)
87965+ goto denied;
87966+ }
87967+ }
87968+
87969+denied:
87970+ if (mode == GR_BIND)
87971+ 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));
87972+ else if (mode == GR_CONNECT)
87973+ 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));
87974+
87975+ return -EACCES;
87976+}
87977+
87978+int
87979+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
87980+{
87981+ /* always allow disconnection of dgram sockets with connect */
87982+ if (addr->sin_family == AF_UNSPEC)
87983+ return 0;
87984+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
87985+}
87986+
87987+int
87988+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
87989+{
87990+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
87991+}
87992+
87993+int gr_search_listen(struct socket *sock)
87994+{
87995+ struct sock *sk = sock->sk;
87996+ struct sockaddr_in addr;
87997+
87998+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87999+ addr.sin_port = inet_sk(sk)->inet_sport;
88000+
88001+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
88002+}
88003+
88004+int gr_search_accept(struct socket *sock)
88005+{
88006+ struct sock *sk = sock->sk;
88007+ struct sockaddr_in addr;
88008+
88009+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
88010+ addr.sin_port = inet_sk(sk)->inet_sport;
88011+
88012+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
88013+}
88014+
88015+int
88016+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
88017+{
88018+ if (addr)
88019+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
88020+ else {
88021+ struct sockaddr_in sin;
88022+ const struct inet_sock *inet = inet_sk(sk);
88023+
88024+ sin.sin_addr.s_addr = inet->inet_daddr;
88025+ sin.sin_port = inet->inet_dport;
88026+
88027+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
88028+ }
88029+}
88030+
88031+int
88032+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
88033+{
88034+ struct sockaddr_in sin;
88035+
88036+ if (unlikely(skb->len < sizeof (struct udphdr)))
88037+ return 0; // skip this packet
88038+
88039+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
88040+ sin.sin_port = udp_hdr(skb)->source;
88041+
88042+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
88043+}
88044diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
88045new file mode 100644
88046index 0000000..25f54ef
88047--- /dev/null
88048+++ b/grsecurity/gracl_learn.c
88049@@ -0,0 +1,207 @@
88050+#include <linux/kernel.h>
88051+#include <linux/mm.h>
88052+#include <linux/sched.h>
88053+#include <linux/poll.h>
88054+#include <linux/string.h>
88055+#include <linux/file.h>
88056+#include <linux/types.h>
88057+#include <linux/vmalloc.h>
88058+#include <linux/grinternal.h>
88059+
88060+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
88061+ size_t count, loff_t *ppos);
88062+extern int gr_acl_is_enabled(void);
88063+
88064+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
88065+static int gr_learn_attached;
88066+
88067+/* use a 512k buffer */
88068+#define LEARN_BUFFER_SIZE (512 * 1024)
88069+
88070+static DEFINE_SPINLOCK(gr_learn_lock);
88071+static DEFINE_MUTEX(gr_learn_user_mutex);
88072+
88073+/* we need to maintain two buffers, so that the kernel context of grlearn
88074+ uses a semaphore around the userspace copying, and the other kernel contexts
88075+ use a spinlock when copying into the buffer, since they cannot sleep
88076+*/
88077+static char *learn_buffer;
88078+static char *learn_buffer_user;
88079+static int learn_buffer_len;
88080+static int learn_buffer_user_len;
88081+
88082+static ssize_t
88083+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
88084+{
88085+ DECLARE_WAITQUEUE(wait, current);
88086+ ssize_t retval = 0;
88087+
88088+ add_wait_queue(&learn_wait, &wait);
88089+ set_current_state(TASK_INTERRUPTIBLE);
88090+ do {
88091+ mutex_lock(&gr_learn_user_mutex);
88092+ spin_lock(&gr_learn_lock);
88093+ if (learn_buffer_len)
88094+ break;
88095+ spin_unlock(&gr_learn_lock);
88096+ mutex_unlock(&gr_learn_user_mutex);
88097+ if (file->f_flags & O_NONBLOCK) {
88098+ retval = -EAGAIN;
88099+ goto out;
88100+ }
88101+ if (signal_pending(current)) {
88102+ retval = -ERESTARTSYS;
88103+ goto out;
88104+ }
88105+
88106+ schedule();
88107+ } while (1);
88108+
88109+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
88110+ learn_buffer_user_len = learn_buffer_len;
88111+ retval = learn_buffer_len;
88112+ learn_buffer_len = 0;
88113+
88114+ spin_unlock(&gr_learn_lock);
88115+
88116+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
88117+ retval = -EFAULT;
88118+
88119+ mutex_unlock(&gr_learn_user_mutex);
88120+out:
88121+ set_current_state(TASK_RUNNING);
88122+ remove_wait_queue(&learn_wait, &wait);
88123+ return retval;
88124+}
88125+
88126+static unsigned int
88127+poll_learn(struct file * file, poll_table * wait)
88128+{
88129+ poll_wait(file, &learn_wait, wait);
88130+
88131+ if (learn_buffer_len)
88132+ return (POLLIN | POLLRDNORM);
88133+
88134+ return 0;
88135+}
88136+
88137+void
88138+gr_clear_learn_entries(void)
88139+{
88140+ char *tmp;
88141+
88142+ mutex_lock(&gr_learn_user_mutex);
88143+ spin_lock(&gr_learn_lock);
88144+ tmp = learn_buffer;
88145+ learn_buffer = NULL;
88146+ spin_unlock(&gr_learn_lock);
88147+ if (tmp)
88148+ vfree(tmp);
88149+ if (learn_buffer_user != NULL) {
88150+ vfree(learn_buffer_user);
88151+ learn_buffer_user = NULL;
88152+ }
88153+ learn_buffer_len = 0;
88154+ mutex_unlock(&gr_learn_user_mutex);
88155+
88156+ return;
88157+}
88158+
88159+void
88160+gr_add_learn_entry(const char *fmt, ...)
88161+{
88162+ va_list args;
88163+ unsigned int len;
88164+
88165+ if (!gr_learn_attached)
88166+ return;
88167+
88168+ spin_lock(&gr_learn_lock);
88169+
88170+ /* leave a gap at the end so we know when it's "full" but don't have to
88171+ compute the exact length of the string we're trying to append
88172+ */
88173+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
88174+ spin_unlock(&gr_learn_lock);
88175+ wake_up_interruptible(&learn_wait);
88176+ return;
88177+ }
88178+ if (learn_buffer == NULL) {
88179+ spin_unlock(&gr_learn_lock);
88180+ return;
88181+ }
88182+
88183+ va_start(args, fmt);
88184+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
88185+ va_end(args);
88186+
88187+ learn_buffer_len += len + 1;
88188+
88189+ spin_unlock(&gr_learn_lock);
88190+ wake_up_interruptible(&learn_wait);
88191+
88192+ return;
88193+}
88194+
88195+static int
88196+open_learn(struct inode *inode, struct file *file)
88197+{
88198+ if (file->f_mode & FMODE_READ && gr_learn_attached)
88199+ return -EBUSY;
88200+ if (file->f_mode & FMODE_READ) {
88201+ int retval = 0;
88202+ mutex_lock(&gr_learn_user_mutex);
88203+ if (learn_buffer == NULL)
88204+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
88205+ if (learn_buffer_user == NULL)
88206+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
88207+ if (learn_buffer == NULL) {
88208+ retval = -ENOMEM;
88209+ goto out_error;
88210+ }
88211+ if (learn_buffer_user == NULL) {
88212+ retval = -ENOMEM;
88213+ goto out_error;
88214+ }
88215+ learn_buffer_len = 0;
88216+ learn_buffer_user_len = 0;
88217+ gr_learn_attached = 1;
88218+out_error:
88219+ mutex_unlock(&gr_learn_user_mutex);
88220+ return retval;
88221+ }
88222+ return 0;
88223+}
88224+
88225+static int
88226+close_learn(struct inode *inode, struct file *file)
88227+{
88228+ if (file->f_mode & FMODE_READ) {
88229+ char *tmp = NULL;
88230+ mutex_lock(&gr_learn_user_mutex);
88231+ spin_lock(&gr_learn_lock);
88232+ tmp = learn_buffer;
88233+ learn_buffer = NULL;
88234+ spin_unlock(&gr_learn_lock);
88235+ if (tmp)
88236+ vfree(tmp);
88237+ if (learn_buffer_user != NULL) {
88238+ vfree(learn_buffer_user);
88239+ learn_buffer_user = NULL;
88240+ }
88241+ learn_buffer_len = 0;
88242+ learn_buffer_user_len = 0;
88243+ gr_learn_attached = 0;
88244+ mutex_unlock(&gr_learn_user_mutex);
88245+ }
88246+
88247+ return 0;
88248+}
88249+
88250+const struct file_operations grsec_fops = {
88251+ .read = read_learn,
88252+ .write = write_grsec_handler,
88253+ .open = open_learn,
88254+ .release = close_learn,
88255+ .poll = poll_learn,
88256+};
88257diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
88258new file mode 100644
88259index 0000000..0773423
88260--- /dev/null
88261+++ b/grsecurity/gracl_policy.c
88262@@ -0,0 +1,1786 @@
88263+#include <linux/kernel.h>
88264+#include <linux/module.h>
88265+#include <linux/sched.h>
88266+#include <linux/mm.h>
88267+#include <linux/file.h>
88268+#include <linux/fs.h>
88269+#include <linux/namei.h>
88270+#include <linux/mount.h>
88271+#include <linux/tty.h>
88272+#include <linux/proc_fs.h>
88273+#include <linux/lglock.h>
88274+#include <linux/slab.h>
88275+#include <linux/vmalloc.h>
88276+#include <linux/types.h>
88277+#include <linux/sysctl.h>
88278+#include <linux/netdevice.h>
88279+#include <linux/ptrace.h>
88280+#include <linux/gracl.h>
88281+#include <linux/gralloc.h>
88282+#include <linux/security.h>
88283+#include <linux/grinternal.h>
88284+#include <linux/pid_namespace.h>
88285+#include <linux/stop_machine.h>
88286+#include <linux/fdtable.h>
88287+#include <linux/percpu.h>
88288+#include <linux/lglock.h>
88289+#include <linux/hugetlb.h>
88290+#include <linux/posix-timers.h>
88291+#include "../fs/mount.h"
88292+
88293+#include <asm/uaccess.h>
88294+#include <asm/errno.h>
88295+#include <asm/mman.h>
88296+
88297+extern struct gr_policy_state *polstate;
88298+
88299+#define FOR_EACH_ROLE_START(role) \
88300+ role = polstate->role_list; \
88301+ while (role) {
88302+
88303+#define FOR_EACH_ROLE_END(role) \
88304+ role = role->prev; \
88305+ }
88306+
88307+struct path gr_real_root;
88308+
88309+extern struct gr_alloc_state *current_alloc_state;
88310+
88311+u16 acl_sp_role_value;
88312+
88313+static DEFINE_MUTEX(gr_dev_mutex);
88314+
88315+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
88316+extern void gr_clear_learn_entries(void);
88317+
88318+struct gr_arg *gr_usermode __read_only;
88319+unsigned char *gr_system_salt __read_only;
88320+unsigned char *gr_system_sum __read_only;
88321+
88322+static unsigned int gr_auth_attempts = 0;
88323+static unsigned long gr_auth_expires = 0UL;
88324+
88325+struct acl_object_label *fakefs_obj_rw;
88326+struct acl_object_label *fakefs_obj_rwx;
88327+
88328+extern int gr_init_uidset(void);
88329+extern void gr_free_uidset(void);
88330+extern void gr_remove_uid(uid_t uid);
88331+extern int gr_find_uid(uid_t uid);
88332+
88333+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);
88334+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
88335+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
88336+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
88337+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);
88338+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
88339+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
88340+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
88341+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
88342+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88343+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88344+extern void assign_special_role(const char *rolename);
88345+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
88346+extern int gr_rbac_disable(void *unused);
88347+extern void gr_enable_rbac_system(void);
88348+
88349+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
88350+{
88351+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
88352+ return -EFAULT;
88353+
88354+ return 0;
88355+}
88356+
88357+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
88358+{
88359+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
88360+ return -EFAULT;
88361+
88362+ return 0;
88363+}
88364+
88365+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
88366+{
88367+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
88368+ return -EFAULT;
88369+
88370+ return 0;
88371+}
88372+
88373+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
88374+{
88375+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
88376+ return -EFAULT;
88377+
88378+ return 0;
88379+}
88380+
88381+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
88382+{
88383+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
88384+ return -EFAULT;
88385+
88386+ return 0;
88387+}
88388+
88389+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
88390+{
88391+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
88392+ return -EFAULT;
88393+
88394+ return 0;
88395+}
88396+
88397+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
88398+{
88399+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
88400+ return -EFAULT;
88401+
88402+ return 0;
88403+}
88404+
88405+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
88406+{
88407+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
88408+ return -EFAULT;
88409+
88410+ return 0;
88411+}
88412+
88413+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
88414+{
88415+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
88416+ return -EFAULT;
88417+
88418+ return 0;
88419+}
88420+
88421+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
88422+{
88423+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
88424+ return -EFAULT;
88425+
88426+ if ((uwrap->version != GRSECURITY_VERSION) ||
88427+ (uwrap->size != sizeof(struct gr_arg)))
88428+ return -EINVAL;
88429+
88430+ return 0;
88431+}
88432+
88433+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
88434+{
88435+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
88436+ return -EFAULT;
88437+
88438+ return 0;
88439+}
88440+
88441+static size_t get_gr_arg_wrapper_size_normal(void)
88442+{
88443+ return sizeof(struct gr_arg_wrapper);
88444+}
88445+
88446+#ifdef CONFIG_COMPAT
88447+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
88448+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
88449+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
88450+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
88451+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
88452+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
88453+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
88454+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
88455+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
88456+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
88457+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
88458+extern size_t get_gr_arg_wrapper_size_compat(void);
88459+
88460+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
88461+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
88462+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
88463+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
88464+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
88465+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
88466+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
88467+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
88468+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
88469+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
88470+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
88471+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
88472+
88473+#else
88474+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
88475+#define copy_gr_arg copy_gr_arg_normal
88476+#define copy_gr_hash_struct copy_gr_hash_struct_normal
88477+#define copy_acl_object_label copy_acl_object_label_normal
88478+#define copy_acl_subject_label copy_acl_subject_label_normal
88479+#define copy_acl_role_label copy_acl_role_label_normal
88480+#define copy_acl_ip_label copy_acl_ip_label_normal
88481+#define copy_pointer_from_array copy_pointer_from_array_normal
88482+#define copy_sprole_pw copy_sprole_pw_normal
88483+#define copy_role_transition copy_role_transition_normal
88484+#define copy_role_allowed_ip copy_role_allowed_ip_normal
88485+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
88486+#endif
88487+
88488+static struct acl_subject_label *
88489+lookup_subject_map(const struct acl_subject_label *userp)
88490+{
88491+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
88492+ struct subject_map *match;
88493+
88494+ match = polstate->subj_map_set.s_hash[index];
88495+
88496+ while (match && match->user != userp)
88497+ match = match->next;
88498+
88499+ if (match != NULL)
88500+ return match->kernel;
88501+ else
88502+ return NULL;
88503+}
88504+
88505+static void
88506+insert_subj_map_entry(struct subject_map *subjmap)
88507+{
88508+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
88509+ struct subject_map **curr;
88510+
88511+ subjmap->prev = NULL;
88512+
88513+ curr = &polstate->subj_map_set.s_hash[index];
88514+ if (*curr != NULL)
88515+ (*curr)->prev = subjmap;
88516+
88517+ subjmap->next = *curr;
88518+ *curr = subjmap;
88519+
88520+ return;
88521+}
88522+
88523+static void
88524+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
88525+{
88526+ unsigned int index =
88527+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
88528+ struct acl_role_label **curr;
88529+ struct acl_role_label *tmp, *tmp2;
88530+
88531+ curr = &polstate->acl_role_set.r_hash[index];
88532+
88533+ /* simple case, slot is empty, just set it to our role */
88534+ if (*curr == NULL) {
88535+ *curr = role;
88536+ } else {
88537+ /* example:
88538+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
88539+ 2 -> 3
88540+ */
88541+ /* first check to see if we can already be reached via this slot */
88542+ tmp = *curr;
88543+ while (tmp && tmp != role)
88544+ tmp = tmp->next;
88545+ if (tmp == role) {
88546+ /* we don't need to add ourselves to this slot's chain */
88547+ return;
88548+ }
88549+ /* we need to add ourselves to this chain, two cases */
88550+ if (role->next == NULL) {
88551+ /* simple case, append the current chain to our role */
88552+ role->next = *curr;
88553+ *curr = role;
88554+ } else {
88555+ /* 1 -> 2 -> 3 -> 4
88556+ 2 -> 3 -> 4
88557+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
88558+ */
88559+ /* trickier case: walk our role's chain until we find
88560+ the role for the start of the current slot's chain */
88561+ tmp = role;
88562+ tmp2 = *curr;
88563+ while (tmp->next && tmp->next != tmp2)
88564+ tmp = tmp->next;
88565+ if (tmp->next == tmp2) {
88566+ /* from example above, we found 3, so just
88567+ replace this slot's chain with ours */
88568+ *curr = role;
88569+ } else {
88570+ /* we didn't find a subset of our role's chain
88571+ in the current slot's chain, so append their
88572+ chain to ours, and set us as the first role in
88573+ the slot's chain
88574+
88575+ we could fold this case with the case above,
88576+ but making it explicit for clarity
88577+ */
88578+ tmp->next = tmp2;
88579+ *curr = role;
88580+ }
88581+ }
88582+ }
88583+
88584+ return;
88585+}
88586+
88587+static void
88588+insert_acl_role_label(struct acl_role_label *role)
88589+{
88590+ int i;
88591+
88592+ if (polstate->role_list == NULL) {
88593+ polstate->role_list = role;
88594+ role->prev = NULL;
88595+ } else {
88596+ role->prev = polstate->role_list;
88597+ polstate->role_list = role;
88598+ }
88599+
88600+ /* used for hash chains */
88601+ role->next = NULL;
88602+
88603+ if (role->roletype & GR_ROLE_DOMAIN) {
88604+ for (i = 0; i < role->domain_child_num; i++)
88605+ __insert_acl_role_label(role, role->domain_children[i]);
88606+ } else
88607+ __insert_acl_role_label(role, role->uidgid);
88608+}
88609+
88610+static int
88611+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
88612+{
88613+ struct name_entry **curr, *nentry;
88614+ struct inodev_entry *ientry;
88615+ unsigned int len = strlen(name);
88616+ unsigned int key = full_name_hash(name, len);
88617+ unsigned int index = key % polstate->name_set.n_size;
88618+
88619+ curr = &polstate->name_set.n_hash[index];
88620+
88621+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
88622+ curr = &((*curr)->next);
88623+
88624+ if (*curr != NULL)
88625+ return 1;
88626+
88627+ nentry = acl_alloc(sizeof (struct name_entry));
88628+ if (nentry == NULL)
88629+ return 0;
88630+ ientry = acl_alloc(sizeof (struct inodev_entry));
88631+ if (ientry == NULL)
88632+ return 0;
88633+ ientry->nentry = nentry;
88634+
88635+ nentry->key = key;
88636+ nentry->name = name;
88637+ nentry->inode = inode;
88638+ nentry->device = device;
88639+ nentry->len = len;
88640+ nentry->deleted = deleted;
88641+
88642+ nentry->prev = NULL;
88643+ curr = &polstate->name_set.n_hash[index];
88644+ if (*curr != NULL)
88645+ (*curr)->prev = nentry;
88646+ nentry->next = *curr;
88647+ *curr = nentry;
88648+
88649+ /* insert us into the table searchable by inode/dev */
88650+ __insert_inodev_entry(polstate, ientry);
88651+
88652+ return 1;
88653+}
88654+
88655+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
88656+
88657+static void *
88658+create_table(__u32 * len, int elementsize)
88659+{
88660+ unsigned int table_sizes[] = {
88661+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
88662+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
88663+ 4194301, 8388593, 16777213, 33554393, 67108859
88664+ };
88665+ void *newtable = NULL;
88666+ unsigned int pwr = 0;
88667+
88668+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
88669+ table_sizes[pwr] <= *len)
88670+ pwr++;
88671+
88672+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
88673+ return newtable;
88674+
88675+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
88676+ newtable =
88677+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
88678+ else
88679+ newtable = vmalloc(table_sizes[pwr] * elementsize);
88680+
88681+ *len = table_sizes[pwr];
88682+
88683+ return newtable;
88684+}
88685+
88686+static int
88687+init_variables(const struct gr_arg *arg, bool reload)
88688+{
88689+ struct task_struct *reaper = init_pid_ns.child_reaper;
88690+ unsigned int stacksize;
88691+
88692+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
88693+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
88694+ polstate->name_set.n_size = arg->role_db.num_objects;
88695+ polstate->inodev_set.i_size = arg->role_db.num_objects;
88696+
88697+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
88698+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
88699+ return 1;
88700+
88701+ if (!reload) {
88702+ if (!gr_init_uidset())
88703+ return 1;
88704+ }
88705+
88706+ /* set up the stack that holds allocation info */
88707+
88708+ stacksize = arg->role_db.num_pointers + 5;
88709+
88710+ if (!acl_alloc_stack_init(stacksize))
88711+ return 1;
88712+
88713+ if (!reload) {
88714+ /* grab reference for the real root dentry and vfsmount */
88715+ get_fs_root(reaper->fs, &gr_real_root);
88716+
88717+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88718+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", gr_get_dev_from_dentry(gr_real_root.dentry), gr_get_ino_from_dentry(gr_real_root.dentry));
88719+#endif
88720+
88721+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88722+ if (fakefs_obj_rw == NULL)
88723+ return 1;
88724+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
88725+
88726+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88727+ if (fakefs_obj_rwx == NULL)
88728+ return 1;
88729+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
88730+ }
88731+
88732+ polstate->subj_map_set.s_hash =
88733+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
88734+ polstate->acl_role_set.r_hash =
88735+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
88736+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
88737+ polstate->inodev_set.i_hash =
88738+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
88739+
88740+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
88741+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
88742+ return 1;
88743+
88744+ memset(polstate->subj_map_set.s_hash, 0,
88745+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
88746+ memset(polstate->acl_role_set.r_hash, 0,
88747+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
88748+ memset(polstate->name_set.n_hash, 0,
88749+ sizeof (struct name_entry *) * polstate->name_set.n_size);
88750+ memset(polstate->inodev_set.i_hash, 0,
88751+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
88752+
88753+ return 0;
88754+}
88755+
88756+/* free information not needed after startup
88757+ currently contains user->kernel pointer mappings for subjects
88758+*/
88759+
88760+static void
88761+free_init_variables(void)
88762+{
88763+ __u32 i;
88764+
88765+ if (polstate->subj_map_set.s_hash) {
88766+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
88767+ if (polstate->subj_map_set.s_hash[i]) {
88768+ kfree(polstate->subj_map_set.s_hash[i]);
88769+ polstate->subj_map_set.s_hash[i] = NULL;
88770+ }
88771+ }
88772+
88773+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
88774+ PAGE_SIZE)
88775+ kfree(polstate->subj_map_set.s_hash);
88776+ else
88777+ vfree(polstate->subj_map_set.s_hash);
88778+ }
88779+
88780+ return;
88781+}
88782+
88783+static void
88784+free_variables(bool reload)
88785+{
88786+ struct acl_subject_label *s;
88787+ struct acl_role_label *r;
88788+ struct task_struct *task, *task2;
88789+ unsigned int x;
88790+
88791+ if (!reload) {
88792+ gr_clear_learn_entries();
88793+
88794+ read_lock(&tasklist_lock);
88795+ do_each_thread(task2, task) {
88796+ task->acl_sp_role = 0;
88797+ task->acl_role_id = 0;
88798+ task->inherited = 0;
88799+ task->acl = NULL;
88800+ task->role = NULL;
88801+ } while_each_thread(task2, task);
88802+ read_unlock(&tasklist_lock);
88803+
88804+ kfree(fakefs_obj_rw);
88805+ fakefs_obj_rw = NULL;
88806+ kfree(fakefs_obj_rwx);
88807+ fakefs_obj_rwx = NULL;
88808+
88809+ /* release the reference to the real root dentry and vfsmount */
88810+ path_put(&gr_real_root);
88811+ memset(&gr_real_root, 0, sizeof(gr_real_root));
88812+ }
88813+
88814+ /* free all object hash tables */
88815+
88816+ FOR_EACH_ROLE_START(r)
88817+ if (r->subj_hash == NULL)
88818+ goto next_role;
88819+ FOR_EACH_SUBJECT_START(r, s, x)
88820+ if (s->obj_hash == NULL)
88821+ break;
88822+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88823+ kfree(s->obj_hash);
88824+ else
88825+ vfree(s->obj_hash);
88826+ FOR_EACH_SUBJECT_END(s, x)
88827+ FOR_EACH_NESTED_SUBJECT_START(r, s)
88828+ if (s->obj_hash == NULL)
88829+ break;
88830+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88831+ kfree(s->obj_hash);
88832+ else
88833+ vfree(s->obj_hash);
88834+ FOR_EACH_NESTED_SUBJECT_END(s)
88835+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
88836+ kfree(r->subj_hash);
88837+ else
88838+ vfree(r->subj_hash);
88839+ r->subj_hash = NULL;
88840+next_role:
88841+ FOR_EACH_ROLE_END(r)
88842+
88843+ acl_free_all();
88844+
88845+ if (polstate->acl_role_set.r_hash) {
88846+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
88847+ PAGE_SIZE)
88848+ kfree(polstate->acl_role_set.r_hash);
88849+ else
88850+ vfree(polstate->acl_role_set.r_hash);
88851+ }
88852+ if (polstate->name_set.n_hash) {
88853+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
88854+ PAGE_SIZE)
88855+ kfree(polstate->name_set.n_hash);
88856+ else
88857+ vfree(polstate->name_set.n_hash);
88858+ }
88859+
88860+ if (polstate->inodev_set.i_hash) {
88861+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
88862+ PAGE_SIZE)
88863+ kfree(polstate->inodev_set.i_hash);
88864+ else
88865+ vfree(polstate->inodev_set.i_hash);
88866+ }
88867+
88868+ if (!reload)
88869+ gr_free_uidset();
88870+
88871+ memset(&polstate->name_set, 0, sizeof (struct name_db));
88872+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
88873+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
88874+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
88875+
88876+ polstate->default_role = NULL;
88877+ polstate->kernel_role = NULL;
88878+ polstate->role_list = NULL;
88879+
88880+ return;
88881+}
88882+
88883+static struct acl_subject_label *
88884+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
88885+
88886+static int alloc_and_copy_string(char **name, unsigned int maxlen)
88887+{
88888+ unsigned int len = strnlen_user(*name, maxlen);
88889+ char *tmp;
88890+
88891+ if (!len || len >= maxlen)
88892+ return -EINVAL;
88893+
88894+ if ((tmp = (char *) acl_alloc(len)) == NULL)
88895+ return -ENOMEM;
88896+
88897+ if (copy_from_user(tmp, *name, len))
88898+ return -EFAULT;
88899+
88900+ tmp[len-1] = '\0';
88901+ *name = tmp;
88902+
88903+ return 0;
88904+}
88905+
88906+static int
88907+copy_user_glob(struct acl_object_label *obj)
88908+{
88909+ struct acl_object_label *g_tmp, **guser;
88910+ int error;
88911+
88912+ if (obj->globbed == NULL)
88913+ return 0;
88914+
88915+ guser = &obj->globbed;
88916+ while (*guser) {
88917+ g_tmp = (struct acl_object_label *)
88918+ acl_alloc(sizeof (struct acl_object_label));
88919+ if (g_tmp == NULL)
88920+ return -ENOMEM;
88921+
88922+ if (copy_acl_object_label(g_tmp, *guser))
88923+ return -EFAULT;
88924+
88925+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
88926+ if (error)
88927+ return error;
88928+
88929+ *guser = g_tmp;
88930+ guser = &(g_tmp->next);
88931+ }
88932+
88933+ return 0;
88934+}
88935+
88936+static int
88937+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
88938+ struct acl_role_label *role)
88939+{
88940+ struct acl_object_label *o_tmp;
88941+ int ret;
88942+
88943+ while (userp) {
88944+ if ((o_tmp = (struct acl_object_label *)
88945+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
88946+ return -ENOMEM;
88947+
88948+ if (copy_acl_object_label(o_tmp, userp))
88949+ return -EFAULT;
88950+
88951+ userp = o_tmp->prev;
88952+
88953+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
88954+ if (ret)
88955+ return ret;
88956+
88957+ insert_acl_obj_label(o_tmp, subj);
88958+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
88959+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
88960+ return -ENOMEM;
88961+
88962+ ret = copy_user_glob(o_tmp);
88963+ if (ret)
88964+ return ret;
88965+
88966+ if (o_tmp->nested) {
88967+ int already_copied;
88968+
88969+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
88970+ if (IS_ERR(o_tmp->nested))
88971+ return PTR_ERR(o_tmp->nested);
88972+
88973+ /* insert into nested subject list if we haven't copied this one yet
88974+ to prevent duplicate entries */
88975+ if (!already_copied) {
88976+ o_tmp->nested->next = role->hash->first;
88977+ role->hash->first = o_tmp->nested;
88978+ }
88979+ }
88980+ }
88981+
88982+ return 0;
88983+}
88984+
88985+static __u32
88986+count_user_subjs(struct acl_subject_label *userp)
88987+{
88988+ struct acl_subject_label s_tmp;
88989+ __u32 num = 0;
88990+
88991+ while (userp) {
88992+ if (copy_acl_subject_label(&s_tmp, userp))
88993+ break;
88994+
88995+ userp = s_tmp.prev;
88996+ }
88997+
88998+ return num;
88999+}
89000+
89001+static int
89002+copy_user_allowedips(struct acl_role_label *rolep)
89003+{
89004+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
89005+
89006+ ruserip = rolep->allowed_ips;
89007+
89008+ while (ruserip) {
89009+ rlast = rtmp;
89010+
89011+ if ((rtmp = (struct role_allowed_ip *)
89012+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
89013+ return -ENOMEM;
89014+
89015+ if (copy_role_allowed_ip(rtmp, ruserip))
89016+ return -EFAULT;
89017+
89018+ ruserip = rtmp->prev;
89019+
89020+ if (!rlast) {
89021+ rtmp->prev = NULL;
89022+ rolep->allowed_ips = rtmp;
89023+ } else {
89024+ rlast->next = rtmp;
89025+ rtmp->prev = rlast;
89026+ }
89027+
89028+ if (!ruserip)
89029+ rtmp->next = NULL;
89030+ }
89031+
89032+ return 0;
89033+}
89034+
89035+static int
89036+copy_user_transitions(struct acl_role_label *rolep)
89037+{
89038+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
89039+ int error;
89040+
89041+ rusertp = rolep->transitions;
89042+
89043+ while (rusertp) {
89044+ rlast = rtmp;
89045+
89046+ if ((rtmp = (struct role_transition *)
89047+ acl_alloc(sizeof (struct role_transition))) == NULL)
89048+ return -ENOMEM;
89049+
89050+ if (copy_role_transition(rtmp, rusertp))
89051+ return -EFAULT;
89052+
89053+ rusertp = rtmp->prev;
89054+
89055+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
89056+ if (error)
89057+ return error;
89058+
89059+ if (!rlast) {
89060+ rtmp->prev = NULL;
89061+ rolep->transitions = rtmp;
89062+ } else {
89063+ rlast->next = rtmp;
89064+ rtmp->prev = rlast;
89065+ }
89066+
89067+ if (!rusertp)
89068+ rtmp->next = NULL;
89069+ }
89070+
89071+ return 0;
89072+}
89073+
89074+static __u32 count_user_objs(const struct acl_object_label __user *userp)
89075+{
89076+ struct acl_object_label o_tmp;
89077+ __u32 num = 0;
89078+
89079+ while (userp) {
89080+ if (copy_acl_object_label(&o_tmp, userp))
89081+ break;
89082+
89083+ userp = o_tmp.prev;
89084+ num++;
89085+ }
89086+
89087+ return num;
89088+}
89089+
89090+static struct acl_subject_label *
89091+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
89092+{
89093+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
89094+ __u32 num_objs;
89095+ struct acl_ip_label **i_tmp, *i_utmp2;
89096+ struct gr_hash_struct ghash;
89097+ struct subject_map *subjmap;
89098+ unsigned int i_num;
89099+ int err;
89100+
89101+ if (already_copied != NULL)
89102+ *already_copied = 0;
89103+
89104+ s_tmp = lookup_subject_map(userp);
89105+
89106+ /* we've already copied this subject into the kernel, just return
89107+ the reference to it, and don't copy it over again
89108+ */
89109+ if (s_tmp) {
89110+ if (already_copied != NULL)
89111+ *already_copied = 1;
89112+ return(s_tmp);
89113+ }
89114+
89115+ if ((s_tmp = (struct acl_subject_label *)
89116+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
89117+ return ERR_PTR(-ENOMEM);
89118+
89119+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
89120+ if (subjmap == NULL)
89121+ return ERR_PTR(-ENOMEM);
89122+
89123+ subjmap->user = userp;
89124+ subjmap->kernel = s_tmp;
89125+ insert_subj_map_entry(subjmap);
89126+
89127+ if (copy_acl_subject_label(s_tmp, userp))
89128+ return ERR_PTR(-EFAULT);
89129+
89130+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
89131+ if (err)
89132+ return ERR_PTR(err);
89133+
89134+ if (!strcmp(s_tmp->filename, "/"))
89135+ role->root_label = s_tmp;
89136+
89137+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
89138+ return ERR_PTR(-EFAULT);
89139+
89140+ /* copy user and group transition tables */
89141+
89142+ if (s_tmp->user_trans_num) {
89143+ uid_t *uidlist;
89144+
89145+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
89146+ if (uidlist == NULL)
89147+ return ERR_PTR(-ENOMEM);
89148+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
89149+ return ERR_PTR(-EFAULT);
89150+
89151+ s_tmp->user_transitions = uidlist;
89152+ }
89153+
89154+ if (s_tmp->group_trans_num) {
89155+ gid_t *gidlist;
89156+
89157+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
89158+ if (gidlist == NULL)
89159+ return ERR_PTR(-ENOMEM);
89160+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
89161+ return ERR_PTR(-EFAULT);
89162+
89163+ s_tmp->group_transitions = gidlist;
89164+ }
89165+
89166+ /* set up object hash table */
89167+ num_objs = count_user_objs(ghash.first);
89168+
89169+ s_tmp->obj_hash_size = num_objs;
89170+ s_tmp->obj_hash =
89171+ (struct acl_object_label **)
89172+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
89173+
89174+ if (!s_tmp->obj_hash)
89175+ return ERR_PTR(-ENOMEM);
89176+
89177+ memset(s_tmp->obj_hash, 0,
89178+ s_tmp->obj_hash_size *
89179+ sizeof (struct acl_object_label *));
89180+
89181+ /* add in objects */
89182+ err = copy_user_objs(ghash.first, s_tmp, role);
89183+
89184+ if (err)
89185+ return ERR_PTR(err);
89186+
89187+ /* set pointer for parent subject */
89188+ if (s_tmp->parent_subject) {
89189+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
89190+
89191+ if (IS_ERR(s_tmp2))
89192+ return s_tmp2;
89193+
89194+ s_tmp->parent_subject = s_tmp2;
89195+ }
89196+
89197+ /* add in ip acls */
89198+
89199+ if (!s_tmp->ip_num) {
89200+ s_tmp->ips = NULL;
89201+ goto insert;
89202+ }
89203+
89204+ i_tmp =
89205+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
89206+ sizeof (struct acl_ip_label *));
89207+
89208+ if (!i_tmp)
89209+ return ERR_PTR(-ENOMEM);
89210+
89211+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
89212+ *(i_tmp + i_num) =
89213+ (struct acl_ip_label *)
89214+ acl_alloc(sizeof (struct acl_ip_label));
89215+ if (!*(i_tmp + i_num))
89216+ return ERR_PTR(-ENOMEM);
89217+
89218+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
89219+ return ERR_PTR(-EFAULT);
89220+
89221+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
89222+ return ERR_PTR(-EFAULT);
89223+
89224+ if ((*(i_tmp + i_num))->iface == NULL)
89225+ continue;
89226+
89227+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
89228+ if (err)
89229+ return ERR_PTR(err);
89230+ }
89231+
89232+ s_tmp->ips = i_tmp;
89233+
89234+insert:
89235+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
89236+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
89237+ return ERR_PTR(-ENOMEM);
89238+
89239+ return s_tmp;
89240+}
89241+
89242+static int
89243+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
89244+{
89245+ struct acl_subject_label s_pre;
89246+ struct acl_subject_label * ret;
89247+ int err;
89248+
89249+ while (userp) {
89250+ if (copy_acl_subject_label(&s_pre, userp))
89251+ return -EFAULT;
89252+
89253+ ret = do_copy_user_subj(userp, role, NULL);
89254+
89255+ err = PTR_ERR(ret);
89256+ if (IS_ERR(ret))
89257+ return err;
89258+
89259+ insert_acl_subj_label(ret, role);
89260+
89261+ userp = s_pre.prev;
89262+ }
89263+
89264+ return 0;
89265+}
89266+
89267+static int
89268+copy_user_acl(struct gr_arg *arg)
89269+{
89270+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
89271+ struct acl_subject_label *subj_list;
89272+ struct sprole_pw *sptmp;
89273+ struct gr_hash_struct *ghash;
89274+ uid_t *domainlist;
89275+ unsigned int r_num;
89276+ int err = 0;
89277+ __u16 i;
89278+ __u32 num_subjs;
89279+
89280+ /* we need a default and kernel role */
89281+ if (arg->role_db.num_roles < 2)
89282+ return -EINVAL;
89283+
89284+ /* copy special role authentication info from userspace */
89285+
89286+ polstate->num_sprole_pws = arg->num_sprole_pws;
89287+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
89288+
89289+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
89290+ return -ENOMEM;
89291+
89292+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89293+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
89294+ if (!sptmp)
89295+ return -ENOMEM;
89296+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
89297+ return -EFAULT;
89298+
89299+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
89300+ if (err)
89301+ return err;
89302+
89303+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
89304+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
89305+#endif
89306+
89307+ polstate->acl_special_roles[i] = sptmp;
89308+ }
89309+
89310+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
89311+
89312+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
89313+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
89314+
89315+ if (!r_tmp)
89316+ return -ENOMEM;
89317+
89318+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
89319+ return -EFAULT;
89320+
89321+ if (copy_acl_role_label(r_tmp, r_utmp2))
89322+ return -EFAULT;
89323+
89324+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
89325+ if (err)
89326+ return err;
89327+
89328+ if (!strcmp(r_tmp->rolename, "default")
89329+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
89330+ polstate->default_role = r_tmp;
89331+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
89332+ polstate->kernel_role = r_tmp;
89333+ }
89334+
89335+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
89336+ return -ENOMEM;
89337+
89338+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
89339+ return -EFAULT;
89340+
89341+ r_tmp->hash = ghash;
89342+
89343+ num_subjs = count_user_subjs(r_tmp->hash->first);
89344+
89345+ r_tmp->subj_hash_size = num_subjs;
89346+ r_tmp->subj_hash =
89347+ (struct acl_subject_label **)
89348+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
89349+
89350+ if (!r_tmp->subj_hash)
89351+ return -ENOMEM;
89352+
89353+ err = copy_user_allowedips(r_tmp);
89354+ if (err)
89355+ return err;
89356+
89357+ /* copy domain info */
89358+ if (r_tmp->domain_children != NULL) {
89359+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
89360+ if (domainlist == NULL)
89361+ return -ENOMEM;
89362+
89363+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
89364+ return -EFAULT;
89365+
89366+ r_tmp->domain_children = domainlist;
89367+ }
89368+
89369+ err = copy_user_transitions(r_tmp);
89370+ if (err)
89371+ return err;
89372+
89373+ memset(r_tmp->subj_hash, 0,
89374+ r_tmp->subj_hash_size *
89375+ sizeof (struct acl_subject_label *));
89376+
89377+ /* acquire the list of subjects, then NULL out
89378+ the list prior to parsing the subjects for this role,
89379+ as during this parsing the list is replaced with a list
89380+ of *nested* subjects for the role
89381+ */
89382+ subj_list = r_tmp->hash->first;
89383+
89384+ /* set nested subject list to null */
89385+ r_tmp->hash->first = NULL;
89386+
89387+ err = copy_user_subjs(subj_list, r_tmp);
89388+
89389+ if (err)
89390+ return err;
89391+
89392+ insert_acl_role_label(r_tmp);
89393+ }
89394+
89395+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
89396+ return -EINVAL;
89397+
89398+ return err;
89399+}
89400+
89401+static int gracl_reload_apply_policies(void *reload)
89402+{
89403+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
89404+ struct task_struct *task, *task2;
89405+ struct acl_role_label *role, *rtmp;
89406+ struct acl_subject_label *subj;
89407+ const struct cred *cred;
89408+ int role_applied;
89409+ int ret = 0;
89410+
89411+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
89412+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
89413+
89414+ /* first make sure we'll be able to apply the new policy cleanly */
89415+ do_each_thread(task2, task) {
89416+ if (task->exec_file == NULL)
89417+ continue;
89418+ role_applied = 0;
89419+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89420+ /* preserve special roles */
89421+ FOR_EACH_ROLE_START(role)
89422+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89423+ rtmp = task->role;
89424+ task->role = role;
89425+ role_applied = 1;
89426+ break;
89427+ }
89428+ FOR_EACH_ROLE_END(role)
89429+ }
89430+ if (!role_applied) {
89431+ cred = __task_cred(task);
89432+ rtmp = task->role;
89433+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89434+ }
89435+ /* this handles non-nested inherited subjects, nested subjects will still
89436+ be dropped currently */
89437+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89438+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
89439+ /* change the role back so that we've made no modifications to the policy */
89440+ task->role = rtmp;
89441+
89442+ if (subj == NULL || task->tmpacl == NULL) {
89443+ ret = -EINVAL;
89444+ goto out;
89445+ }
89446+ } while_each_thread(task2, task);
89447+
89448+ /* now actually apply the policy */
89449+
89450+ do_each_thread(task2, task) {
89451+ if (task->exec_file) {
89452+ role_applied = 0;
89453+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89454+ /* preserve special roles */
89455+ FOR_EACH_ROLE_START(role)
89456+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89457+ task->role = role;
89458+ role_applied = 1;
89459+ break;
89460+ }
89461+ FOR_EACH_ROLE_END(role)
89462+ }
89463+ if (!role_applied) {
89464+ cred = __task_cred(task);
89465+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89466+ }
89467+ /* this handles non-nested inherited subjects, nested subjects will still
89468+ be dropped currently */
89469+ if (!reload_state->oldmode && task->inherited)
89470+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89471+ else {
89472+ /* looked up and tagged to the task previously */
89473+ subj = task->tmpacl;
89474+ }
89475+ /* subj will be non-null */
89476+ __gr_apply_subject_to_task(polstate, task, subj);
89477+ if (reload_state->oldmode) {
89478+ task->acl_role_id = 0;
89479+ task->acl_sp_role = 0;
89480+ task->inherited = 0;
89481+ }
89482+ } else {
89483+ // it's a kernel process
89484+ task->role = polstate->kernel_role;
89485+ task->acl = polstate->kernel_role->root_label;
89486+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89487+ task->acl->mode &= ~GR_PROCFIND;
89488+#endif
89489+ }
89490+ } while_each_thread(task2, task);
89491+
89492+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
89493+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
89494+
89495+out:
89496+
89497+ return ret;
89498+}
89499+
89500+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
89501+{
89502+ struct gr_reload_state new_reload_state = { };
89503+ int err;
89504+
89505+ new_reload_state.oldpolicy_ptr = polstate;
89506+ new_reload_state.oldalloc_ptr = current_alloc_state;
89507+ new_reload_state.oldmode = oldmode;
89508+
89509+ current_alloc_state = &new_reload_state.newalloc;
89510+ polstate = &new_reload_state.newpolicy;
89511+
89512+ /* everything relevant is now saved off, copy in the new policy */
89513+ if (init_variables(args, true)) {
89514+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89515+ err = -ENOMEM;
89516+ goto error;
89517+ }
89518+
89519+ err = copy_user_acl(args);
89520+ free_init_variables();
89521+ if (err)
89522+ goto error;
89523+ /* the new policy is copied in, with the old policy available via saved_state
89524+ first go through applying roles, making sure to preserve special roles
89525+ then apply new subjects, making sure to preserve inherited and nested subjects,
89526+ though currently only inherited subjects will be preserved
89527+ */
89528+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
89529+ if (err)
89530+ goto error;
89531+
89532+ /* we've now applied the new policy, so restore the old policy state to free it */
89533+ polstate = &new_reload_state.oldpolicy;
89534+ current_alloc_state = &new_reload_state.oldalloc;
89535+ free_variables(true);
89536+
89537+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
89538+ to running_polstate/current_alloc_state inside stop_machine
89539+ */
89540+ err = 0;
89541+ goto out;
89542+error:
89543+ /* on error of loading the new policy, we'll just keep the previous
89544+ policy set around
89545+ */
89546+ free_variables(true);
89547+
89548+ /* doesn't affect runtime, but maintains consistent state */
89549+out:
89550+ polstate = new_reload_state.oldpolicy_ptr;
89551+ current_alloc_state = new_reload_state.oldalloc_ptr;
89552+
89553+ return err;
89554+}
89555+
89556+static int
89557+gracl_init(struct gr_arg *args)
89558+{
89559+ int error = 0;
89560+
89561+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
89562+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
89563+
89564+ if (init_variables(args, false)) {
89565+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89566+ error = -ENOMEM;
89567+ goto out;
89568+ }
89569+
89570+ error = copy_user_acl(args);
89571+ free_init_variables();
89572+ if (error)
89573+ goto out;
89574+
89575+ error = gr_set_acls(0);
89576+ if (error)
89577+ goto out;
89578+
89579+ gr_enable_rbac_system();
89580+
89581+ return 0;
89582+
89583+out:
89584+ free_variables(false);
89585+ return error;
89586+}
89587+
89588+static int
89589+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
89590+ unsigned char **sum)
89591+{
89592+ struct acl_role_label *r;
89593+ struct role_allowed_ip *ipp;
89594+ struct role_transition *trans;
89595+ unsigned int i;
89596+ int found = 0;
89597+ u32 curr_ip = current->signal->curr_ip;
89598+
89599+ current->signal->saved_ip = curr_ip;
89600+
89601+ /* check transition table */
89602+
89603+ for (trans = current->role->transitions; trans; trans = trans->next) {
89604+ if (!strcmp(rolename, trans->rolename)) {
89605+ found = 1;
89606+ break;
89607+ }
89608+ }
89609+
89610+ if (!found)
89611+ return 0;
89612+
89613+ /* handle special roles that do not require authentication
89614+ and check ip */
89615+
89616+ FOR_EACH_ROLE_START(r)
89617+ if (!strcmp(rolename, r->rolename) &&
89618+ (r->roletype & GR_ROLE_SPECIAL)) {
89619+ found = 0;
89620+ if (r->allowed_ips != NULL) {
89621+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
89622+ if ((ntohl(curr_ip) & ipp->netmask) ==
89623+ (ntohl(ipp->addr) & ipp->netmask))
89624+ found = 1;
89625+ }
89626+ } else
89627+ found = 2;
89628+ if (!found)
89629+ return 0;
89630+
89631+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
89632+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
89633+ *salt = NULL;
89634+ *sum = NULL;
89635+ return 1;
89636+ }
89637+ }
89638+ FOR_EACH_ROLE_END(r)
89639+
89640+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89641+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
89642+ *salt = polstate->acl_special_roles[i]->salt;
89643+ *sum = polstate->acl_special_roles[i]->sum;
89644+ return 1;
89645+ }
89646+ }
89647+
89648+ return 0;
89649+}
89650+
89651+int gr_check_secure_terminal(struct task_struct *task)
89652+{
89653+ struct task_struct *p, *p2, *p3;
89654+ struct files_struct *files;
89655+ struct fdtable *fdt;
89656+ struct file *our_file = NULL, *file;
89657+ struct inode *our_inode = NULL;
89658+ int i;
89659+
89660+ if (task->signal->tty == NULL)
89661+ return 1;
89662+
89663+ files = get_files_struct(task);
89664+ if (files != NULL) {
89665+ rcu_read_lock();
89666+ fdt = files_fdtable(files);
89667+ for (i=0; i < fdt->max_fds; i++) {
89668+ file = fcheck_files(files, i);
89669+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
89670+ get_file(file);
89671+ our_file = file;
89672+ }
89673+ }
89674+ rcu_read_unlock();
89675+ put_files_struct(files);
89676+ }
89677+
89678+ if (our_file == NULL)
89679+ return 1;
89680+
89681+ our_inode = d_backing_inode(our_file->f_path.dentry);
89682+
89683+ read_lock(&tasklist_lock);
89684+ do_each_thread(p2, p) {
89685+ files = get_files_struct(p);
89686+ if (files == NULL ||
89687+ (p->signal && p->signal->tty == task->signal->tty)) {
89688+ if (files != NULL)
89689+ put_files_struct(files);
89690+ continue;
89691+ }
89692+ rcu_read_lock();
89693+ fdt = files_fdtable(files);
89694+ for (i=0; i < fdt->max_fds; i++) {
89695+ struct inode *inode = NULL;
89696+ file = fcheck_files(files, i);
89697+ if (file)
89698+ inode = d_backing_inode(file->f_path.dentry);
89699+ if (inode && S_ISCHR(inode->i_mode) && inode->i_rdev == our_inode->i_rdev) {
89700+ p3 = task;
89701+ while (task_pid_nr(p3) > 0) {
89702+ if (p3 == p)
89703+ break;
89704+ p3 = p3->real_parent;
89705+ }
89706+ if (p3 == p)
89707+ break;
89708+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
89709+ gr_handle_alertkill(p);
89710+ rcu_read_unlock();
89711+ put_files_struct(files);
89712+ read_unlock(&tasklist_lock);
89713+ fput(our_file);
89714+ return 0;
89715+ }
89716+ }
89717+ rcu_read_unlock();
89718+ put_files_struct(files);
89719+ } while_each_thread(p2, p);
89720+ read_unlock(&tasklist_lock);
89721+
89722+ fput(our_file);
89723+ return 1;
89724+}
89725+
89726+ssize_t
89727+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
89728+{
89729+ struct gr_arg_wrapper uwrap;
89730+ unsigned char *sprole_salt = NULL;
89731+ unsigned char *sprole_sum = NULL;
89732+ int error = 0;
89733+ int error2 = 0;
89734+ size_t req_count = 0;
89735+ unsigned char oldmode = 0;
89736+
89737+ mutex_lock(&gr_dev_mutex);
89738+
89739+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
89740+ error = -EPERM;
89741+ goto out;
89742+ }
89743+
89744+#ifdef CONFIG_COMPAT
89745+ pax_open_kernel();
89746+ if (is_compat_task()) {
89747+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
89748+ copy_gr_arg = &copy_gr_arg_compat;
89749+ copy_acl_object_label = &copy_acl_object_label_compat;
89750+ copy_acl_subject_label = &copy_acl_subject_label_compat;
89751+ copy_acl_role_label = &copy_acl_role_label_compat;
89752+ copy_acl_ip_label = &copy_acl_ip_label_compat;
89753+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
89754+ copy_role_transition = &copy_role_transition_compat;
89755+ copy_sprole_pw = &copy_sprole_pw_compat;
89756+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
89757+ copy_pointer_from_array = &copy_pointer_from_array_compat;
89758+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
89759+ } else {
89760+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
89761+ copy_gr_arg = &copy_gr_arg_normal;
89762+ copy_acl_object_label = &copy_acl_object_label_normal;
89763+ copy_acl_subject_label = &copy_acl_subject_label_normal;
89764+ copy_acl_role_label = &copy_acl_role_label_normal;
89765+ copy_acl_ip_label = &copy_acl_ip_label_normal;
89766+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
89767+ copy_role_transition = &copy_role_transition_normal;
89768+ copy_sprole_pw = &copy_sprole_pw_normal;
89769+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
89770+ copy_pointer_from_array = &copy_pointer_from_array_normal;
89771+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
89772+ }
89773+ pax_close_kernel();
89774+#endif
89775+
89776+ req_count = get_gr_arg_wrapper_size();
89777+
89778+ if (count != req_count) {
89779+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
89780+ error = -EINVAL;
89781+ goto out;
89782+ }
89783+
89784+
89785+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
89786+ gr_auth_expires = 0;
89787+ gr_auth_attempts = 0;
89788+ }
89789+
89790+ error = copy_gr_arg_wrapper(buf, &uwrap);
89791+ if (error)
89792+ goto out;
89793+
89794+ error = copy_gr_arg(uwrap.arg, gr_usermode);
89795+ if (error)
89796+ goto out;
89797+
89798+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89799+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89800+ time_after(gr_auth_expires, get_seconds())) {
89801+ error = -EBUSY;
89802+ goto out;
89803+ }
89804+
89805+ /* if non-root trying to do anything other than use a special role,
89806+ do not attempt authentication, do not count towards authentication
89807+ locking
89808+ */
89809+
89810+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
89811+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89812+ gr_is_global_nonroot(current_uid())) {
89813+ error = -EPERM;
89814+ goto out;
89815+ }
89816+
89817+ /* ensure pw and special role name are null terminated */
89818+
89819+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
89820+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
89821+
89822+ /* Okay.
89823+ * We have our enough of the argument structure..(we have yet
89824+ * to copy_from_user the tables themselves) . Copy the tables
89825+ * only if we need them, i.e. for loading operations. */
89826+
89827+ switch (gr_usermode->mode) {
89828+ case GR_STATUS:
89829+ if (gr_acl_is_enabled()) {
89830+ error = 1;
89831+ if (!gr_check_secure_terminal(current))
89832+ error = 3;
89833+ } else
89834+ error = 2;
89835+ goto out;
89836+ case GR_SHUTDOWN:
89837+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89838+ stop_machine(gr_rbac_disable, NULL, NULL);
89839+ free_variables(false);
89840+ memset(gr_usermode, 0, sizeof(struct gr_arg));
89841+ memset(gr_system_salt, 0, GR_SALT_LEN);
89842+ memset(gr_system_sum, 0, GR_SHA_LEN);
89843+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
89844+ } else if (gr_acl_is_enabled()) {
89845+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
89846+ error = -EPERM;
89847+ } else {
89848+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
89849+ error = -EAGAIN;
89850+ }
89851+ break;
89852+ case GR_ENABLE:
89853+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
89854+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
89855+ else {
89856+ if (gr_acl_is_enabled())
89857+ error = -EAGAIN;
89858+ else
89859+ error = error2;
89860+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
89861+ }
89862+ break;
89863+ case GR_OLDRELOAD:
89864+ oldmode = 1;
89865+ case GR_RELOAD:
89866+ if (!gr_acl_is_enabled()) {
89867+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
89868+ error = -EAGAIN;
89869+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89870+ error2 = gracl_reload(gr_usermode, oldmode);
89871+ if (!error2)
89872+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
89873+ else {
89874+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89875+ error = error2;
89876+ }
89877+ } else {
89878+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89879+ error = -EPERM;
89880+ }
89881+ break;
89882+ case GR_SEGVMOD:
89883+ if (unlikely(!gr_acl_is_enabled())) {
89884+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
89885+ error = -EAGAIN;
89886+ break;
89887+ }
89888+
89889+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89890+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
89891+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
89892+ struct acl_subject_label *segvacl;
89893+ segvacl =
89894+ lookup_acl_subj_label(gr_usermode->segv_inode,
89895+ gr_usermode->segv_device,
89896+ current->role);
89897+ if (segvacl) {
89898+ segvacl->crashes = 0;
89899+ segvacl->expires = 0;
89900+ }
89901+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
89902+ gr_remove_uid(gr_usermode->segv_uid);
89903+ }
89904+ } else {
89905+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
89906+ error = -EPERM;
89907+ }
89908+ break;
89909+ case GR_SPROLE:
89910+ case GR_SPROLEPAM:
89911+ if (unlikely(!gr_acl_is_enabled())) {
89912+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
89913+ error = -EAGAIN;
89914+ break;
89915+ }
89916+
89917+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
89918+ current->role->expires = 0;
89919+ current->role->auth_attempts = 0;
89920+ }
89921+
89922+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89923+ time_after(current->role->expires, get_seconds())) {
89924+ error = -EBUSY;
89925+ goto out;
89926+ }
89927+
89928+ if (lookup_special_role_auth
89929+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
89930+ && ((!sprole_salt && !sprole_sum)
89931+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
89932+ char *p = "";
89933+ assign_special_role(gr_usermode->sp_role);
89934+ read_lock(&tasklist_lock);
89935+ if (current->real_parent)
89936+ p = current->real_parent->role->rolename;
89937+ read_unlock(&tasklist_lock);
89938+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
89939+ p, acl_sp_role_value);
89940+ } else {
89941+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
89942+ error = -EPERM;
89943+ if(!(current->role->auth_attempts++))
89944+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89945+
89946+ goto out;
89947+ }
89948+ break;
89949+ case GR_UNSPROLE:
89950+ if (unlikely(!gr_acl_is_enabled())) {
89951+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
89952+ error = -EAGAIN;
89953+ break;
89954+ }
89955+
89956+ if (current->role->roletype & GR_ROLE_SPECIAL) {
89957+ char *p = "";
89958+ int i = 0;
89959+
89960+ read_lock(&tasklist_lock);
89961+ if (current->real_parent) {
89962+ p = current->real_parent->role->rolename;
89963+ i = current->real_parent->acl_role_id;
89964+ }
89965+ read_unlock(&tasklist_lock);
89966+
89967+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
89968+ gr_set_acls(1);
89969+ } else {
89970+ error = -EPERM;
89971+ goto out;
89972+ }
89973+ break;
89974+ default:
89975+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
89976+ error = -EINVAL;
89977+ break;
89978+ }
89979+
89980+ if (error != -EPERM)
89981+ goto out;
89982+
89983+ if(!(gr_auth_attempts++))
89984+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89985+
89986+ out:
89987+ mutex_unlock(&gr_dev_mutex);
89988+
89989+ if (!error)
89990+ error = req_count;
89991+
89992+ return error;
89993+}
89994+
89995+int
89996+gr_set_acls(const int type)
89997+{
89998+ struct task_struct *task, *task2;
89999+ struct acl_role_label *role = current->role;
90000+ struct acl_subject_label *subj;
90001+ __u16 acl_role_id = current->acl_role_id;
90002+ const struct cred *cred;
90003+ int ret;
90004+
90005+ rcu_read_lock();
90006+ read_lock(&tasklist_lock);
90007+ read_lock(&grsec_exec_file_lock);
90008+ do_each_thread(task2, task) {
90009+ /* check to see if we're called from the exit handler,
90010+ if so, only replace ACLs that have inherited the admin
90011+ ACL */
90012+
90013+ if (type && (task->role != role ||
90014+ task->acl_role_id != acl_role_id))
90015+ continue;
90016+
90017+ task->acl_role_id = 0;
90018+ task->acl_sp_role = 0;
90019+ task->inherited = 0;
90020+
90021+ if (task->exec_file) {
90022+ cred = __task_cred(task);
90023+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
90024+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
90025+ if (subj == NULL) {
90026+ ret = -EINVAL;
90027+ read_unlock(&grsec_exec_file_lock);
90028+ read_unlock(&tasklist_lock);
90029+ rcu_read_unlock();
90030+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
90031+ return ret;
90032+ }
90033+ __gr_apply_subject_to_task(polstate, task, subj);
90034+ } else {
90035+ // it's a kernel process
90036+ task->role = polstate->kernel_role;
90037+ task->acl = polstate->kernel_role->root_label;
90038+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
90039+ task->acl->mode &= ~GR_PROCFIND;
90040+#endif
90041+ }
90042+ } while_each_thread(task2, task);
90043+ read_unlock(&grsec_exec_file_lock);
90044+ read_unlock(&tasklist_lock);
90045+ rcu_read_unlock();
90046+
90047+ return 0;
90048+}
90049diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
90050new file mode 100644
90051index 0000000..39645c9
90052--- /dev/null
90053+++ b/grsecurity/gracl_res.c
90054@@ -0,0 +1,68 @@
90055+#include <linux/kernel.h>
90056+#include <linux/sched.h>
90057+#include <linux/gracl.h>
90058+#include <linux/grinternal.h>
90059+
90060+static const char *restab_log[] = {
90061+ [RLIMIT_CPU] = "RLIMIT_CPU",
90062+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
90063+ [RLIMIT_DATA] = "RLIMIT_DATA",
90064+ [RLIMIT_STACK] = "RLIMIT_STACK",
90065+ [RLIMIT_CORE] = "RLIMIT_CORE",
90066+ [RLIMIT_RSS] = "RLIMIT_RSS",
90067+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
90068+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
90069+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
90070+ [RLIMIT_AS] = "RLIMIT_AS",
90071+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
90072+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
90073+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
90074+ [RLIMIT_NICE] = "RLIMIT_NICE",
90075+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
90076+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
90077+ [GR_CRASH_RES] = "RLIMIT_CRASH"
90078+};
90079+
90080+void
90081+gr_log_resource(const struct task_struct *task,
90082+ const int res, const unsigned long wanted, const int gt)
90083+{
90084+ const struct cred *cred;
90085+ unsigned long rlim;
90086+
90087+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
90088+ return;
90089+
90090+ // not yet supported resource
90091+ if (unlikely(!restab_log[res]))
90092+ return;
90093+
90094+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
90095+ rlim = task_rlimit_max(task, res);
90096+ else
90097+ rlim = task_rlimit(task, res);
90098+
90099+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
90100+ return;
90101+
90102+ rcu_read_lock();
90103+ cred = __task_cred(task);
90104+
90105+ if (res == RLIMIT_NPROC &&
90106+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
90107+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
90108+ goto out_rcu_unlock;
90109+ else if (res == RLIMIT_MEMLOCK &&
90110+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
90111+ goto out_rcu_unlock;
90112+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
90113+ goto out_rcu_unlock;
90114+ rcu_read_unlock();
90115+
90116+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
90117+
90118+ return;
90119+out_rcu_unlock:
90120+ rcu_read_unlock();
90121+ return;
90122+}
90123diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
90124new file mode 100644
90125index 0000000..21646aa
90126--- /dev/null
90127+++ b/grsecurity/gracl_segv.c
90128@@ -0,0 +1,304 @@
90129+#include <linux/kernel.h>
90130+#include <linux/mm.h>
90131+#include <asm/uaccess.h>
90132+#include <asm/errno.h>
90133+#include <asm/mman.h>
90134+#include <net/sock.h>
90135+#include <linux/file.h>
90136+#include <linux/fs.h>
90137+#include <linux/net.h>
90138+#include <linux/in.h>
90139+#include <linux/slab.h>
90140+#include <linux/types.h>
90141+#include <linux/sched.h>
90142+#include <linux/timer.h>
90143+#include <linux/gracl.h>
90144+#include <linux/grsecurity.h>
90145+#include <linux/grinternal.h>
90146+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
90147+#include <linux/magic.h>
90148+#include <linux/pagemap.h>
90149+#include "../fs/btrfs/async-thread.h"
90150+#include "../fs/btrfs/ctree.h"
90151+#include "../fs/btrfs/btrfs_inode.h"
90152+#endif
90153+
90154+static struct crash_uid *uid_set;
90155+static unsigned short uid_used;
90156+static DEFINE_SPINLOCK(gr_uid_lock);
90157+extern rwlock_t gr_inode_lock;
90158+extern struct acl_subject_label *
90159+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
90160+ struct acl_role_label *role);
90161+
90162+int
90163+gr_init_uidset(void)
90164+{
90165+ uid_set =
90166+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
90167+ uid_used = 0;
90168+
90169+ return uid_set ? 1 : 0;
90170+}
90171+
90172+void
90173+gr_free_uidset(void)
90174+{
90175+ if (uid_set) {
90176+ struct crash_uid *tmpset;
90177+ spin_lock(&gr_uid_lock);
90178+ tmpset = uid_set;
90179+ uid_set = NULL;
90180+ uid_used = 0;
90181+ spin_unlock(&gr_uid_lock);
90182+ if (tmpset)
90183+ kfree(tmpset);
90184+ }
90185+
90186+ return;
90187+}
90188+
90189+int
90190+gr_find_uid(const uid_t uid)
90191+{
90192+ struct crash_uid *tmp = uid_set;
90193+ uid_t buid;
90194+ int low = 0, high = uid_used - 1, mid;
90195+
90196+ while (high >= low) {
90197+ mid = (low + high) >> 1;
90198+ buid = tmp[mid].uid;
90199+ if (buid == uid)
90200+ return mid;
90201+ if (buid > uid)
90202+ high = mid - 1;
90203+ if (buid < uid)
90204+ low = mid + 1;
90205+ }
90206+
90207+ return -1;
90208+}
90209+
90210+static void
90211+gr_insertsort(void)
90212+{
90213+ unsigned short i, j;
90214+ struct crash_uid index;
90215+
90216+ for (i = 1; i < uid_used; i++) {
90217+ index = uid_set[i];
90218+ j = i;
90219+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
90220+ uid_set[j] = uid_set[j - 1];
90221+ j--;
90222+ }
90223+ uid_set[j] = index;
90224+ }
90225+
90226+ return;
90227+}
90228+
90229+static void
90230+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
90231+{
90232+ int loc;
90233+ uid_t uid = GR_GLOBAL_UID(kuid);
90234+
90235+ if (uid_used == GR_UIDTABLE_MAX)
90236+ return;
90237+
90238+ loc = gr_find_uid(uid);
90239+
90240+ if (loc >= 0) {
90241+ uid_set[loc].expires = expires;
90242+ return;
90243+ }
90244+
90245+ uid_set[uid_used].uid = uid;
90246+ uid_set[uid_used].expires = expires;
90247+ uid_used++;
90248+
90249+ gr_insertsort();
90250+
90251+ return;
90252+}
90253+
90254+void
90255+gr_remove_uid(const unsigned short loc)
90256+{
90257+ unsigned short i;
90258+
90259+ for (i = loc + 1; i < uid_used; i++)
90260+ uid_set[i - 1] = uid_set[i];
90261+
90262+ uid_used--;
90263+
90264+ return;
90265+}
90266+
90267+int
90268+gr_check_crash_uid(const kuid_t kuid)
90269+{
90270+ int loc;
90271+ int ret = 0;
90272+ uid_t uid;
90273+
90274+ if (unlikely(!gr_acl_is_enabled()))
90275+ return 0;
90276+
90277+ uid = GR_GLOBAL_UID(kuid);
90278+
90279+ spin_lock(&gr_uid_lock);
90280+ loc = gr_find_uid(uid);
90281+
90282+ if (loc < 0)
90283+ goto out_unlock;
90284+
90285+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
90286+ gr_remove_uid(loc);
90287+ else
90288+ ret = 1;
90289+
90290+out_unlock:
90291+ spin_unlock(&gr_uid_lock);
90292+ return ret;
90293+}
90294+
90295+static int
90296+proc_is_setxid(const struct cred *cred)
90297+{
90298+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
90299+ !uid_eq(cred->uid, cred->fsuid))
90300+ return 1;
90301+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
90302+ !gid_eq(cred->gid, cred->fsgid))
90303+ return 1;
90304+
90305+ return 0;
90306+}
90307+
90308+extern int gr_fake_force_sig(int sig, struct task_struct *t);
90309+
90310+void
90311+gr_handle_crash(struct task_struct *task, const int sig)
90312+{
90313+ struct acl_subject_label *curr;
90314+ struct task_struct *tsk, *tsk2;
90315+ const struct cred *cred;
90316+ const struct cred *cred2;
90317+
90318+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
90319+ return;
90320+
90321+ if (unlikely(!gr_acl_is_enabled()))
90322+ return;
90323+
90324+ curr = task->acl;
90325+
90326+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
90327+ return;
90328+
90329+ if (time_before_eq(curr->expires, get_seconds())) {
90330+ curr->expires = 0;
90331+ curr->crashes = 0;
90332+ }
90333+
90334+ curr->crashes++;
90335+
90336+ if (!curr->expires)
90337+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
90338+
90339+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90340+ time_after(curr->expires, get_seconds())) {
90341+ rcu_read_lock();
90342+ cred = __task_cred(task);
90343+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
90344+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90345+ spin_lock(&gr_uid_lock);
90346+ gr_insert_uid(cred->uid, curr->expires);
90347+ spin_unlock(&gr_uid_lock);
90348+ curr->expires = 0;
90349+ curr->crashes = 0;
90350+ read_lock(&tasklist_lock);
90351+ do_each_thread(tsk2, tsk) {
90352+ cred2 = __task_cred(tsk);
90353+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
90354+ gr_fake_force_sig(SIGKILL, tsk);
90355+ } while_each_thread(tsk2, tsk);
90356+ read_unlock(&tasklist_lock);
90357+ } else {
90358+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90359+ read_lock(&tasklist_lock);
90360+ read_lock(&grsec_exec_file_lock);
90361+ do_each_thread(tsk2, tsk) {
90362+ if (likely(tsk != task)) {
90363+ // if this thread has the same subject as the one that triggered
90364+ // RES_CRASH and it's the same binary, kill it
90365+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
90366+ gr_fake_force_sig(SIGKILL, tsk);
90367+ }
90368+ } while_each_thread(tsk2, tsk);
90369+ read_unlock(&grsec_exec_file_lock);
90370+ read_unlock(&tasklist_lock);
90371+ }
90372+ rcu_read_unlock();
90373+ }
90374+
90375+ return;
90376+}
90377+
90378+int
90379+gr_check_crash_exec(const struct file *filp)
90380+{
90381+ struct acl_subject_label *curr;
90382+ struct dentry *dentry;
90383+
90384+ if (unlikely(!gr_acl_is_enabled()))
90385+ return 0;
90386+
90387+ read_lock(&gr_inode_lock);
90388+ dentry = filp->f_path.dentry;
90389+ curr = lookup_acl_subj_label(gr_get_ino_from_dentry(dentry), gr_get_dev_from_dentry(dentry),
90390+ current->role);
90391+ read_unlock(&gr_inode_lock);
90392+
90393+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
90394+ (!curr->crashes && !curr->expires))
90395+ return 0;
90396+
90397+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90398+ time_after(curr->expires, get_seconds()))
90399+ return 1;
90400+ else if (time_before_eq(curr->expires, get_seconds())) {
90401+ curr->crashes = 0;
90402+ curr->expires = 0;
90403+ }
90404+
90405+ return 0;
90406+}
90407+
90408+void
90409+gr_handle_alertkill(struct task_struct *task)
90410+{
90411+ struct acl_subject_label *curracl;
90412+ __u32 curr_ip;
90413+ struct task_struct *p, *p2;
90414+
90415+ if (unlikely(!gr_acl_is_enabled()))
90416+ return;
90417+
90418+ curracl = task->acl;
90419+ curr_ip = task->signal->curr_ip;
90420+
90421+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
90422+ read_lock(&tasklist_lock);
90423+ do_each_thread(p2, p) {
90424+ if (p->signal->curr_ip == curr_ip)
90425+ gr_fake_force_sig(SIGKILL, p);
90426+ } while_each_thread(p2, p);
90427+ read_unlock(&tasklist_lock);
90428+ } else if (curracl->mode & GR_KILLPROC)
90429+ gr_fake_force_sig(SIGKILL, task);
90430+
90431+ return;
90432+}
90433diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
90434new file mode 100644
90435index 0000000..6b0c9cc
90436--- /dev/null
90437+++ b/grsecurity/gracl_shm.c
90438@@ -0,0 +1,40 @@
90439+#include <linux/kernel.h>
90440+#include <linux/mm.h>
90441+#include <linux/sched.h>
90442+#include <linux/file.h>
90443+#include <linux/ipc.h>
90444+#include <linux/gracl.h>
90445+#include <linux/grsecurity.h>
90446+#include <linux/grinternal.h>
90447+
90448+int
90449+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90450+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90451+{
90452+ struct task_struct *task;
90453+
90454+ if (!gr_acl_is_enabled())
90455+ return 1;
90456+
90457+ rcu_read_lock();
90458+ read_lock(&tasklist_lock);
90459+
90460+ task = find_task_by_vpid(shm_cprid);
90461+
90462+ if (unlikely(!task))
90463+ task = find_task_by_vpid(shm_lapid);
90464+
90465+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
90466+ (task_pid_nr(task) == shm_lapid)) &&
90467+ (task->acl->mode & GR_PROTSHM) &&
90468+ (task->acl != current->acl))) {
90469+ read_unlock(&tasklist_lock);
90470+ rcu_read_unlock();
90471+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
90472+ return 0;
90473+ }
90474+ read_unlock(&tasklist_lock);
90475+ rcu_read_unlock();
90476+
90477+ return 1;
90478+}
90479diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
90480new file mode 100644
90481index 0000000..bc0be01
90482--- /dev/null
90483+++ b/grsecurity/grsec_chdir.c
90484@@ -0,0 +1,19 @@
90485+#include <linux/kernel.h>
90486+#include <linux/sched.h>
90487+#include <linux/fs.h>
90488+#include <linux/file.h>
90489+#include <linux/grsecurity.h>
90490+#include <linux/grinternal.h>
90491+
90492+void
90493+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
90494+{
90495+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
90496+ if ((grsec_enable_chdir && grsec_enable_group &&
90497+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
90498+ !grsec_enable_group)) {
90499+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
90500+ }
90501+#endif
90502+ return;
90503+}
90504diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
90505new file mode 100644
90506index 0000000..652ab45
90507--- /dev/null
90508+++ b/grsecurity/grsec_chroot.c
90509@@ -0,0 +1,467 @@
90510+#include <linux/kernel.h>
90511+#include <linux/module.h>
90512+#include <linux/sched.h>
90513+#include <linux/file.h>
90514+#include <linux/fs.h>
90515+#include <linux/mount.h>
90516+#include <linux/types.h>
90517+#include "../fs/mount.h"
90518+#include <linux/grsecurity.h>
90519+#include <linux/grinternal.h>
90520+
90521+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90522+int gr_init_ran;
90523+#endif
90524+
90525+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90526+{
90527+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90528+ struct dentry *tmpd = dentry;
90529+
90530+ read_seqlock_excl(&mount_lock);
90531+ write_seqlock(&rename_lock);
90532+
90533+ while (tmpd != mnt->mnt_root) {
90534+ atomic_inc(&tmpd->chroot_refcnt);
90535+ tmpd = tmpd->d_parent;
90536+ }
90537+ atomic_inc(&tmpd->chroot_refcnt);
90538+
90539+ write_sequnlock(&rename_lock);
90540+ read_sequnlock_excl(&mount_lock);
90541+#endif
90542+}
90543+
90544+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90545+{
90546+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90547+ struct dentry *tmpd = dentry;
90548+
90549+ read_seqlock_excl(&mount_lock);
90550+ write_seqlock(&rename_lock);
90551+
90552+ while (tmpd != mnt->mnt_root) {
90553+ atomic_dec(&tmpd->chroot_refcnt);
90554+ tmpd = tmpd->d_parent;
90555+ }
90556+ atomic_dec(&tmpd->chroot_refcnt);
90557+
90558+ write_sequnlock(&rename_lock);
90559+ read_sequnlock_excl(&mount_lock);
90560+#endif
90561+}
90562+
90563+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90564+static struct dentry *get_closest_chroot(struct dentry *dentry)
90565+{
90566+ write_seqlock(&rename_lock);
90567+ do {
90568+ if (atomic_read(&dentry->chroot_refcnt)) {
90569+ write_sequnlock(&rename_lock);
90570+ return dentry;
90571+ }
90572+ dentry = dentry->d_parent;
90573+ } while (!IS_ROOT(dentry));
90574+ write_sequnlock(&rename_lock);
90575+ return NULL;
90576+}
90577+#endif
90578+
90579+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90580+ struct dentry *newdentry, struct vfsmount *newmnt)
90581+{
90582+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90583+ struct dentry *chroot;
90584+
90585+ if (unlikely(!grsec_enable_chroot_rename))
90586+ return 0;
90587+
90588+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
90589+ return 0;
90590+
90591+ chroot = get_closest_chroot(olddentry);
90592+
90593+ if (chroot == NULL)
90594+ return 0;
90595+
90596+ if (is_subdir(newdentry, chroot))
90597+ return 0;
90598+
90599+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
90600+
90601+ return 1;
90602+#else
90603+ return 0;
90604+#endif
90605+}
90606+
90607+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
90608+{
90609+#ifdef CONFIG_GRKERNSEC
90610+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
90611+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
90612+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90613+ && gr_init_ran
90614+#endif
90615+ )
90616+ task->gr_is_chrooted = 1;
90617+ else {
90618+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90619+ if (task_pid_nr(task) == 1 && !gr_init_ran)
90620+ gr_init_ran = 1;
90621+#endif
90622+ task->gr_is_chrooted = 0;
90623+ }
90624+
90625+ task->gr_chroot_dentry = path->dentry;
90626+#endif
90627+ return;
90628+}
90629+
90630+void gr_clear_chroot_entries(struct task_struct *task)
90631+{
90632+#ifdef CONFIG_GRKERNSEC
90633+ task->gr_is_chrooted = 0;
90634+ task->gr_chroot_dentry = NULL;
90635+#endif
90636+ return;
90637+}
90638+
90639+int
90640+gr_handle_chroot_unix(const pid_t pid)
90641+{
90642+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
90643+ struct task_struct *p;
90644+
90645+ if (unlikely(!grsec_enable_chroot_unix))
90646+ return 1;
90647+
90648+ if (likely(!proc_is_chrooted(current)))
90649+ return 1;
90650+
90651+ rcu_read_lock();
90652+ read_lock(&tasklist_lock);
90653+ p = find_task_by_vpid_unrestricted(pid);
90654+ if (unlikely(p && !have_same_root(current, p))) {
90655+ read_unlock(&tasklist_lock);
90656+ rcu_read_unlock();
90657+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
90658+ return 0;
90659+ }
90660+ read_unlock(&tasklist_lock);
90661+ rcu_read_unlock();
90662+#endif
90663+ return 1;
90664+}
90665+
90666+int
90667+gr_handle_chroot_nice(void)
90668+{
90669+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90670+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
90671+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
90672+ return -EPERM;
90673+ }
90674+#endif
90675+ return 0;
90676+}
90677+
90678+int
90679+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
90680+{
90681+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90682+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
90683+ && proc_is_chrooted(current)) {
90684+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
90685+ return -EACCES;
90686+ }
90687+#endif
90688+ return 0;
90689+}
90690+
90691+int
90692+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
90693+{
90694+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90695+ struct task_struct *p;
90696+ int ret = 0;
90697+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
90698+ return ret;
90699+
90700+ read_lock(&tasklist_lock);
90701+ do_each_pid_task(pid, type, p) {
90702+ if (!have_same_root(current, p)) {
90703+ ret = 1;
90704+ goto out;
90705+ }
90706+ } while_each_pid_task(pid, type, p);
90707+out:
90708+ read_unlock(&tasklist_lock);
90709+ return ret;
90710+#endif
90711+ return 0;
90712+}
90713+
90714+int
90715+gr_pid_is_chrooted(struct task_struct *p)
90716+{
90717+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90718+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
90719+ return 0;
90720+
90721+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
90722+ !have_same_root(current, p)) {
90723+ return 1;
90724+ }
90725+#endif
90726+ return 0;
90727+}
90728+
90729+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
90730+
90731+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
90732+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
90733+{
90734+ struct path path, currentroot;
90735+ int ret = 0;
90736+
90737+ path.dentry = (struct dentry *)u_dentry;
90738+ path.mnt = (struct vfsmount *)u_mnt;
90739+ get_fs_root(current->fs, &currentroot);
90740+ if (path_is_under(&path, &currentroot))
90741+ ret = 1;
90742+ path_put(&currentroot);
90743+
90744+ return ret;
90745+}
90746+#endif
90747+
90748+int
90749+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
90750+{
90751+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90752+ if (!grsec_enable_chroot_fchdir)
90753+ return 1;
90754+
90755+ if (!proc_is_chrooted(current))
90756+ return 1;
90757+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
90758+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
90759+ return 0;
90760+ }
90761+#endif
90762+ return 1;
90763+}
90764+
90765+int
90766+gr_chroot_fhandle(void)
90767+{
90768+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90769+ if (!grsec_enable_chroot_fchdir)
90770+ return 1;
90771+
90772+ if (!proc_is_chrooted(current))
90773+ return 1;
90774+ else {
90775+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
90776+ return 0;
90777+ }
90778+#endif
90779+ return 1;
90780+}
90781+
90782+int
90783+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90784+ const u64 shm_createtime)
90785+{
90786+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
90787+ struct task_struct *p;
90788+
90789+ if (unlikely(!grsec_enable_chroot_shmat))
90790+ return 1;
90791+
90792+ if (likely(!proc_is_chrooted(current)))
90793+ return 1;
90794+
90795+ rcu_read_lock();
90796+ read_lock(&tasklist_lock);
90797+
90798+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
90799+ if (time_before_eq64(p->start_time, shm_createtime)) {
90800+ if (have_same_root(current, p)) {
90801+ goto allow;
90802+ } else {
90803+ read_unlock(&tasklist_lock);
90804+ rcu_read_unlock();
90805+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90806+ return 0;
90807+ }
90808+ }
90809+ /* creator exited, pid reuse, fall through to next check */
90810+ }
90811+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
90812+ if (unlikely(!have_same_root(current, p))) {
90813+ read_unlock(&tasklist_lock);
90814+ rcu_read_unlock();
90815+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90816+ return 0;
90817+ }
90818+ }
90819+
90820+allow:
90821+ read_unlock(&tasklist_lock);
90822+ rcu_read_unlock();
90823+#endif
90824+ return 1;
90825+}
90826+
90827+void
90828+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
90829+{
90830+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
90831+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
90832+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
90833+#endif
90834+ return;
90835+}
90836+
90837+int
90838+gr_handle_chroot_mknod(const struct dentry *dentry,
90839+ const struct vfsmount *mnt, const int mode)
90840+{
90841+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
90842+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
90843+ proc_is_chrooted(current)) {
90844+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
90845+ return -EPERM;
90846+ }
90847+#endif
90848+ return 0;
90849+}
90850+
90851+int
90852+gr_handle_chroot_mount(const struct dentry *dentry,
90853+ const struct vfsmount *mnt, const char *dev_name)
90854+{
90855+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
90856+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
90857+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
90858+ return -EPERM;
90859+ }
90860+#endif
90861+ return 0;
90862+}
90863+
90864+int
90865+gr_handle_chroot_pivot(void)
90866+{
90867+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
90868+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
90869+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
90870+ return -EPERM;
90871+ }
90872+#endif
90873+ return 0;
90874+}
90875+
90876+int
90877+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
90878+{
90879+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
90880+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
90881+ !gr_is_outside_chroot(dentry, mnt)) {
90882+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
90883+ return -EPERM;
90884+ }
90885+#endif
90886+ return 0;
90887+}
90888+
90889+extern const char *captab_log[];
90890+extern int captab_log_entries;
90891+
90892+int
90893+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
90894+{
90895+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90896+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90897+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90898+ if (cap_raised(chroot_caps, cap)) {
90899+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
90900+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
90901+ }
90902+ return 0;
90903+ }
90904+ }
90905+#endif
90906+ return 1;
90907+}
90908+
90909+int
90910+gr_chroot_is_capable(const int cap)
90911+{
90912+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90913+ return gr_task_chroot_is_capable(current, current_cred(), cap);
90914+#endif
90915+ return 1;
90916+}
90917+
90918+int
90919+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
90920+{
90921+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90922+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90923+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90924+ if (cap_raised(chroot_caps, cap)) {
90925+ return 0;
90926+ }
90927+ }
90928+#endif
90929+ return 1;
90930+}
90931+
90932+int
90933+gr_chroot_is_capable_nolog(const int cap)
90934+{
90935+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90936+ return gr_task_chroot_is_capable_nolog(current, cap);
90937+#endif
90938+ return 1;
90939+}
90940+
90941+int
90942+gr_handle_chroot_sysctl(const int op)
90943+{
90944+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
90945+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
90946+ proc_is_chrooted(current))
90947+ return -EACCES;
90948+#endif
90949+ return 0;
90950+}
90951+
90952+void
90953+gr_handle_chroot_chdir(const struct path *path)
90954+{
90955+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
90956+ if (grsec_enable_chroot_chdir)
90957+ set_fs_pwd(current->fs, path);
90958+#endif
90959+ return;
90960+}
90961+
90962+int
90963+gr_handle_chroot_chmod(const struct dentry *dentry,
90964+ const struct vfsmount *mnt, const int mode)
90965+{
90966+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
90967+ /* allow chmod +s on directories, but not files */
90968+ if (grsec_enable_chroot_chmod && !d_is_dir(dentry) &&
90969+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
90970+ proc_is_chrooted(current)) {
90971+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
90972+ return -EPERM;
90973+ }
90974+#endif
90975+ return 0;
90976+}
90977diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
90978new file mode 100644
90979index 0000000..e723c08
90980--- /dev/null
90981+++ b/grsecurity/grsec_disabled.c
90982@@ -0,0 +1,445 @@
90983+#include <linux/kernel.h>
90984+#include <linux/module.h>
90985+#include <linux/sched.h>
90986+#include <linux/file.h>
90987+#include <linux/fs.h>
90988+#include <linux/kdev_t.h>
90989+#include <linux/net.h>
90990+#include <linux/in.h>
90991+#include <linux/ip.h>
90992+#include <linux/skbuff.h>
90993+#include <linux/sysctl.h>
90994+
90995+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
90996+void
90997+pax_set_initial_flags(struct linux_binprm *bprm)
90998+{
90999+ return;
91000+}
91001+#endif
91002+
91003+#ifdef CONFIG_SYSCTL
91004+__u32
91005+gr_handle_sysctl(const struct ctl_table * table, const int op)
91006+{
91007+ return 0;
91008+}
91009+#endif
91010+
91011+#ifdef CONFIG_TASKSTATS
91012+int gr_is_taskstats_denied(int pid)
91013+{
91014+ return 0;
91015+}
91016+#endif
91017+
91018+int
91019+gr_acl_is_enabled(void)
91020+{
91021+ return 0;
91022+}
91023+
91024+int
91025+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
91026+{
91027+ return 0;
91028+}
91029+
91030+void
91031+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
91032+{
91033+ return;
91034+}
91035+
91036+int
91037+gr_handle_rawio(const struct inode *inode)
91038+{
91039+ return 0;
91040+}
91041+
91042+void
91043+gr_acl_handle_psacct(struct task_struct *task, const long code)
91044+{
91045+ return;
91046+}
91047+
91048+int
91049+gr_handle_ptrace(struct task_struct *task, const long request)
91050+{
91051+ return 0;
91052+}
91053+
91054+int
91055+gr_handle_proc_ptrace(struct task_struct *task)
91056+{
91057+ return 0;
91058+}
91059+
91060+int
91061+gr_set_acls(const int type)
91062+{
91063+ return 0;
91064+}
91065+
91066+int
91067+gr_check_hidden_task(const struct task_struct *tsk)
91068+{
91069+ return 0;
91070+}
91071+
91072+int
91073+gr_check_protected_task(const struct task_struct *task)
91074+{
91075+ return 0;
91076+}
91077+
91078+int
91079+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
91080+{
91081+ return 0;
91082+}
91083+
91084+void
91085+gr_copy_label(struct task_struct *tsk)
91086+{
91087+ return;
91088+}
91089+
91090+void
91091+gr_set_pax_flags(struct task_struct *task)
91092+{
91093+ return;
91094+}
91095+
91096+int
91097+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
91098+ const int unsafe_share)
91099+{
91100+ return 0;
91101+}
91102+
91103+void
91104+gr_handle_delete(const u64 ino, const dev_t dev)
91105+{
91106+ return;
91107+}
91108+
91109+void
91110+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
91111+{
91112+ return;
91113+}
91114+
91115+void
91116+gr_handle_crash(struct task_struct *task, const int sig)
91117+{
91118+ return;
91119+}
91120+
91121+int
91122+gr_check_crash_exec(const struct file *filp)
91123+{
91124+ return 0;
91125+}
91126+
91127+int
91128+gr_check_crash_uid(const kuid_t uid)
91129+{
91130+ return 0;
91131+}
91132+
91133+void
91134+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
91135+ struct dentry *old_dentry,
91136+ struct dentry *new_dentry,
91137+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
91138+{
91139+ return;
91140+}
91141+
91142+int
91143+gr_search_socket(const int family, const int type, const int protocol)
91144+{
91145+ return 1;
91146+}
91147+
91148+int
91149+gr_search_connectbind(const int mode, const struct socket *sock,
91150+ const struct sockaddr_in *addr)
91151+{
91152+ return 0;
91153+}
91154+
91155+void
91156+gr_handle_alertkill(struct task_struct *task)
91157+{
91158+ return;
91159+}
91160+
91161+__u32
91162+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
91163+{
91164+ return 1;
91165+}
91166+
91167+__u32
91168+gr_acl_handle_hidden_file(const struct dentry * dentry,
91169+ const struct vfsmount * mnt)
91170+{
91171+ return 1;
91172+}
91173+
91174+__u32
91175+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
91176+ int acc_mode)
91177+{
91178+ return 1;
91179+}
91180+
91181+__u32
91182+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
91183+{
91184+ return 1;
91185+}
91186+
91187+__u32
91188+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
91189+{
91190+ return 1;
91191+}
91192+
91193+int
91194+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
91195+ unsigned int *vm_flags)
91196+{
91197+ return 1;
91198+}
91199+
91200+__u32
91201+gr_acl_handle_truncate(const struct dentry * dentry,
91202+ const struct vfsmount * mnt)
91203+{
91204+ return 1;
91205+}
91206+
91207+__u32
91208+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
91209+{
91210+ return 1;
91211+}
91212+
91213+__u32
91214+gr_acl_handle_access(const struct dentry * dentry,
91215+ const struct vfsmount * mnt, const int fmode)
91216+{
91217+ return 1;
91218+}
91219+
91220+__u32
91221+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
91222+ umode_t *mode)
91223+{
91224+ return 1;
91225+}
91226+
91227+__u32
91228+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
91229+{
91230+ return 1;
91231+}
91232+
91233+__u32
91234+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
91235+{
91236+ return 1;
91237+}
91238+
91239+__u32
91240+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
91241+{
91242+ return 1;
91243+}
91244+
91245+void
91246+grsecurity_init(void)
91247+{
91248+ return;
91249+}
91250+
91251+umode_t gr_acl_umask(void)
91252+{
91253+ return 0;
91254+}
91255+
91256+__u32
91257+gr_acl_handle_mknod(const struct dentry * new_dentry,
91258+ const struct dentry * parent_dentry,
91259+ const struct vfsmount * parent_mnt,
91260+ const int mode)
91261+{
91262+ return 1;
91263+}
91264+
91265+__u32
91266+gr_acl_handle_mkdir(const struct dentry * new_dentry,
91267+ const struct dentry * parent_dentry,
91268+ const struct vfsmount * parent_mnt)
91269+{
91270+ return 1;
91271+}
91272+
91273+__u32
91274+gr_acl_handle_symlink(const struct dentry * new_dentry,
91275+ const struct dentry * parent_dentry,
91276+ const struct vfsmount * parent_mnt, const struct filename *from)
91277+{
91278+ return 1;
91279+}
91280+
91281+__u32
91282+gr_acl_handle_link(const struct dentry * new_dentry,
91283+ const struct dentry * parent_dentry,
91284+ const struct vfsmount * parent_mnt,
91285+ const struct dentry * old_dentry,
91286+ const struct vfsmount * old_mnt, const struct filename *to)
91287+{
91288+ return 1;
91289+}
91290+
91291+int
91292+gr_acl_handle_rename(const struct dentry *new_dentry,
91293+ const struct dentry *parent_dentry,
91294+ const struct vfsmount *parent_mnt,
91295+ const struct dentry *old_dentry,
91296+ const struct inode *old_parent_inode,
91297+ const struct vfsmount *old_mnt, const struct filename *newname,
91298+ unsigned int flags)
91299+{
91300+ return 0;
91301+}
91302+
91303+int
91304+gr_acl_handle_filldir(const struct file *file, const char *name,
91305+ const int namelen, const u64 ino)
91306+{
91307+ return 1;
91308+}
91309+
91310+int
91311+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
91312+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
91313+{
91314+ return 1;
91315+}
91316+
91317+int
91318+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
91319+{
91320+ return 0;
91321+}
91322+
91323+int
91324+gr_search_accept(const struct socket *sock)
91325+{
91326+ return 0;
91327+}
91328+
91329+int
91330+gr_search_listen(const struct socket *sock)
91331+{
91332+ return 0;
91333+}
91334+
91335+int
91336+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
91337+{
91338+ return 0;
91339+}
91340+
91341+__u32
91342+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
91343+{
91344+ return 1;
91345+}
91346+
91347+__u32
91348+gr_acl_handle_creat(const struct dentry * dentry,
91349+ const struct dentry * p_dentry,
91350+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
91351+ const int imode)
91352+{
91353+ return 1;
91354+}
91355+
91356+void
91357+gr_acl_handle_exit(void)
91358+{
91359+ return;
91360+}
91361+
91362+int
91363+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
91364+{
91365+ return 1;
91366+}
91367+
91368+void
91369+gr_set_role_label(const kuid_t uid, const kgid_t gid)
91370+{
91371+ return;
91372+}
91373+
91374+int
91375+gr_acl_handle_procpidmem(const struct task_struct *task)
91376+{
91377+ return 0;
91378+}
91379+
91380+int
91381+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
91382+{
91383+ return 0;
91384+}
91385+
91386+int
91387+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
91388+{
91389+ return 0;
91390+}
91391+
91392+int
91393+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
91394+{
91395+ return 0;
91396+}
91397+
91398+int
91399+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
91400+{
91401+ return 0;
91402+}
91403+
91404+int gr_acl_enable_at_secure(void)
91405+{
91406+ return 0;
91407+}
91408+
91409+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
91410+{
91411+ return d_backing_inode(dentry)->i_sb->s_dev;
91412+}
91413+
91414+u64 gr_get_ino_from_dentry(struct dentry *dentry)
91415+{
91416+ return d_backing_inode(dentry)->i_ino;
91417+}
91418+
91419+void gr_put_exec_file(struct task_struct *task)
91420+{
91421+ return;
91422+}
91423+
91424+#ifdef CONFIG_SECURITY
91425+EXPORT_SYMBOL_GPL(gr_check_user_change);
91426+EXPORT_SYMBOL_GPL(gr_check_group_change);
91427+#endif
91428diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
91429new file mode 100644
91430index 0000000..fb7531e
91431--- /dev/null
91432+++ b/grsecurity/grsec_exec.c
91433@@ -0,0 +1,189 @@
91434+#include <linux/kernel.h>
91435+#include <linux/sched.h>
91436+#include <linux/file.h>
91437+#include <linux/binfmts.h>
91438+#include <linux/fs.h>
91439+#include <linux/types.h>
91440+#include <linux/grdefs.h>
91441+#include <linux/grsecurity.h>
91442+#include <linux/grinternal.h>
91443+#include <linux/capability.h>
91444+#include <linux/module.h>
91445+#include <linux/compat.h>
91446+
91447+#include <asm/uaccess.h>
91448+
91449+#ifdef CONFIG_GRKERNSEC_EXECLOG
91450+static char gr_exec_arg_buf[132];
91451+static DEFINE_MUTEX(gr_exec_arg_mutex);
91452+#endif
91453+
91454+struct user_arg_ptr {
91455+#ifdef CONFIG_COMPAT
91456+ bool is_compat;
91457+#endif
91458+ union {
91459+ const char __user *const __user *native;
91460+#ifdef CONFIG_COMPAT
91461+ const compat_uptr_t __user *compat;
91462+#endif
91463+ } ptr;
91464+};
91465+
91466+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
91467+
91468+void
91469+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
91470+{
91471+#ifdef CONFIG_GRKERNSEC_EXECLOG
91472+ char *grarg = gr_exec_arg_buf;
91473+ unsigned int i, x, execlen = 0;
91474+ char c;
91475+
91476+ if (!((grsec_enable_execlog && grsec_enable_group &&
91477+ in_group_p(grsec_audit_gid))
91478+ || (grsec_enable_execlog && !grsec_enable_group)))
91479+ return;
91480+
91481+ mutex_lock(&gr_exec_arg_mutex);
91482+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
91483+
91484+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
91485+ const char __user *p;
91486+ unsigned int len;
91487+
91488+ p = get_user_arg_ptr(argv, i);
91489+ if (IS_ERR(p))
91490+ goto log;
91491+
91492+ len = strnlen_user(p, 128 - execlen);
91493+ if (len > 128 - execlen)
91494+ len = 128 - execlen;
91495+ else if (len > 0)
91496+ len--;
91497+ if (copy_from_user(grarg + execlen, p, len))
91498+ goto log;
91499+
91500+ /* rewrite unprintable characters */
91501+ for (x = 0; x < len; x++) {
91502+ c = *(grarg + execlen + x);
91503+ if (c < 32 || c > 126)
91504+ *(grarg + execlen + x) = ' ';
91505+ }
91506+
91507+ execlen += len;
91508+ *(grarg + execlen) = ' ';
91509+ *(grarg + execlen + 1) = '\0';
91510+ execlen++;
91511+ }
91512+
91513+ log:
91514+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
91515+ bprm->file->f_path.mnt, grarg);
91516+ mutex_unlock(&gr_exec_arg_mutex);
91517+#endif
91518+ return;
91519+}
91520+
91521+#ifdef CONFIG_GRKERNSEC
91522+extern int gr_acl_is_capable(const int cap);
91523+extern int gr_acl_is_capable_nolog(const int cap);
91524+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91525+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
91526+extern int gr_chroot_is_capable(const int cap);
91527+extern int gr_chroot_is_capable_nolog(const int cap);
91528+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91529+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
91530+#endif
91531+
91532+const char *captab_log[] = {
91533+ "CAP_CHOWN",
91534+ "CAP_DAC_OVERRIDE",
91535+ "CAP_DAC_READ_SEARCH",
91536+ "CAP_FOWNER",
91537+ "CAP_FSETID",
91538+ "CAP_KILL",
91539+ "CAP_SETGID",
91540+ "CAP_SETUID",
91541+ "CAP_SETPCAP",
91542+ "CAP_LINUX_IMMUTABLE",
91543+ "CAP_NET_BIND_SERVICE",
91544+ "CAP_NET_BROADCAST",
91545+ "CAP_NET_ADMIN",
91546+ "CAP_NET_RAW",
91547+ "CAP_IPC_LOCK",
91548+ "CAP_IPC_OWNER",
91549+ "CAP_SYS_MODULE",
91550+ "CAP_SYS_RAWIO",
91551+ "CAP_SYS_CHROOT",
91552+ "CAP_SYS_PTRACE",
91553+ "CAP_SYS_PACCT",
91554+ "CAP_SYS_ADMIN",
91555+ "CAP_SYS_BOOT",
91556+ "CAP_SYS_NICE",
91557+ "CAP_SYS_RESOURCE",
91558+ "CAP_SYS_TIME",
91559+ "CAP_SYS_TTY_CONFIG",
91560+ "CAP_MKNOD",
91561+ "CAP_LEASE",
91562+ "CAP_AUDIT_WRITE",
91563+ "CAP_AUDIT_CONTROL",
91564+ "CAP_SETFCAP",
91565+ "CAP_MAC_OVERRIDE",
91566+ "CAP_MAC_ADMIN",
91567+ "CAP_SYSLOG",
91568+ "CAP_WAKE_ALARM",
91569+ "CAP_BLOCK_SUSPEND",
91570+ "CAP_AUDIT_READ"
91571+};
91572+
91573+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
91574+
91575+int gr_is_capable(const int cap)
91576+{
91577+#ifdef CONFIG_GRKERNSEC
91578+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
91579+ return 1;
91580+ return 0;
91581+#else
91582+ return 1;
91583+#endif
91584+}
91585+
91586+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
91587+{
91588+#ifdef CONFIG_GRKERNSEC
91589+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
91590+ return 1;
91591+ return 0;
91592+#else
91593+ return 1;
91594+#endif
91595+}
91596+
91597+int gr_is_capable_nolog(const int cap)
91598+{
91599+#ifdef CONFIG_GRKERNSEC
91600+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
91601+ return 1;
91602+ return 0;
91603+#else
91604+ return 1;
91605+#endif
91606+}
91607+
91608+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
91609+{
91610+#ifdef CONFIG_GRKERNSEC
91611+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
91612+ return 1;
91613+ return 0;
91614+#else
91615+ return 1;
91616+#endif
91617+}
91618+
91619+EXPORT_SYMBOL_GPL(gr_is_capable);
91620+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
91621+EXPORT_SYMBOL_GPL(gr_task_is_capable);
91622+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
91623diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
91624new file mode 100644
91625index 0000000..cdec49b
91626--- /dev/null
91627+++ b/grsecurity/grsec_fifo.c
91628@@ -0,0 +1,26 @@
91629+#include <linux/kernel.h>
91630+#include <linux/sched.h>
91631+#include <linux/fs.h>
91632+#include <linux/file.h>
91633+#include <linux/grinternal.h>
91634+
91635+int
91636+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
91637+ const struct dentry *dir, const int flag, const int acc_mode)
91638+{
91639+#ifdef CONFIG_GRKERNSEC_FIFO
91640+ const struct cred *cred = current_cred();
91641+ struct inode *inode = d_backing_inode(dentry);
91642+ struct inode *dir_inode = d_backing_inode(dir);
91643+
91644+ if (grsec_enable_fifo && S_ISFIFO(inode->i_mode) &&
91645+ !(flag & O_EXCL) && (dir_inode->i_mode & S_ISVTX) &&
91646+ !uid_eq(inode->i_uid, dir_inode->i_uid) &&
91647+ !uid_eq(cred->fsuid, inode->i_uid)) {
91648+ if (!inode_permission(inode, acc_mode))
91649+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(inode->i_uid), GR_GLOBAL_GID(inode->i_gid));
91650+ return -EACCES;
91651+ }
91652+#endif
91653+ return 0;
91654+}
91655diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
91656new file mode 100644
91657index 0000000..8ca18bf
91658--- /dev/null
91659+++ b/grsecurity/grsec_fork.c
91660@@ -0,0 +1,23 @@
91661+#include <linux/kernel.h>
91662+#include <linux/sched.h>
91663+#include <linux/grsecurity.h>
91664+#include <linux/grinternal.h>
91665+#include <linux/errno.h>
91666+
91667+void
91668+gr_log_forkfail(const int retval)
91669+{
91670+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91671+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
91672+ switch (retval) {
91673+ case -EAGAIN:
91674+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
91675+ break;
91676+ case -ENOMEM:
91677+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
91678+ break;
91679+ }
91680+ }
91681+#endif
91682+ return;
91683+}
91684diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
91685new file mode 100644
91686index 0000000..a364c58
91687--- /dev/null
91688+++ b/grsecurity/grsec_init.c
91689@@ -0,0 +1,290 @@
91690+#include <linux/kernel.h>
91691+#include <linux/sched.h>
91692+#include <linux/mm.h>
91693+#include <linux/gracl.h>
91694+#include <linux/slab.h>
91695+#include <linux/vmalloc.h>
91696+#include <linux/percpu.h>
91697+#include <linux/module.h>
91698+
91699+int grsec_enable_ptrace_readexec __read_only;
91700+int grsec_enable_setxid __read_only;
91701+int grsec_enable_symlinkown __read_only;
91702+kgid_t grsec_symlinkown_gid __read_only;
91703+int grsec_enable_brute __read_only;
91704+int grsec_enable_link __read_only;
91705+int grsec_enable_dmesg __read_only;
91706+int grsec_enable_harden_ptrace __read_only;
91707+int grsec_enable_harden_ipc __read_only;
91708+int grsec_enable_fifo __read_only;
91709+int grsec_enable_execlog __read_only;
91710+int grsec_enable_signal __read_only;
91711+int grsec_enable_forkfail __read_only;
91712+int grsec_enable_audit_ptrace __read_only;
91713+int grsec_enable_time __read_only;
91714+int grsec_enable_group __read_only;
91715+kgid_t grsec_audit_gid __read_only;
91716+int grsec_enable_chdir __read_only;
91717+int grsec_enable_mount __read_only;
91718+int grsec_enable_rofs __read_only;
91719+int grsec_deny_new_usb __read_only;
91720+int grsec_enable_chroot_findtask __read_only;
91721+int grsec_enable_chroot_mount __read_only;
91722+int grsec_enable_chroot_shmat __read_only;
91723+int grsec_enable_chroot_fchdir __read_only;
91724+int grsec_enable_chroot_double __read_only;
91725+int grsec_enable_chroot_pivot __read_only;
91726+int grsec_enable_chroot_chdir __read_only;
91727+int grsec_enable_chroot_chmod __read_only;
91728+int grsec_enable_chroot_mknod __read_only;
91729+int grsec_enable_chroot_nice __read_only;
91730+int grsec_enable_chroot_execlog __read_only;
91731+int grsec_enable_chroot_caps __read_only;
91732+int grsec_enable_chroot_rename __read_only;
91733+int grsec_enable_chroot_sysctl __read_only;
91734+int grsec_enable_chroot_unix __read_only;
91735+int grsec_enable_tpe __read_only;
91736+kgid_t grsec_tpe_gid __read_only;
91737+int grsec_enable_blackhole __read_only;
91738+#ifdef CONFIG_IPV6_MODULE
91739+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
91740+#endif
91741+int grsec_lastack_retries __read_only;
91742+int grsec_enable_tpe_all __read_only;
91743+int grsec_enable_tpe_invert __read_only;
91744+int grsec_enable_socket_all __read_only;
91745+kgid_t grsec_socket_all_gid __read_only;
91746+int grsec_enable_socket_client __read_only;
91747+kgid_t grsec_socket_client_gid __read_only;
91748+int grsec_enable_socket_server __read_only;
91749+kgid_t grsec_socket_server_gid __read_only;
91750+int grsec_resource_logging __read_only;
91751+int grsec_disable_privio __read_only;
91752+int grsec_enable_log_rwxmaps __read_only;
91753+int grsec_lock __read_only;
91754+
91755+DEFINE_SPINLOCK(grsec_alert_lock);
91756+unsigned long grsec_alert_wtime = 0;
91757+unsigned long grsec_alert_fyet = 0;
91758+
91759+DEFINE_SPINLOCK(grsec_audit_lock);
91760+
91761+DEFINE_RWLOCK(grsec_exec_file_lock);
91762+
91763+char *gr_shared_page[4];
91764+
91765+char *gr_alert_log_fmt;
91766+char *gr_audit_log_fmt;
91767+char *gr_alert_log_buf;
91768+char *gr_audit_log_buf;
91769+
91770+extern struct gr_arg *gr_usermode;
91771+extern unsigned char *gr_system_salt;
91772+extern unsigned char *gr_system_sum;
91773+
91774+void __init
91775+grsecurity_init(void)
91776+{
91777+ int j;
91778+ /* create the per-cpu shared pages */
91779+
91780+#ifdef CONFIG_X86
91781+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
91782+#endif
91783+
91784+ for (j = 0; j < 4; j++) {
91785+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
91786+ if (gr_shared_page[j] == NULL) {
91787+ panic("Unable to allocate grsecurity shared page");
91788+ return;
91789+ }
91790+ }
91791+
91792+ /* allocate log buffers */
91793+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
91794+ if (!gr_alert_log_fmt) {
91795+ panic("Unable to allocate grsecurity alert log format buffer");
91796+ return;
91797+ }
91798+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
91799+ if (!gr_audit_log_fmt) {
91800+ panic("Unable to allocate grsecurity audit log format buffer");
91801+ return;
91802+ }
91803+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91804+ if (!gr_alert_log_buf) {
91805+ panic("Unable to allocate grsecurity alert log buffer");
91806+ return;
91807+ }
91808+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91809+ if (!gr_audit_log_buf) {
91810+ panic("Unable to allocate grsecurity audit log buffer");
91811+ return;
91812+ }
91813+
91814+ /* allocate memory for authentication structure */
91815+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
91816+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
91817+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
91818+
91819+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
91820+ panic("Unable to allocate grsecurity authentication structure");
91821+ return;
91822+ }
91823+
91824+#ifdef CONFIG_GRKERNSEC_IO
91825+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
91826+ grsec_disable_privio = 1;
91827+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91828+ grsec_disable_privio = 1;
91829+#else
91830+ grsec_disable_privio = 0;
91831+#endif
91832+#endif
91833+
91834+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
91835+ /* for backward compatibility, tpe_invert always defaults to on if
91836+ enabled in the kernel
91837+ */
91838+ grsec_enable_tpe_invert = 1;
91839+#endif
91840+
91841+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91842+#ifndef CONFIG_GRKERNSEC_SYSCTL
91843+ grsec_lock = 1;
91844+#endif
91845+
91846+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
91847+ grsec_enable_log_rwxmaps = 1;
91848+#endif
91849+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
91850+ grsec_enable_group = 1;
91851+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
91852+#endif
91853+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
91854+ grsec_enable_ptrace_readexec = 1;
91855+#endif
91856+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
91857+ grsec_enable_chdir = 1;
91858+#endif
91859+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
91860+ grsec_enable_harden_ptrace = 1;
91861+#endif
91862+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91863+ grsec_enable_harden_ipc = 1;
91864+#endif
91865+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
91866+ grsec_enable_mount = 1;
91867+#endif
91868+#ifdef CONFIG_GRKERNSEC_LINK
91869+ grsec_enable_link = 1;
91870+#endif
91871+#ifdef CONFIG_GRKERNSEC_BRUTE
91872+ grsec_enable_brute = 1;
91873+#endif
91874+#ifdef CONFIG_GRKERNSEC_DMESG
91875+ grsec_enable_dmesg = 1;
91876+#endif
91877+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91878+ grsec_enable_blackhole = 1;
91879+ grsec_lastack_retries = 4;
91880+#endif
91881+#ifdef CONFIG_GRKERNSEC_FIFO
91882+ grsec_enable_fifo = 1;
91883+#endif
91884+#ifdef CONFIG_GRKERNSEC_EXECLOG
91885+ grsec_enable_execlog = 1;
91886+#endif
91887+#ifdef CONFIG_GRKERNSEC_SETXID
91888+ grsec_enable_setxid = 1;
91889+#endif
91890+#ifdef CONFIG_GRKERNSEC_SIGNAL
91891+ grsec_enable_signal = 1;
91892+#endif
91893+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91894+ grsec_enable_forkfail = 1;
91895+#endif
91896+#ifdef CONFIG_GRKERNSEC_TIME
91897+ grsec_enable_time = 1;
91898+#endif
91899+#ifdef CONFIG_GRKERNSEC_RESLOG
91900+ grsec_resource_logging = 1;
91901+#endif
91902+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91903+ grsec_enable_chroot_findtask = 1;
91904+#endif
91905+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
91906+ grsec_enable_chroot_unix = 1;
91907+#endif
91908+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
91909+ grsec_enable_chroot_mount = 1;
91910+#endif
91911+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
91912+ grsec_enable_chroot_fchdir = 1;
91913+#endif
91914+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
91915+ grsec_enable_chroot_shmat = 1;
91916+#endif
91917+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
91918+ grsec_enable_audit_ptrace = 1;
91919+#endif
91920+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
91921+ grsec_enable_chroot_double = 1;
91922+#endif
91923+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
91924+ grsec_enable_chroot_pivot = 1;
91925+#endif
91926+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
91927+ grsec_enable_chroot_chdir = 1;
91928+#endif
91929+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
91930+ grsec_enable_chroot_chmod = 1;
91931+#endif
91932+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
91933+ grsec_enable_chroot_mknod = 1;
91934+#endif
91935+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
91936+ grsec_enable_chroot_nice = 1;
91937+#endif
91938+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
91939+ grsec_enable_chroot_execlog = 1;
91940+#endif
91941+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
91942+ grsec_enable_chroot_caps = 1;
91943+#endif
91944+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
91945+ grsec_enable_chroot_rename = 1;
91946+#endif
91947+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
91948+ grsec_enable_chroot_sysctl = 1;
91949+#endif
91950+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91951+ grsec_enable_symlinkown = 1;
91952+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
91953+#endif
91954+#ifdef CONFIG_GRKERNSEC_TPE
91955+ grsec_enable_tpe = 1;
91956+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
91957+#ifdef CONFIG_GRKERNSEC_TPE_ALL
91958+ grsec_enable_tpe_all = 1;
91959+#endif
91960+#endif
91961+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
91962+ grsec_enable_socket_all = 1;
91963+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
91964+#endif
91965+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
91966+ grsec_enable_socket_client = 1;
91967+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
91968+#endif
91969+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
91970+ grsec_enable_socket_server = 1;
91971+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
91972+#endif
91973+#endif
91974+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
91975+ grsec_deny_new_usb = 1;
91976+#endif
91977+
91978+ return;
91979+}
91980diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
91981new file mode 100644
91982index 0000000..1773300
91983--- /dev/null
91984+++ b/grsecurity/grsec_ipc.c
91985@@ -0,0 +1,48 @@
91986+#include <linux/kernel.h>
91987+#include <linux/mm.h>
91988+#include <linux/sched.h>
91989+#include <linux/file.h>
91990+#include <linux/ipc.h>
91991+#include <linux/ipc_namespace.h>
91992+#include <linux/grsecurity.h>
91993+#include <linux/grinternal.h>
91994+
91995+int
91996+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
91997+{
91998+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91999+ int write;
92000+ int orig_granted_mode;
92001+ kuid_t euid;
92002+ kgid_t egid;
92003+
92004+ if (!grsec_enable_harden_ipc)
92005+ return 1;
92006+
92007+ euid = current_euid();
92008+ egid = current_egid();
92009+
92010+ write = requested_mode & 00002;
92011+ orig_granted_mode = ipcp->mode;
92012+
92013+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
92014+ orig_granted_mode >>= 6;
92015+ else {
92016+ /* if likely wrong permissions, lock to user */
92017+ if (orig_granted_mode & 0007)
92018+ orig_granted_mode = 0;
92019+ /* otherwise do a egid-only check */
92020+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
92021+ orig_granted_mode >>= 3;
92022+ /* otherwise, no access */
92023+ else
92024+ orig_granted_mode = 0;
92025+ }
92026+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
92027+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
92028+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
92029+ return 0;
92030+ }
92031+#endif
92032+ return 1;
92033+}
92034diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
92035new file mode 100644
92036index 0000000..8ef2b75
92037--- /dev/null
92038+++ b/grsecurity/grsec_link.c
92039@@ -0,0 +1,59 @@
92040+#include <linux/kernel.h>
92041+#include <linux/sched.h>
92042+#include <linux/fs.h>
92043+#include <linux/file.h>
92044+#include <linux/grinternal.h>
92045+
92046+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
92047+{
92048+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
92049+ const struct inode *link_inode = d_backing_inode(link->dentry);
92050+
92051+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
92052+ /* ignore root-owned links, e.g. /proc/self */
92053+ gr_is_global_nonroot(link_inode->i_uid) && target &&
92054+ !uid_eq(link_inode->i_uid, target->i_uid)) {
92055+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
92056+ return 1;
92057+ }
92058+#endif
92059+ return 0;
92060+}
92061+
92062+int
92063+gr_handle_follow_link(const struct dentry *dentry, const struct vfsmount *mnt)
92064+{
92065+#ifdef CONFIG_GRKERNSEC_LINK
92066+ struct inode *inode = d_backing_inode(dentry);
92067+ struct inode *parent = d_backing_inode(dentry->d_parent);
92068+ const struct cred *cred = current_cred();
92069+
92070+ if (grsec_enable_link && d_is_symlink(dentry) &&
92071+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
92072+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
92073+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
92074+ return -EACCES;
92075+ }
92076+#endif
92077+ return 0;
92078+}
92079+
92080+int
92081+gr_handle_hardlink(const struct dentry *dentry,
92082+ const struct vfsmount *mnt,
92083+ const struct filename *to)
92084+{
92085+#ifdef CONFIG_GRKERNSEC_LINK
92086+ struct inode *inode = d_backing_inode(dentry);
92087+ const struct cred *cred = current_cred();
92088+
92089+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
92090+ (!d_is_reg(dentry) || is_privileged_binary(dentry) ||
92091+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
92092+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
92093+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
92094+ return -EPERM;
92095+ }
92096+#endif
92097+ return 0;
92098+}
92099diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
92100new file mode 100644
92101index 0000000..dbe0a6b
92102--- /dev/null
92103+++ b/grsecurity/grsec_log.c
92104@@ -0,0 +1,341 @@
92105+#include <linux/kernel.h>
92106+#include <linux/sched.h>
92107+#include <linux/file.h>
92108+#include <linux/tty.h>
92109+#include <linux/fs.h>
92110+#include <linux/mm.h>
92111+#include <linux/grinternal.h>
92112+
92113+#ifdef CONFIG_TREE_PREEMPT_RCU
92114+#define DISABLE_PREEMPT() preempt_disable()
92115+#define ENABLE_PREEMPT() preempt_enable()
92116+#else
92117+#define DISABLE_PREEMPT()
92118+#define ENABLE_PREEMPT()
92119+#endif
92120+
92121+#define BEGIN_LOCKS(x) \
92122+ DISABLE_PREEMPT(); \
92123+ rcu_read_lock(); \
92124+ read_lock(&tasklist_lock); \
92125+ read_lock(&grsec_exec_file_lock); \
92126+ if (x != GR_DO_AUDIT) \
92127+ spin_lock(&grsec_alert_lock); \
92128+ else \
92129+ spin_lock(&grsec_audit_lock)
92130+
92131+#define END_LOCKS(x) \
92132+ if (x != GR_DO_AUDIT) \
92133+ spin_unlock(&grsec_alert_lock); \
92134+ else \
92135+ spin_unlock(&grsec_audit_lock); \
92136+ read_unlock(&grsec_exec_file_lock); \
92137+ read_unlock(&tasklist_lock); \
92138+ rcu_read_unlock(); \
92139+ ENABLE_PREEMPT(); \
92140+ if (x == GR_DONT_AUDIT) \
92141+ gr_handle_alertkill(current)
92142+
92143+enum {
92144+ FLOODING,
92145+ NO_FLOODING
92146+};
92147+
92148+extern char *gr_alert_log_fmt;
92149+extern char *gr_audit_log_fmt;
92150+extern char *gr_alert_log_buf;
92151+extern char *gr_audit_log_buf;
92152+
92153+static int gr_log_start(int audit)
92154+{
92155+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
92156+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
92157+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92158+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
92159+ unsigned long curr_secs = get_seconds();
92160+
92161+ if (audit == GR_DO_AUDIT)
92162+ goto set_fmt;
92163+
92164+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
92165+ grsec_alert_wtime = curr_secs;
92166+ grsec_alert_fyet = 0;
92167+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
92168+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
92169+ grsec_alert_fyet++;
92170+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
92171+ grsec_alert_wtime = curr_secs;
92172+ grsec_alert_fyet++;
92173+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
92174+ return FLOODING;
92175+ }
92176+ else return FLOODING;
92177+
92178+set_fmt:
92179+#endif
92180+ memset(buf, 0, PAGE_SIZE);
92181+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
92182+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
92183+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
92184+ } else if (current->signal->curr_ip) {
92185+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
92186+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
92187+ } else if (gr_acl_is_enabled()) {
92188+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
92189+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
92190+ } else {
92191+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
92192+ strcpy(buf, fmt);
92193+ }
92194+
92195+ return NO_FLOODING;
92196+}
92197+
92198+static void gr_log_middle(int audit, const char *msg, va_list ap)
92199+ __attribute__ ((format (printf, 2, 0)));
92200+
92201+static void gr_log_middle(int audit, const char *msg, va_list ap)
92202+{
92203+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92204+ unsigned int len = strlen(buf);
92205+
92206+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
92207+
92208+ return;
92209+}
92210+
92211+static void gr_log_middle_varargs(int audit, const char *msg, ...)
92212+ __attribute__ ((format (printf, 2, 3)));
92213+
92214+static void gr_log_middle_varargs(int audit, const char *msg, ...)
92215+{
92216+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92217+ unsigned int len = strlen(buf);
92218+ va_list ap;
92219+
92220+ va_start(ap, msg);
92221+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
92222+ va_end(ap);
92223+
92224+ return;
92225+}
92226+
92227+static void gr_log_end(int audit, int append_default)
92228+{
92229+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92230+ if (append_default) {
92231+ struct task_struct *task = current;
92232+ struct task_struct *parent = task->real_parent;
92233+ const struct cred *cred = __task_cred(task);
92234+ const struct cred *pcred = __task_cred(parent);
92235+ unsigned int len = strlen(buf);
92236+
92237+ 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));
92238+ }
92239+
92240+ printk("%s\n", buf);
92241+
92242+ return;
92243+}
92244+
92245+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
92246+{
92247+ int logtype;
92248+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
92249+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
92250+ void *voidptr = NULL;
92251+ int num1 = 0, num2 = 0;
92252+ unsigned long ulong1 = 0, ulong2 = 0;
92253+ struct dentry *dentry = NULL;
92254+ struct vfsmount *mnt = NULL;
92255+ struct file *file = NULL;
92256+ struct task_struct *task = NULL;
92257+ struct vm_area_struct *vma = NULL;
92258+ const struct cred *cred, *pcred;
92259+ va_list ap;
92260+
92261+ BEGIN_LOCKS(audit);
92262+ logtype = gr_log_start(audit);
92263+ if (logtype == FLOODING) {
92264+ END_LOCKS(audit);
92265+ return;
92266+ }
92267+ va_start(ap, argtypes);
92268+ switch (argtypes) {
92269+ case GR_TTYSNIFF:
92270+ task = va_arg(ap, struct task_struct *);
92271+ 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));
92272+ break;
92273+ case GR_SYSCTL_HIDDEN:
92274+ str1 = va_arg(ap, char *);
92275+ gr_log_middle_varargs(audit, msg, result, str1);
92276+ break;
92277+ case GR_RBAC:
92278+ dentry = va_arg(ap, struct dentry *);
92279+ mnt = va_arg(ap, struct vfsmount *);
92280+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
92281+ break;
92282+ case GR_RBAC_STR:
92283+ dentry = va_arg(ap, struct dentry *);
92284+ mnt = va_arg(ap, struct vfsmount *);
92285+ str1 = va_arg(ap, char *);
92286+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
92287+ break;
92288+ case GR_STR_RBAC:
92289+ str1 = va_arg(ap, char *);
92290+ dentry = va_arg(ap, struct dentry *);
92291+ mnt = va_arg(ap, struct vfsmount *);
92292+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
92293+ break;
92294+ case GR_RBAC_MODE2:
92295+ dentry = va_arg(ap, struct dentry *);
92296+ mnt = va_arg(ap, struct vfsmount *);
92297+ str1 = va_arg(ap, char *);
92298+ str2 = va_arg(ap, char *);
92299+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
92300+ break;
92301+ case GR_RBAC_MODE3:
92302+ dentry = va_arg(ap, struct dentry *);
92303+ mnt = va_arg(ap, struct vfsmount *);
92304+ str1 = va_arg(ap, char *);
92305+ str2 = va_arg(ap, char *);
92306+ str3 = va_arg(ap, char *);
92307+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
92308+ break;
92309+ case GR_FILENAME:
92310+ dentry = va_arg(ap, struct dentry *);
92311+ mnt = va_arg(ap, struct vfsmount *);
92312+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
92313+ break;
92314+ case GR_STR_FILENAME:
92315+ str1 = va_arg(ap, char *);
92316+ dentry = va_arg(ap, struct dentry *);
92317+ mnt = va_arg(ap, struct vfsmount *);
92318+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
92319+ break;
92320+ case GR_FILENAME_STR:
92321+ dentry = va_arg(ap, struct dentry *);
92322+ mnt = va_arg(ap, struct vfsmount *);
92323+ str1 = va_arg(ap, char *);
92324+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
92325+ break;
92326+ case GR_FILENAME_TWO_INT:
92327+ dentry = va_arg(ap, struct dentry *);
92328+ mnt = va_arg(ap, struct vfsmount *);
92329+ num1 = va_arg(ap, int);
92330+ num2 = va_arg(ap, int);
92331+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
92332+ break;
92333+ case GR_FILENAME_TWO_INT_STR:
92334+ dentry = va_arg(ap, struct dentry *);
92335+ mnt = va_arg(ap, struct vfsmount *);
92336+ num1 = va_arg(ap, int);
92337+ num2 = va_arg(ap, int);
92338+ str1 = va_arg(ap, char *);
92339+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
92340+ break;
92341+ case GR_TEXTREL:
92342+ file = va_arg(ap, struct file *);
92343+ ulong1 = va_arg(ap, unsigned long);
92344+ ulong2 = va_arg(ap, unsigned long);
92345+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
92346+ break;
92347+ case GR_PTRACE:
92348+ task = va_arg(ap, struct task_struct *);
92349+ 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));
92350+ break;
92351+ case GR_RESOURCE:
92352+ task = va_arg(ap, struct task_struct *);
92353+ cred = __task_cred(task);
92354+ pcred = __task_cred(task->real_parent);
92355+ ulong1 = va_arg(ap, unsigned long);
92356+ str1 = va_arg(ap, char *);
92357+ ulong2 = va_arg(ap, unsigned long);
92358+ 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));
92359+ break;
92360+ case GR_CAP:
92361+ task = va_arg(ap, struct task_struct *);
92362+ cred = __task_cred(task);
92363+ pcred = __task_cred(task->real_parent);
92364+ str1 = va_arg(ap, char *);
92365+ 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));
92366+ break;
92367+ case GR_SIG:
92368+ str1 = va_arg(ap, char *);
92369+ voidptr = va_arg(ap, void *);
92370+ gr_log_middle_varargs(audit, msg, str1, voidptr);
92371+ break;
92372+ case GR_SIG2:
92373+ task = va_arg(ap, struct task_struct *);
92374+ cred = __task_cred(task);
92375+ pcred = __task_cred(task->real_parent);
92376+ num1 = va_arg(ap, int);
92377+ 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));
92378+ break;
92379+ case GR_CRASH1:
92380+ task = va_arg(ap, struct task_struct *);
92381+ cred = __task_cred(task);
92382+ pcred = __task_cred(task->real_parent);
92383+ ulong1 = va_arg(ap, unsigned long);
92384+ 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);
92385+ break;
92386+ case GR_CRASH2:
92387+ task = va_arg(ap, struct task_struct *);
92388+ cred = __task_cred(task);
92389+ pcred = __task_cred(task->real_parent);
92390+ ulong1 = va_arg(ap, unsigned long);
92391+ 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);
92392+ break;
92393+ case GR_RWXMAP:
92394+ file = va_arg(ap, struct file *);
92395+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
92396+ break;
92397+ case GR_RWXMAPVMA:
92398+ vma = va_arg(ap, struct vm_area_struct *);
92399+ if (vma->vm_file)
92400+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
92401+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
92402+ str1 = "<stack>";
92403+ else if (vma->vm_start <= current->mm->brk &&
92404+ vma->vm_end >= current->mm->start_brk)
92405+ str1 = "<heap>";
92406+ else
92407+ str1 = "<anonymous mapping>";
92408+ gr_log_middle_varargs(audit, msg, str1);
92409+ break;
92410+ case GR_PSACCT:
92411+ {
92412+ unsigned int wday, cday;
92413+ __u8 whr, chr;
92414+ __u8 wmin, cmin;
92415+ __u8 wsec, csec;
92416+ char cur_tty[64] = { 0 };
92417+ char parent_tty[64] = { 0 };
92418+
92419+ task = va_arg(ap, struct task_struct *);
92420+ wday = va_arg(ap, unsigned int);
92421+ cday = va_arg(ap, unsigned int);
92422+ whr = va_arg(ap, int);
92423+ chr = va_arg(ap, int);
92424+ wmin = va_arg(ap, int);
92425+ cmin = va_arg(ap, int);
92426+ wsec = va_arg(ap, int);
92427+ csec = va_arg(ap, int);
92428+ ulong1 = va_arg(ap, unsigned long);
92429+ cred = __task_cred(task);
92430+ pcred = __task_cred(task->real_parent);
92431+
92432+ 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));
92433+ }
92434+ break;
92435+ default:
92436+ gr_log_middle(audit, msg, ap);
92437+ }
92438+ va_end(ap);
92439+ // these don't need DEFAULTSECARGS printed on the end
92440+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
92441+ gr_log_end(audit, 0);
92442+ else
92443+ gr_log_end(audit, 1);
92444+ END_LOCKS(audit);
92445+}
92446diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
92447new file mode 100644
92448index 0000000..0e39d8c
92449--- /dev/null
92450+++ b/grsecurity/grsec_mem.c
92451@@ -0,0 +1,48 @@
92452+#include <linux/kernel.h>
92453+#include <linux/sched.h>
92454+#include <linux/mm.h>
92455+#include <linux/mman.h>
92456+#include <linux/module.h>
92457+#include <linux/grinternal.h>
92458+
92459+void gr_handle_msr_write(void)
92460+{
92461+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
92462+ return;
92463+}
92464+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
92465+
92466+void
92467+gr_handle_ioperm(void)
92468+{
92469+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
92470+ return;
92471+}
92472+
92473+void
92474+gr_handle_iopl(void)
92475+{
92476+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
92477+ return;
92478+}
92479+
92480+void
92481+gr_handle_mem_readwrite(u64 from, u64 to)
92482+{
92483+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
92484+ return;
92485+}
92486+
92487+void
92488+gr_handle_vm86(void)
92489+{
92490+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
92491+ return;
92492+}
92493+
92494+void
92495+gr_log_badprocpid(const char *entry)
92496+{
92497+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
92498+ return;
92499+}
92500diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
92501new file mode 100644
92502index 0000000..fe02bf4
92503--- /dev/null
92504+++ b/grsecurity/grsec_mount.c
92505@@ -0,0 +1,65 @@
92506+#include <linux/kernel.h>
92507+#include <linux/sched.h>
92508+#include <linux/mount.h>
92509+#include <linux/major.h>
92510+#include <linux/grsecurity.h>
92511+#include <linux/grinternal.h>
92512+
92513+void
92514+gr_log_remount(const char *devname, const int retval)
92515+{
92516+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92517+ if (grsec_enable_mount && (retval >= 0))
92518+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
92519+#endif
92520+ return;
92521+}
92522+
92523+void
92524+gr_log_unmount(const char *devname, const int retval)
92525+{
92526+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92527+ if (grsec_enable_mount && (retval >= 0))
92528+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
92529+#endif
92530+ return;
92531+}
92532+
92533+void
92534+gr_log_mount(const char *from, struct path *to, const int retval)
92535+{
92536+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92537+ if (grsec_enable_mount && (retval >= 0))
92538+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
92539+#endif
92540+ return;
92541+}
92542+
92543+int
92544+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
92545+{
92546+#ifdef CONFIG_GRKERNSEC_ROFS
92547+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
92548+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
92549+ return -EPERM;
92550+ } else
92551+ return 0;
92552+#endif
92553+ return 0;
92554+}
92555+
92556+int
92557+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
92558+{
92559+#ifdef CONFIG_GRKERNSEC_ROFS
92560+ struct inode *inode = d_backing_inode(dentry);
92561+
92562+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
92563+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
92564+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
92565+ return -EPERM;
92566+ } else
92567+ return 0;
92568+#endif
92569+ return 0;
92570+}
92571diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
92572new file mode 100644
92573index 0000000..6ee9d50
92574--- /dev/null
92575+++ b/grsecurity/grsec_pax.c
92576@@ -0,0 +1,45 @@
92577+#include <linux/kernel.h>
92578+#include <linux/sched.h>
92579+#include <linux/mm.h>
92580+#include <linux/file.h>
92581+#include <linux/grinternal.h>
92582+#include <linux/grsecurity.h>
92583+
92584+void
92585+gr_log_textrel(struct vm_area_struct * vma)
92586+{
92587+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92588+ if (grsec_enable_log_rwxmaps)
92589+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
92590+#endif
92591+ return;
92592+}
92593+
92594+void gr_log_ptgnustack(struct file *file)
92595+{
92596+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92597+ if (grsec_enable_log_rwxmaps)
92598+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
92599+#endif
92600+ return;
92601+}
92602+
92603+void
92604+gr_log_rwxmmap(struct file *file)
92605+{
92606+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92607+ if (grsec_enable_log_rwxmaps)
92608+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
92609+#endif
92610+ return;
92611+}
92612+
92613+void
92614+gr_log_rwxmprotect(struct vm_area_struct *vma)
92615+{
92616+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92617+ if (grsec_enable_log_rwxmaps)
92618+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
92619+#endif
92620+ return;
92621+}
92622diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
92623new file mode 100644
92624index 0000000..2005a3a
92625--- /dev/null
92626+++ b/grsecurity/grsec_proc.c
92627@@ -0,0 +1,20 @@
92628+#include <linux/kernel.h>
92629+#include <linux/sched.h>
92630+#include <linux/grsecurity.h>
92631+#include <linux/grinternal.h>
92632+
92633+int gr_proc_is_restricted(void)
92634+{
92635+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92636+ const struct cred *cred = current_cred();
92637+#endif
92638+
92639+#ifdef CONFIG_GRKERNSEC_PROC_USER
92640+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
92641+ return -EACCES;
92642+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92643+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
92644+ return -EACCES;
92645+#endif
92646+ return 0;
92647+}
92648diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
92649new file mode 100644
92650index 0000000..304c518
92651--- /dev/null
92652+++ b/grsecurity/grsec_ptrace.c
92653@@ -0,0 +1,30 @@
92654+#include <linux/kernel.h>
92655+#include <linux/sched.h>
92656+#include <linux/grinternal.h>
92657+#include <linux/security.h>
92658+
92659+void
92660+gr_audit_ptrace(struct task_struct *task)
92661+{
92662+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
92663+ if (grsec_enable_audit_ptrace)
92664+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
92665+#endif
92666+ return;
92667+}
92668+
92669+int
92670+gr_ptrace_readexec(struct file *file, int unsafe_flags)
92671+{
92672+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92673+ const struct dentry *dentry = file->f_path.dentry;
92674+ const struct vfsmount *mnt = file->f_path.mnt;
92675+
92676+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
92677+ (inode_permission(d_backing_inode(dentry), MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
92678+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
92679+ return -EACCES;
92680+ }
92681+#endif
92682+ return 0;
92683+}
92684diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
92685new file mode 100644
92686index 0000000..3860c7e
92687--- /dev/null
92688+++ b/grsecurity/grsec_sig.c
92689@@ -0,0 +1,236 @@
92690+#include <linux/kernel.h>
92691+#include <linux/sched.h>
92692+#include <linux/fs.h>
92693+#include <linux/delay.h>
92694+#include <linux/grsecurity.h>
92695+#include <linux/grinternal.h>
92696+#include <linux/hardirq.h>
92697+
92698+char *signames[] = {
92699+ [SIGSEGV] = "Segmentation fault",
92700+ [SIGILL] = "Illegal instruction",
92701+ [SIGABRT] = "Abort",
92702+ [SIGBUS] = "Invalid alignment/Bus error"
92703+};
92704+
92705+void
92706+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
92707+{
92708+#ifdef CONFIG_GRKERNSEC_SIGNAL
92709+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
92710+ (sig == SIGABRT) || (sig == SIGBUS))) {
92711+ if (task_pid_nr(t) == task_pid_nr(current)) {
92712+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
92713+ } else {
92714+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
92715+ }
92716+ }
92717+#endif
92718+ return;
92719+}
92720+
92721+int
92722+gr_handle_signal(const struct task_struct *p, const int sig)
92723+{
92724+#ifdef CONFIG_GRKERNSEC
92725+ /* ignore the 0 signal for protected task checks */
92726+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
92727+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
92728+ return -EPERM;
92729+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
92730+ return -EPERM;
92731+ }
92732+#endif
92733+ return 0;
92734+}
92735+
92736+#ifdef CONFIG_GRKERNSEC
92737+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
92738+
92739+int gr_fake_force_sig(int sig, struct task_struct *t)
92740+{
92741+ unsigned long int flags;
92742+ int ret, blocked, ignored;
92743+ struct k_sigaction *action;
92744+
92745+ spin_lock_irqsave(&t->sighand->siglock, flags);
92746+ action = &t->sighand->action[sig-1];
92747+ ignored = action->sa.sa_handler == SIG_IGN;
92748+ blocked = sigismember(&t->blocked, sig);
92749+ if (blocked || ignored) {
92750+ action->sa.sa_handler = SIG_DFL;
92751+ if (blocked) {
92752+ sigdelset(&t->blocked, sig);
92753+ recalc_sigpending_and_wake(t);
92754+ }
92755+ }
92756+ if (action->sa.sa_handler == SIG_DFL)
92757+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
92758+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
92759+
92760+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
92761+
92762+ return ret;
92763+}
92764+#endif
92765+
92766+#define GR_USER_BAN_TIME (15 * 60)
92767+#define GR_DAEMON_BRUTE_TIME (30 * 60)
92768+
92769+void gr_handle_brute_attach(int dumpable)
92770+{
92771+#ifdef CONFIG_GRKERNSEC_BRUTE
92772+ struct task_struct *p = current;
92773+ kuid_t uid = GLOBAL_ROOT_UID;
92774+ int daemon = 0;
92775+
92776+ if (!grsec_enable_brute)
92777+ return;
92778+
92779+ rcu_read_lock();
92780+ read_lock(&tasklist_lock);
92781+ read_lock(&grsec_exec_file_lock);
92782+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
92783+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
92784+ p->real_parent->brute = 1;
92785+ daemon = 1;
92786+ } else {
92787+ const struct cred *cred = __task_cred(p), *cred2;
92788+ struct task_struct *tsk, *tsk2;
92789+
92790+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
92791+ struct user_struct *user;
92792+
92793+ uid = cred->uid;
92794+
92795+ /* this is put upon execution past expiration */
92796+ user = find_user(uid);
92797+ if (user == NULL)
92798+ goto unlock;
92799+ user->suid_banned = 1;
92800+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
92801+ if (user->suid_ban_expires == ~0UL)
92802+ user->suid_ban_expires--;
92803+
92804+ /* only kill other threads of the same binary, from the same user */
92805+ do_each_thread(tsk2, tsk) {
92806+ cred2 = __task_cred(tsk);
92807+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
92808+ gr_fake_force_sig(SIGKILL, tsk);
92809+ } while_each_thread(tsk2, tsk);
92810+ }
92811+ }
92812+unlock:
92813+ read_unlock(&grsec_exec_file_lock);
92814+ read_unlock(&tasklist_lock);
92815+ rcu_read_unlock();
92816+
92817+ if (gr_is_global_nonroot(uid))
92818+ 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);
92819+ else if (daemon)
92820+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
92821+
92822+#endif
92823+ return;
92824+}
92825+
92826+void gr_handle_brute_check(void)
92827+{
92828+#ifdef CONFIG_GRKERNSEC_BRUTE
92829+ struct task_struct *p = current;
92830+
92831+ if (unlikely(p->brute)) {
92832+ if (!grsec_enable_brute)
92833+ p->brute = 0;
92834+ else if (time_before(get_seconds(), p->brute_expires))
92835+ msleep(30 * 1000);
92836+ }
92837+#endif
92838+ return;
92839+}
92840+
92841+void gr_handle_kernel_exploit(void)
92842+{
92843+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92844+ const struct cred *cred;
92845+ struct task_struct *tsk, *tsk2;
92846+ struct user_struct *user;
92847+ kuid_t uid;
92848+
92849+ if (in_irq() || in_serving_softirq() || in_nmi())
92850+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
92851+
92852+ uid = current_uid();
92853+
92854+ if (gr_is_global_root(uid))
92855+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
92856+ else {
92857+ /* kill all the processes of this user, hold a reference
92858+ to their creds struct, and prevent them from creating
92859+ another process until system reset
92860+ */
92861+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
92862+ GR_GLOBAL_UID(uid));
92863+ /* we intentionally leak this ref */
92864+ user = get_uid(current->cred->user);
92865+ if (user)
92866+ user->kernel_banned = 1;
92867+
92868+ /* kill all processes of this user */
92869+ read_lock(&tasklist_lock);
92870+ do_each_thread(tsk2, tsk) {
92871+ cred = __task_cred(tsk);
92872+ if (uid_eq(cred->uid, uid))
92873+ gr_fake_force_sig(SIGKILL, tsk);
92874+ } while_each_thread(tsk2, tsk);
92875+ read_unlock(&tasklist_lock);
92876+ }
92877+#endif
92878+}
92879+
92880+#ifdef CONFIG_GRKERNSEC_BRUTE
92881+static bool suid_ban_expired(struct user_struct *user)
92882+{
92883+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
92884+ user->suid_banned = 0;
92885+ user->suid_ban_expires = 0;
92886+ free_uid(user);
92887+ return true;
92888+ }
92889+
92890+ return false;
92891+}
92892+#endif
92893+
92894+int gr_process_kernel_exec_ban(void)
92895+{
92896+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92897+ if (unlikely(current->cred->user->kernel_banned))
92898+ return -EPERM;
92899+#endif
92900+ return 0;
92901+}
92902+
92903+int gr_process_kernel_setuid_ban(struct user_struct *user)
92904+{
92905+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92906+ if (unlikely(user->kernel_banned))
92907+ gr_fake_force_sig(SIGKILL, current);
92908+#endif
92909+ return 0;
92910+}
92911+
92912+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
92913+{
92914+#ifdef CONFIG_GRKERNSEC_BRUTE
92915+ struct user_struct *user = current->cred->user;
92916+ if (unlikely(user->suid_banned)) {
92917+ if (suid_ban_expired(user))
92918+ return 0;
92919+ /* disallow execution of suid binaries only */
92920+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
92921+ return -EPERM;
92922+ }
92923+#endif
92924+ return 0;
92925+}
92926diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
92927new file mode 100644
92928index 0000000..a523bd2
92929--- /dev/null
92930+++ b/grsecurity/grsec_sock.c
92931@@ -0,0 +1,244 @@
92932+#include <linux/kernel.h>
92933+#include <linux/module.h>
92934+#include <linux/sched.h>
92935+#include <linux/file.h>
92936+#include <linux/net.h>
92937+#include <linux/in.h>
92938+#include <linux/ip.h>
92939+#include <net/sock.h>
92940+#include <net/inet_sock.h>
92941+#include <linux/grsecurity.h>
92942+#include <linux/grinternal.h>
92943+#include <linux/gracl.h>
92944+
92945+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
92946+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
92947+
92948+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
92949+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
92950+
92951+#ifdef CONFIG_UNIX_MODULE
92952+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
92953+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
92954+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
92955+EXPORT_SYMBOL_GPL(gr_handle_create);
92956+#endif
92957+
92958+#ifdef CONFIG_GRKERNSEC
92959+#define gr_conn_table_size 32749
92960+struct conn_table_entry {
92961+ struct conn_table_entry *next;
92962+ struct signal_struct *sig;
92963+};
92964+
92965+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
92966+DEFINE_SPINLOCK(gr_conn_table_lock);
92967+
92968+extern const char * gr_socktype_to_name(unsigned char type);
92969+extern const char * gr_proto_to_name(unsigned char proto);
92970+extern const char * gr_sockfamily_to_name(unsigned char family);
92971+
92972+static int
92973+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
92974+{
92975+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
92976+}
92977+
92978+static int
92979+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
92980+ __u16 sport, __u16 dport)
92981+{
92982+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
92983+ sig->gr_sport == sport && sig->gr_dport == dport))
92984+ return 1;
92985+ else
92986+ return 0;
92987+}
92988+
92989+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
92990+{
92991+ struct conn_table_entry **match;
92992+ unsigned int index;
92993+
92994+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92995+ sig->gr_sport, sig->gr_dport,
92996+ gr_conn_table_size);
92997+
92998+ newent->sig = sig;
92999+
93000+ match = &gr_conn_table[index];
93001+ newent->next = *match;
93002+ *match = newent;
93003+
93004+ return;
93005+}
93006+
93007+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
93008+{
93009+ struct conn_table_entry *match, *last = NULL;
93010+ unsigned int index;
93011+
93012+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
93013+ sig->gr_sport, sig->gr_dport,
93014+ gr_conn_table_size);
93015+
93016+ match = gr_conn_table[index];
93017+ while (match && !conn_match(match->sig,
93018+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
93019+ sig->gr_dport)) {
93020+ last = match;
93021+ match = match->next;
93022+ }
93023+
93024+ if (match) {
93025+ if (last)
93026+ last->next = match->next;
93027+ else
93028+ gr_conn_table[index] = NULL;
93029+ kfree(match);
93030+ }
93031+
93032+ return;
93033+}
93034+
93035+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
93036+ __u16 sport, __u16 dport)
93037+{
93038+ struct conn_table_entry *match;
93039+ unsigned int index;
93040+
93041+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
93042+
93043+ match = gr_conn_table[index];
93044+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
93045+ match = match->next;
93046+
93047+ if (match)
93048+ return match->sig;
93049+ else
93050+ return NULL;
93051+}
93052+
93053+#endif
93054+
93055+void gr_update_task_in_ip_table(const struct inet_sock *inet)
93056+{
93057+#ifdef CONFIG_GRKERNSEC
93058+ struct signal_struct *sig = current->signal;
93059+ struct conn_table_entry *newent;
93060+
93061+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
93062+ if (newent == NULL)
93063+ return;
93064+ /* no bh lock needed since we are called with bh disabled */
93065+ spin_lock(&gr_conn_table_lock);
93066+ gr_del_task_from_ip_table_nolock(sig);
93067+ sig->gr_saddr = inet->inet_rcv_saddr;
93068+ sig->gr_daddr = inet->inet_daddr;
93069+ sig->gr_sport = inet->inet_sport;
93070+ sig->gr_dport = inet->inet_dport;
93071+ gr_add_to_task_ip_table_nolock(sig, newent);
93072+ spin_unlock(&gr_conn_table_lock);
93073+#endif
93074+ return;
93075+}
93076+
93077+void gr_del_task_from_ip_table(struct task_struct *task)
93078+{
93079+#ifdef CONFIG_GRKERNSEC
93080+ spin_lock_bh(&gr_conn_table_lock);
93081+ gr_del_task_from_ip_table_nolock(task->signal);
93082+ spin_unlock_bh(&gr_conn_table_lock);
93083+#endif
93084+ return;
93085+}
93086+
93087+void
93088+gr_attach_curr_ip(const struct sock *sk)
93089+{
93090+#ifdef CONFIG_GRKERNSEC
93091+ struct signal_struct *p, *set;
93092+ const struct inet_sock *inet = inet_sk(sk);
93093+
93094+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
93095+ return;
93096+
93097+ set = current->signal;
93098+
93099+ spin_lock_bh(&gr_conn_table_lock);
93100+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
93101+ inet->inet_dport, inet->inet_sport);
93102+ if (unlikely(p != NULL)) {
93103+ set->curr_ip = p->curr_ip;
93104+ set->used_accept = 1;
93105+ gr_del_task_from_ip_table_nolock(p);
93106+ spin_unlock_bh(&gr_conn_table_lock);
93107+ return;
93108+ }
93109+ spin_unlock_bh(&gr_conn_table_lock);
93110+
93111+ set->curr_ip = inet->inet_daddr;
93112+ set->used_accept = 1;
93113+#endif
93114+ return;
93115+}
93116+
93117+int
93118+gr_handle_sock_all(const int family, const int type, const int protocol)
93119+{
93120+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93121+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
93122+ (family != AF_UNIX)) {
93123+ if (family == AF_INET)
93124+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
93125+ else
93126+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
93127+ return -EACCES;
93128+ }
93129+#endif
93130+ return 0;
93131+}
93132+
93133+int
93134+gr_handle_sock_server(const struct sockaddr *sck)
93135+{
93136+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93137+ if (grsec_enable_socket_server &&
93138+ in_group_p(grsec_socket_server_gid) &&
93139+ sck && (sck->sa_family != AF_UNIX) &&
93140+ (sck->sa_family != AF_LOCAL)) {
93141+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
93142+ return -EACCES;
93143+ }
93144+#endif
93145+ return 0;
93146+}
93147+
93148+int
93149+gr_handle_sock_server_other(const struct sock *sck)
93150+{
93151+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93152+ if (grsec_enable_socket_server &&
93153+ in_group_p(grsec_socket_server_gid) &&
93154+ sck && (sck->sk_family != AF_UNIX) &&
93155+ (sck->sk_family != AF_LOCAL)) {
93156+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
93157+ return -EACCES;
93158+ }
93159+#endif
93160+ return 0;
93161+}
93162+
93163+int
93164+gr_handle_sock_client(const struct sockaddr *sck)
93165+{
93166+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93167+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
93168+ sck && (sck->sa_family != AF_UNIX) &&
93169+ (sck->sa_family != AF_LOCAL)) {
93170+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
93171+ return -EACCES;
93172+ }
93173+#endif
93174+ return 0;
93175+}
93176diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
93177new file mode 100644
93178index 0000000..aaec43c
93179--- /dev/null
93180+++ b/grsecurity/grsec_sysctl.c
93181@@ -0,0 +1,488 @@
93182+#include <linux/kernel.h>
93183+#include <linux/sched.h>
93184+#include <linux/sysctl.h>
93185+#include <linux/grsecurity.h>
93186+#include <linux/grinternal.h>
93187+
93188+int
93189+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
93190+{
93191+#ifdef CONFIG_GRKERNSEC_SYSCTL
93192+ if (dirname == NULL || name == NULL)
93193+ return 0;
93194+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
93195+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
93196+ return -EACCES;
93197+ }
93198+#endif
93199+ return 0;
93200+}
93201+
93202+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
93203+static int __maybe_unused __read_only one = 1;
93204+#endif
93205+
93206+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
93207+ defined(CONFIG_GRKERNSEC_DENYUSB)
93208+struct ctl_table grsecurity_table[] = {
93209+#ifdef CONFIG_GRKERNSEC_SYSCTL
93210+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
93211+#ifdef CONFIG_GRKERNSEC_IO
93212+ {
93213+ .procname = "disable_priv_io",
93214+ .data = &grsec_disable_privio,
93215+ .maxlen = sizeof(int),
93216+ .mode = 0600,
93217+ .proc_handler = &proc_dointvec_secure,
93218+ },
93219+#endif
93220+#endif
93221+#ifdef CONFIG_GRKERNSEC_LINK
93222+ {
93223+ .procname = "linking_restrictions",
93224+ .data = &grsec_enable_link,
93225+ .maxlen = sizeof(int),
93226+ .mode = 0600,
93227+ .proc_handler = &proc_dointvec_secure,
93228+ },
93229+#endif
93230+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
93231+ {
93232+ .procname = "enforce_symlinksifowner",
93233+ .data = &grsec_enable_symlinkown,
93234+ .maxlen = sizeof(int),
93235+ .mode = 0600,
93236+ .proc_handler = &proc_dointvec_secure,
93237+ },
93238+ {
93239+ .procname = "symlinkown_gid",
93240+ .data = &grsec_symlinkown_gid,
93241+ .maxlen = sizeof(int),
93242+ .mode = 0600,
93243+ .proc_handler = &proc_dointvec_secure,
93244+ },
93245+#endif
93246+#ifdef CONFIG_GRKERNSEC_BRUTE
93247+ {
93248+ .procname = "deter_bruteforce",
93249+ .data = &grsec_enable_brute,
93250+ .maxlen = sizeof(int),
93251+ .mode = 0600,
93252+ .proc_handler = &proc_dointvec_secure,
93253+ },
93254+#endif
93255+#ifdef CONFIG_GRKERNSEC_FIFO
93256+ {
93257+ .procname = "fifo_restrictions",
93258+ .data = &grsec_enable_fifo,
93259+ .maxlen = sizeof(int),
93260+ .mode = 0600,
93261+ .proc_handler = &proc_dointvec_secure,
93262+ },
93263+#endif
93264+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
93265+ {
93266+ .procname = "ptrace_readexec",
93267+ .data = &grsec_enable_ptrace_readexec,
93268+ .maxlen = sizeof(int),
93269+ .mode = 0600,
93270+ .proc_handler = &proc_dointvec_secure,
93271+ },
93272+#endif
93273+#ifdef CONFIG_GRKERNSEC_SETXID
93274+ {
93275+ .procname = "consistent_setxid",
93276+ .data = &grsec_enable_setxid,
93277+ .maxlen = sizeof(int),
93278+ .mode = 0600,
93279+ .proc_handler = &proc_dointvec_secure,
93280+ },
93281+#endif
93282+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
93283+ {
93284+ .procname = "ip_blackhole",
93285+ .data = &grsec_enable_blackhole,
93286+ .maxlen = sizeof(int),
93287+ .mode = 0600,
93288+ .proc_handler = &proc_dointvec_secure,
93289+ },
93290+ {
93291+ .procname = "lastack_retries",
93292+ .data = &grsec_lastack_retries,
93293+ .maxlen = sizeof(int),
93294+ .mode = 0600,
93295+ .proc_handler = &proc_dointvec_secure,
93296+ },
93297+#endif
93298+#ifdef CONFIG_GRKERNSEC_EXECLOG
93299+ {
93300+ .procname = "exec_logging",
93301+ .data = &grsec_enable_execlog,
93302+ .maxlen = sizeof(int),
93303+ .mode = 0600,
93304+ .proc_handler = &proc_dointvec_secure,
93305+ },
93306+#endif
93307+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
93308+ {
93309+ .procname = "rwxmap_logging",
93310+ .data = &grsec_enable_log_rwxmaps,
93311+ .maxlen = sizeof(int),
93312+ .mode = 0600,
93313+ .proc_handler = &proc_dointvec_secure,
93314+ },
93315+#endif
93316+#ifdef CONFIG_GRKERNSEC_SIGNAL
93317+ {
93318+ .procname = "signal_logging",
93319+ .data = &grsec_enable_signal,
93320+ .maxlen = sizeof(int),
93321+ .mode = 0600,
93322+ .proc_handler = &proc_dointvec_secure,
93323+ },
93324+#endif
93325+#ifdef CONFIG_GRKERNSEC_FORKFAIL
93326+ {
93327+ .procname = "forkfail_logging",
93328+ .data = &grsec_enable_forkfail,
93329+ .maxlen = sizeof(int),
93330+ .mode = 0600,
93331+ .proc_handler = &proc_dointvec_secure,
93332+ },
93333+#endif
93334+#ifdef CONFIG_GRKERNSEC_TIME
93335+ {
93336+ .procname = "timechange_logging",
93337+ .data = &grsec_enable_time,
93338+ .maxlen = sizeof(int),
93339+ .mode = 0600,
93340+ .proc_handler = &proc_dointvec_secure,
93341+ },
93342+#endif
93343+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
93344+ {
93345+ .procname = "chroot_deny_shmat",
93346+ .data = &grsec_enable_chroot_shmat,
93347+ .maxlen = sizeof(int),
93348+ .mode = 0600,
93349+ .proc_handler = &proc_dointvec_secure,
93350+ },
93351+#endif
93352+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
93353+ {
93354+ .procname = "chroot_deny_unix",
93355+ .data = &grsec_enable_chroot_unix,
93356+ .maxlen = sizeof(int),
93357+ .mode = 0600,
93358+ .proc_handler = &proc_dointvec_secure,
93359+ },
93360+#endif
93361+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
93362+ {
93363+ .procname = "chroot_deny_mount",
93364+ .data = &grsec_enable_chroot_mount,
93365+ .maxlen = sizeof(int),
93366+ .mode = 0600,
93367+ .proc_handler = &proc_dointvec_secure,
93368+ },
93369+#endif
93370+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
93371+ {
93372+ .procname = "chroot_deny_fchdir",
93373+ .data = &grsec_enable_chroot_fchdir,
93374+ .maxlen = sizeof(int),
93375+ .mode = 0600,
93376+ .proc_handler = &proc_dointvec_secure,
93377+ },
93378+#endif
93379+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
93380+ {
93381+ .procname = "chroot_deny_chroot",
93382+ .data = &grsec_enable_chroot_double,
93383+ .maxlen = sizeof(int),
93384+ .mode = 0600,
93385+ .proc_handler = &proc_dointvec_secure,
93386+ },
93387+#endif
93388+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
93389+ {
93390+ .procname = "chroot_deny_pivot",
93391+ .data = &grsec_enable_chroot_pivot,
93392+ .maxlen = sizeof(int),
93393+ .mode = 0600,
93394+ .proc_handler = &proc_dointvec_secure,
93395+ },
93396+#endif
93397+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
93398+ {
93399+ .procname = "chroot_enforce_chdir",
93400+ .data = &grsec_enable_chroot_chdir,
93401+ .maxlen = sizeof(int),
93402+ .mode = 0600,
93403+ .proc_handler = &proc_dointvec_secure,
93404+ },
93405+#endif
93406+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
93407+ {
93408+ .procname = "chroot_deny_chmod",
93409+ .data = &grsec_enable_chroot_chmod,
93410+ .maxlen = sizeof(int),
93411+ .mode = 0600,
93412+ .proc_handler = &proc_dointvec_secure,
93413+ },
93414+#endif
93415+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
93416+ {
93417+ .procname = "chroot_deny_mknod",
93418+ .data = &grsec_enable_chroot_mknod,
93419+ .maxlen = sizeof(int),
93420+ .mode = 0600,
93421+ .proc_handler = &proc_dointvec_secure,
93422+ },
93423+#endif
93424+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
93425+ {
93426+ .procname = "chroot_restrict_nice",
93427+ .data = &grsec_enable_chroot_nice,
93428+ .maxlen = sizeof(int),
93429+ .mode = 0600,
93430+ .proc_handler = &proc_dointvec_secure,
93431+ },
93432+#endif
93433+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
93434+ {
93435+ .procname = "chroot_execlog",
93436+ .data = &grsec_enable_chroot_execlog,
93437+ .maxlen = sizeof(int),
93438+ .mode = 0600,
93439+ .proc_handler = &proc_dointvec_secure,
93440+ },
93441+#endif
93442+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
93443+ {
93444+ .procname = "chroot_caps",
93445+ .data = &grsec_enable_chroot_caps,
93446+ .maxlen = sizeof(int),
93447+ .mode = 0600,
93448+ .proc_handler = &proc_dointvec_secure,
93449+ },
93450+#endif
93451+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
93452+ {
93453+ .procname = "chroot_deny_bad_rename",
93454+ .data = &grsec_enable_chroot_rename,
93455+ .maxlen = sizeof(int),
93456+ .mode = 0600,
93457+ .proc_handler = &proc_dointvec_secure,
93458+ },
93459+#endif
93460+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
93461+ {
93462+ .procname = "chroot_deny_sysctl",
93463+ .data = &grsec_enable_chroot_sysctl,
93464+ .maxlen = sizeof(int),
93465+ .mode = 0600,
93466+ .proc_handler = &proc_dointvec_secure,
93467+ },
93468+#endif
93469+#ifdef CONFIG_GRKERNSEC_TPE
93470+ {
93471+ .procname = "tpe",
93472+ .data = &grsec_enable_tpe,
93473+ .maxlen = sizeof(int),
93474+ .mode = 0600,
93475+ .proc_handler = &proc_dointvec_secure,
93476+ },
93477+ {
93478+ .procname = "tpe_gid",
93479+ .data = &grsec_tpe_gid,
93480+ .maxlen = sizeof(int),
93481+ .mode = 0600,
93482+ .proc_handler = &proc_dointvec_secure,
93483+ },
93484+#endif
93485+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93486+ {
93487+ .procname = "tpe_invert",
93488+ .data = &grsec_enable_tpe_invert,
93489+ .maxlen = sizeof(int),
93490+ .mode = 0600,
93491+ .proc_handler = &proc_dointvec_secure,
93492+ },
93493+#endif
93494+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93495+ {
93496+ .procname = "tpe_restrict_all",
93497+ .data = &grsec_enable_tpe_all,
93498+ .maxlen = sizeof(int),
93499+ .mode = 0600,
93500+ .proc_handler = &proc_dointvec_secure,
93501+ },
93502+#endif
93503+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93504+ {
93505+ .procname = "socket_all",
93506+ .data = &grsec_enable_socket_all,
93507+ .maxlen = sizeof(int),
93508+ .mode = 0600,
93509+ .proc_handler = &proc_dointvec_secure,
93510+ },
93511+ {
93512+ .procname = "socket_all_gid",
93513+ .data = &grsec_socket_all_gid,
93514+ .maxlen = sizeof(int),
93515+ .mode = 0600,
93516+ .proc_handler = &proc_dointvec_secure,
93517+ },
93518+#endif
93519+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93520+ {
93521+ .procname = "socket_client",
93522+ .data = &grsec_enable_socket_client,
93523+ .maxlen = sizeof(int),
93524+ .mode = 0600,
93525+ .proc_handler = &proc_dointvec_secure,
93526+ },
93527+ {
93528+ .procname = "socket_client_gid",
93529+ .data = &grsec_socket_client_gid,
93530+ .maxlen = sizeof(int),
93531+ .mode = 0600,
93532+ .proc_handler = &proc_dointvec_secure,
93533+ },
93534+#endif
93535+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93536+ {
93537+ .procname = "socket_server",
93538+ .data = &grsec_enable_socket_server,
93539+ .maxlen = sizeof(int),
93540+ .mode = 0600,
93541+ .proc_handler = &proc_dointvec_secure,
93542+ },
93543+ {
93544+ .procname = "socket_server_gid",
93545+ .data = &grsec_socket_server_gid,
93546+ .maxlen = sizeof(int),
93547+ .mode = 0600,
93548+ .proc_handler = &proc_dointvec_secure,
93549+ },
93550+#endif
93551+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
93552+ {
93553+ .procname = "audit_group",
93554+ .data = &grsec_enable_group,
93555+ .maxlen = sizeof(int),
93556+ .mode = 0600,
93557+ .proc_handler = &proc_dointvec_secure,
93558+ },
93559+ {
93560+ .procname = "audit_gid",
93561+ .data = &grsec_audit_gid,
93562+ .maxlen = sizeof(int),
93563+ .mode = 0600,
93564+ .proc_handler = &proc_dointvec_secure,
93565+ },
93566+#endif
93567+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
93568+ {
93569+ .procname = "audit_chdir",
93570+ .data = &grsec_enable_chdir,
93571+ .maxlen = sizeof(int),
93572+ .mode = 0600,
93573+ .proc_handler = &proc_dointvec_secure,
93574+ },
93575+#endif
93576+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
93577+ {
93578+ .procname = "audit_mount",
93579+ .data = &grsec_enable_mount,
93580+ .maxlen = sizeof(int),
93581+ .mode = 0600,
93582+ .proc_handler = &proc_dointvec_secure,
93583+ },
93584+#endif
93585+#ifdef CONFIG_GRKERNSEC_DMESG
93586+ {
93587+ .procname = "dmesg",
93588+ .data = &grsec_enable_dmesg,
93589+ .maxlen = sizeof(int),
93590+ .mode = 0600,
93591+ .proc_handler = &proc_dointvec_secure,
93592+ },
93593+#endif
93594+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93595+ {
93596+ .procname = "chroot_findtask",
93597+ .data = &grsec_enable_chroot_findtask,
93598+ .maxlen = sizeof(int),
93599+ .mode = 0600,
93600+ .proc_handler = &proc_dointvec_secure,
93601+ },
93602+#endif
93603+#ifdef CONFIG_GRKERNSEC_RESLOG
93604+ {
93605+ .procname = "resource_logging",
93606+ .data = &grsec_resource_logging,
93607+ .maxlen = sizeof(int),
93608+ .mode = 0600,
93609+ .proc_handler = &proc_dointvec_secure,
93610+ },
93611+#endif
93612+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
93613+ {
93614+ .procname = "audit_ptrace",
93615+ .data = &grsec_enable_audit_ptrace,
93616+ .maxlen = sizeof(int),
93617+ .mode = 0600,
93618+ .proc_handler = &proc_dointvec_secure,
93619+ },
93620+#endif
93621+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
93622+ {
93623+ .procname = "harden_ptrace",
93624+ .data = &grsec_enable_harden_ptrace,
93625+ .maxlen = sizeof(int),
93626+ .mode = 0600,
93627+ .proc_handler = &proc_dointvec_secure,
93628+ },
93629+#endif
93630+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
93631+ {
93632+ .procname = "harden_ipc",
93633+ .data = &grsec_enable_harden_ipc,
93634+ .maxlen = sizeof(int),
93635+ .mode = 0600,
93636+ .proc_handler = &proc_dointvec_secure,
93637+ },
93638+#endif
93639+ {
93640+ .procname = "grsec_lock",
93641+ .data = &grsec_lock,
93642+ .maxlen = sizeof(int),
93643+ .mode = 0600,
93644+ .proc_handler = &proc_dointvec_secure,
93645+ },
93646+#endif
93647+#ifdef CONFIG_GRKERNSEC_ROFS
93648+ {
93649+ .procname = "romount_protect",
93650+ .data = &grsec_enable_rofs,
93651+ .maxlen = sizeof(int),
93652+ .mode = 0600,
93653+ .proc_handler = &proc_dointvec_minmax_secure,
93654+ .extra1 = &one,
93655+ .extra2 = &one,
93656+ },
93657+#endif
93658+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
93659+ {
93660+ .procname = "deny_new_usb",
93661+ .data = &grsec_deny_new_usb,
93662+ .maxlen = sizeof(int),
93663+ .mode = 0600,
93664+ .proc_handler = &proc_dointvec_secure,
93665+ },
93666+#endif
93667+ { }
93668+};
93669+#endif
93670diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
93671new file mode 100644
93672index 0000000..61b514e
93673--- /dev/null
93674+++ b/grsecurity/grsec_time.c
93675@@ -0,0 +1,16 @@
93676+#include <linux/kernel.h>
93677+#include <linux/sched.h>
93678+#include <linux/grinternal.h>
93679+#include <linux/module.h>
93680+
93681+void
93682+gr_log_timechange(void)
93683+{
93684+#ifdef CONFIG_GRKERNSEC_TIME
93685+ if (grsec_enable_time)
93686+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
93687+#endif
93688+ return;
93689+}
93690+
93691+EXPORT_SYMBOL_GPL(gr_log_timechange);
93692diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
93693new file mode 100644
93694index 0000000..9786671
93695--- /dev/null
93696+++ b/grsecurity/grsec_tpe.c
93697@@ -0,0 +1,78 @@
93698+#include <linux/kernel.h>
93699+#include <linux/sched.h>
93700+#include <linux/file.h>
93701+#include <linux/fs.h>
93702+#include <linux/grinternal.h>
93703+
93704+extern int gr_acl_tpe_check(void);
93705+
93706+int
93707+gr_tpe_allow(const struct file *file)
93708+{
93709+#ifdef CONFIG_GRKERNSEC
93710+ struct inode *inode = d_backing_inode(file->f_path.dentry->d_parent);
93711+ struct inode *file_inode = d_backing_inode(file->f_path.dentry);
93712+ const struct cred *cred = current_cred();
93713+ char *msg = NULL;
93714+ char *msg2 = NULL;
93715+
93716+ // never restrict root
93717+ if (gr_is_global_root(cred->uid))
93718+ return 1;
93719+
93720+ if (grsec_enable_tpe) {
93721+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93722+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
93723+ msg = "not being in trusted group";
93724+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
93725+ msg = "being in untrusted group";
93726+#else
93727+ if (in_group_p(grsec_tpe_gid))
93728+ msg = "being in untrusted group";
93729+#endif
93730+ }
93731+ if (!msg && gr_acl_tpe_check())
93732+ msg = "being in untrusted role";
93733+
93734+ // not in any affected group/role
93735+ if (!msg)
93736+ goto next_check;
93737+
93738+ if (gr_is_global_nonroot(inode->i_uid))
93739+ msg2 = "file in non-root-owned directory";
93740+ else if (inode->i_mode & S_IWOTH)
93741+ msg2 = "file in world-writable directory";
93742+ else if (inode->i_mode & S_IWGRP)
93743+ msg2 = "file in group-writable directory";
93744+ else if (file_inode->i_mode & S_IWOTH)
93745+ msg2 = "file is world-writable";
93746+
93747+ if (msg && msg2) {
93748+ char fullmsg[70] = {0};
93749+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
93750+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
93751+ return 0;
93752+ }
93753+ msg = NULL;
93754+next_check:
93755+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93756+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
93757+ return 1;
93758+
93759+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
93760+ msg = "directory not owned by user";
93761+ else if (inode->i_mode & S_IWOTH)
93762+ msg = "file in world-writable directory";
93763+ else if (inode->i_mode & S_IWGRP)
93764+ msg = "file in group-writable directory";
93765+ else if (file_inode->i_mode & S_IWOTH)
93766+ msg = "file is world-writable";
93767+
93768+ if (msg) {
93769+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
93770+ return 0;
93771+ }
93772+#endif
93773+#endif
93774+ return 1;
93775+}
93776diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
93777new file mode 100644
93778index 0000000..ae02d8e
93779--- /dev/null
93780+++ b/grsecurity/grsec_usb.c
93781@@ -0,0 +1,15 @@
93782+#include <linux/kernel.h>
93783+#include <linux/grinternal.h>
93784+#include <linux/module.h>
93785+
93786+int gr_handle_new_usb(void)
93787+{
93788+#ifdef CONFIG_GRKERNSEC_DENYUSB
93789+ if (grsec_deny_new_usb) {
93790+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
93791+ return 1;
93792+ }
93793+#endif
93794+ return 0;
93795+}
93796+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
93797diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
93798new file mode 100644
93799index 0000000..158b330
93800--- /dev/null
93801+++ b/grsecurity/grsum.c
93802@@ -0,0 +1,64 @@
93803+#include <linux/err.h>
93804+#include <linux/kernel.h>
93805+#include <linux/sched.h>
93806+#include <linux/mm.h>
93807+#include <linux/scatterlist.h>
93808+#include <linux/crypto.h>
93809+#include <linux/gracl.h>
93810+
93811+
93812+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
93813+#error "crypto and sha256 must be built into the kernel"
93814+#endif
93815+
93816+int
93817+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
93818+{
93819+ struct crypto_hash *tfm;
93820+ struct hash_desc desc;
93821+ struct scatterlist sg[2];
93822+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
93823+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
93824+ unsigned long *sumptr = (unsigned long *)sum;
93825+ int cryptres;
93826+ int retval = 1;
93827+ volatile int mismatched = 0;
93828+ volatile int dummy = 0;
93829+ unsigned int i;
93830+
93831+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
93832+ if (IS_ERR(tfm)) {
93833+ /* should never happen, since sha256 should be built in */
93834+ memset(entry->pw, 0, GR_PW_LEN);
93835+ return 1;
93836+ }
93837+
93838+ sg_init_table(sg, 2);
93839+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
93840+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
93841+
93842+ desc.tfm = tfm;
93843+ desc.flags = 0;
93844+
93845+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
93846+ temp_sum);
93847+
93848+ memset(entry->pw, 0, GR_PW_LEN);
93849+
93850+ if (cryptres)
93851+ goto out;
93852+
93853+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
93854+ if (sumptr[i] != tmpsumptr[i])
93855+ mismatched = 1;
93856+ else
93857+ dummy = 1; // waste a cycle
93858+
93859+ if (!mismatched)
93860+ retval = dummy - 1;
93861+
93862+out:
93863+ crypto_free_hash(tfm);
93864+
93865+ return retval;
93866+}
93867diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
93868index 5bdab6b..9ae82fe 100644
93869--- a/include/asm-generic/4level-fixup.h
93870+++ b/include/asm-generic/4level-fixup.h
93871@@ -14,8 +14,10 @@
93872 #define pmd_alloc(mm, pud, address) \
93873 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
93874 NULL: pmd_offset(pud, address))
93875+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
93876
93877 #define pud_alloc(mm, pgd, address) (pgd)
93878+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
93879 #define pud_offset(pgd, start) (pgd)
93880 #define pud_none(pud) 0
93881 #define pud_bad(pud) 0
93882diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
93883index b7babf0..1e4b4f1 100644
93884--- a/include/asm-generic/atomic-long.h
93885+++ b/include/asm-generic/atomic-long.h
93886@@ -22,6 +22,12 @@
93887
93888 typedef atomic64_t atomic_long_t;
93889
93890+#ifdef CONFIG_PAX_REFCOUNT
93891+typedef atomic64_unchecked_t atomic_long_unchecked_t;
93892+#else
93893+typedef atomic64_t atomic_long_unchecked_t;
93894+#endif
93895+
93896 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
93897
93898 static inline long atomic_long_read(atomic_long_t *l)
93899@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93900 return (long)atomic64_read(v);
93901 }
93902
93903+#ifdef CONFIG_PAX_REFCOUNT
93904+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93905+{
93906+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93907+
93908+ return (long)atomic64_read_unchecked(v);
93909+}
93910+#endif
93911+
93912 static inline void atomic_long_set(atomic_long_t *l, long i)
93913 {
93914 atomic64_t *v = (atomic64_t *)l;
93915@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93916 atomic64_set(v, i);
93917 }
93918
93919+#ifdef CONFIG_PAX_REFCOUNT
93920+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93921+{
93922+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93923+
93924+ atomic64_set_unchecked(v, i);
93925+}
93926+#endif
93927+
93928 static inline void atomic_long_inc(atomic_long_t *l)
93929 {
93930 atomic64_t *v = (atomic64_t *)l;
93931@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93932 atomic64_inc(v);
93933 }
93934
93935+#ifdef CONFIG_PAX_REFCOUNT
93936+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93937+{
93938+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93939+
93940+ atomic64_inc_unchecked(v);
93941+}
93942+#endif
93943+
93944 static inline void atomic_long_dec(atomic_long_t *l)
93945 {
93946 atomic64_t *v = (atomic64_t *)l;
93947@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93948 atomic64_dec(v);
93949 }
93950
93951+#ifdef CONFIG_PAX_REFCOUNT
93952+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93953+{
93954+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93955+
93956+ atomic64_dec_unchecked(v);
93957+}
93958+#endif
93959+
93960 static inline void atomic_long_add(long i, atomic_long_t *l)
93961 {
93962 atomic64_t *v = (atomic64_t *)l;
93963@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93964 atomic64_add(i, v);
93965 }
93966
93967+#ifdef CONFIG_PAX_REFCOUNT
93968+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93969+{
93970+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93971+
93972+ atomic64_add_unchecked(i, v);
93973+}
93974+#endif
93975+
93976 static inline void atomic_long_sub(long i, atomic_long_t *l)
93977 {
93978 atomic64_t *v = (atomic64_t *)l;
93979@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93980 atomic64_sub(i, v);
93981 }
93982
93983+#ifdef CONFIG_PAX_REFCOUNT
93984+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93985+{
93986+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93987+
93988+ atomic64_sub_unchecked(i, v);
93989+}
93990+#endif
93991+
93992 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93993 {
93994 atomic64_t *v = (atomic64_t *)l;
93995@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93996 return atomic64_add_negative(i, v);
93997 }
93998
93999-static inline long atomic_long_add_return(long i, atomic_long_t *l)
94000+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
94001 {
94002 atomic64_t *v = (atomic64_t *)l;
94003
94004 return (long)atomic64_add_return(i, v);
94005 }
94006
94007+#ifdef CONFIG_PAX_REFCOUNT
94008+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
94009+{
94010+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
94011+
94012+ return (long)atomic64_add_return_unchecked(i, v);
94013+}
94014+#endif
94015+
94016 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
94017 {
94018 atomic64_t *v = (atomic64_t *)l;
94019@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
94020 return (long)atomic64_inc_return(v);
94021 }
94022
94023+#ifdef CONFIG_PAX_REFCOUNT
94024+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
94025+{
94026+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
94027+
94028+ return (long)atomic64_inc_return_unchecked(v);
94029+}
94030+#endif
94031+
94032 static inline long atomic_long_dec_return(atomic_long_t *l)
94033 {
94034 atomic64_t *v = (atomic64_t *)l;
94035@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
94036
94037 typedef atomic_t atomic_long_t;
94038
94039+#ifdef CONFIG_PAX_REFCOUNT
94040+typedef atomic_unchecked_t atomic_long_unchecked_t;
94041+#else
94042+typedef atomic_t atomic_long_unchecked_t;
94043+#endif
94044+
94045 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
94046 static inline long atomic_long_read(atomic_long_t *l)
94047 {
94048@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
94049 return (long)atomic_read(v);
94050 }
94051
94052+#ifdef CONFIG_PAX_REFCOUNT
94053+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
94054+{
94055+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94056+
94057+ return (long)atomic_read_unchecked(v);
94058+}
94059+#endif
94060+
94061 static inline void atomic_long_set(atomic_long_t *l, long i)
94062 {
94063 atomic_t *v = (atomic_t *)l;
94064@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
94065 atomic_set(v, i);
94066 }
94067
94068+#ifdef CONFIG_PAX_REFCOUNT
94069+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
94070+{
94071+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94072+
94073+ atomic_set_unchecked(v, i);
94074+}
94075+#endif
94076+
94077 static inline void atomic_long_inc(atomic_long_t *l)
94078 {
94079 atomic_t *v = (atomic_t *)l;
94080@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
94081 atomic_inc(v);
94082 }
94083
94084+#ifdef CONFIG_PAX_REFCOUNT
94085+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
94086+{
94087+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94088+
94089+ atomic_inc_unchecked(v);
94090+}
94091+#endif
94092+
94093 static inline void atomic_long_dec(atomic_long_t *l)
94094 {
94095 atomic_t *v = (atomic_t *)l;
94096@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
94097 atomic_dec(v);
94098 }
94099
94100+#ifdef CONFIG_PAX_REFCOUNT
94101+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
94102+{
94103+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94104+
94105+ atomic_dec_unchecked(v);
94106+}
94107+#endif
94108+
94109 static inline void atomic_long_add(long i, atomic_long_t *l)
94110 {
94111 atomic_t *v = (atomic_t *)l;
94112@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
94113 atomic_add(i, v);
94114 }
94115
94116+#ifdef CONFIG_PAX_REFCOUNT
94117+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
94118+{
94119+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94120+
94121+ atomic_add_unchecked(i, v);
94122+}
94123+#endif
94124+
94125 static inline void atomic_long_sub(long i, atomic_long_t *l)
94126 {
94127 atomic_t *v = (atomic_t *)l;
94128@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
94129 atomic_sub(i, v);
94130 }
94131
94132+#ifdef CONFIG_PAX_REFCOUNT
94133+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
94134+{
94135+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94136+
94137+ atomic_sub_unchecked(i, v);
94138+}
94139+#endif
94140+
94141 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
94142 {
94143 atomic_t *v = (atomic_t *)l;
94144@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
94145 return atomic_add_negative(i, v);
94146 }
94147
94148-static inline long atomic_long_add_return(long i, atomic_long_t *l)
94149+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
94150 {
94151 atomic_t *v = (atomic_t *)l;
94152
94153 return (long)atomic_add_return(i, v);
94154 }
94155
94156+#ifdef CONFIG_PAX_REFCOUNT
94157+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
94158+{
94159+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94160+
94161+ return (long)atomic_add_return_unchecked(i, v);
94162+}
94163+
94164+#endif
94165+
94166 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
94167 {
94168 atomic_t *v = (atomic_t *)l;
94169@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
94170 return (long)atomic_inc_return(v);
94171 }
94172
94173+#ifdef CONFIG_PAX_REFCOUNT
94174+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
94175+{
94176+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94177+
94178+ return (long)atomic_inc_return_unchecked(v);
94179+}
94180+#endif
94181+
94182 static inline long atomic_long_dec_return(atomic_long_t *l)
94183 {
94184 atomic_t *v = (atomic_t *)l;
94185@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
94186
94187 #endif /* BITS_PER_LONG == 64 */
94188
94189+#ifdef CONFIG_PAX_REFCOUNT
94190+static inline void pax_refcount_needs_these_functions(void)
94191+{
94192+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
94193+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
94194+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
94195+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
94196+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
94197+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
94198+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
94199+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
94200+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
94201+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
94202+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
94203+#ifdef CONFIG_X86
94204+ atomic_clear_mask_unchecked(0, NULL);
94205+ atomic_set_mask_unchecked(0, NULL);
94206+#endif
94207+
94208+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
94209+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
94210+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
94211+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
94212+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
94213+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
94214+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
94215+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
94216+}
94217+#else
94218+#define atomic_read_unchecked(v) atomic_read(v)
94219+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
94220+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
94221+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
94222+#define atomic_inc_unchecked(v) atomic_inc(v)
94223+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
94224+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
94225+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
94226+#define atomic_dec_unchecked(v) atomic_dec(v)
94227+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
94228+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
94229+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
94230+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
94231+
94232+#define atomic_long_read_unchecked(v) atomic_long_read(v)
94233+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
94234+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
94235+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
94236+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
94237+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
94238+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
94239+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
94240+#endif
94241+
94242 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
94243diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
94244index 30ad9c8..c70c170 100644
94245--- a/include/asm-generic/atomic64.h
94246+++ b/include/asm-generic/atomic64.h
94247@@ -16,6 +16,8 @@ typedef struct {
94248 long long counter;
94249 } atomic64_t;
94250
94251+typedef atomic64_t atomic64_unchecked_t;
94252+
94253 #define ATOMIC64_INIT(i) { (i) }
94254
94255 extern long long atomic64_read(const atomic64_t *v);
94256@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
94257 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
94258 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
94259
94260+#define atomic64_read_unchecked(v) atomic64_read(v)
94261+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
94262+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
94263+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
94264+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
94265+#define atomic64_inc_unchecked(v) atomic64_inc(v)
94266+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
94267+#define atomic64_dec_unchecked(v) atomic64_dec(v)
94268+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
94269+
94270 #endif /* _ASM_GENERIC_ATOMIC64_H */
94271diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
94272index f5c40b0..e902f9d 100644
94273--- a/include/asm-generic/barrier.h
94274+++ b/include/asm-generic/barrier.h
94275@@ -82,7 +82,7 @@
94276 do { \
94277 compiletime_assert_atomic_type(*p); \
94278 smp_mb(); \
94279- ACCESS_ONCE(*p) = (v); \
94280+ ACCESS_ONCE_RW(*p) = (v); \
94281 } while (0)
94282
94283 #define smp_load_acquire(p) \
94284diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
94285index a60a7cc..0fe12f2 100644
94286--- a/include/asm-generic/bitops/__fls.h
94287+++ b/include/asm-generic/bitops/__fls.h
94288@@ -9,7 +9,7 @@
94289 *
94290 * Undefined if no set bit exists, so code should check against 0 first.
94291 */
94292-static __always_inline unsigned long __fls(unsigned long word)
94293+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
94294 {
94295 int num = BITS_PER_LONG - 1;
94296
94297diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
94298index 0576d1f..dad6c71 100644
94299--- a/include/asm-generic/bitops/fls.h
94300+++ b/include/asm-generic/bitops/fls.h
94301@@ -9,7 +9,7 @@
94302 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
94303 */
94304
94305-static __always_inline int fls(int x)
94306+static __always_inline int __intentional_overflow(-1) fls(int x)
94307 {
94308 int r = 32;
94309
94310diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
94311index b097cf8..3d40e14 100644
94312--- a/include/asm-generic/bitops/fls64.h
94313+++ b/include/asm-generic/bitops/fls64.h
94314@@ -15,7 +15,7 @@
94315 * at position 64.
94316 */
94317 #if BITS_PER_LONG == 32
94318-static __always_inline int fls64(__u64 x)
94319+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94320 {
94321 __u32 h = x >> 32;
94322 if (h)
94323@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
94324 return fls(x);
94325 }
94326 #elif BITS_PER_LONG == 64
94327-static __always_inline int fls64(__u64 x)
94328+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94329 {
94330 if (x == 0)
94331 return 0;
94332diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
94333index 630dd23..8c1dcb6b 100644
94334--- a/include/asm-generic/bug.h
94335+++ b/include/asm-generic/bug.h
94336@@ -62,13 +62,13 @@ struct bug_entry {
94337 * to provide better diagnostics.
94338 */
94339 #ifndef __WARN_TAINT
94340-extern __printf(3, 4)
94341+extern __printf(3, 4) __nocapture(1, 3, 4)
94342 void warn_slowpath_fmt(const char *file, const int line,
94343 const char *fmt, ...);
94344-extern __printf(4, 5)
94345+extern __printf(4, 5) __nocapture(1, 4, 5)
94346 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
94347 const char *fmt, ...);
94348-extern void warn_slowpath_null(const char *file, const int line);
94349+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
94350 #define WANT_WARN_ON_SLOWPATH
94351 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
94352 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
94353diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
94354index 1bfcfe5..e04c5c9 100644
94355--- a/include/asm-generic/cache.h
94356+++ b/include/asm-generic/cache.h
94357@@ -6,7 +6,7 @@
94358 * cache lines need to provide their own cache.h.
94359 */
94360
94361-#define L1_CACHE_SHIFT 5
94362-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
94363+#define L1_CACHE_SHIFT 5UL
94364+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
94365
94366 #endif /* __ASM_GENERIC_CACHE_H */
94367diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
94368index 0d68a1e..b74a761 100644
94369--- a/include/asm-generic/emergency-restart.h
94370+++ b/include/asm-generic/emergency-restart.h
94371@@ -1,7 +1,7 @@
94372 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
94373 #define _ASM_GENERIC_EMERGENCY_RESTART_H
94374
94375-static inline void machine_emergency_restart(void)
94376+static inline __noreturn void machine_emergency_restart(void)
94377 {
94378 machine_restart(NULL);
94379 }
94380diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
94381index 90f99c7..00ce236 100644
94382--- a/include/asm-generic/kmap_types.h
94383+++ b/include/asm-generic/kmap_types.h
94384@@ -2,9 +2,9 @@
94385 #define _ASM_GENERIC_KMAP_TYPES_H
94386
94387 #ifdef __WITH_KM_FENCE
94388-# define KM_TYPE_NR 41
94389+# define KM_TYPE_NR 42
94390 #else
94391-# define KM_TYPE_NR 20
94392+# define KM_TYPE_NR 21
94393 #endif
94394
94395 #endif
94396diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
94397index 9ceb03b..62b0b8f 100644
94398--- a/include/asm-generic/local.h
94399+++ b/include/asm-generic/local.h
94400@@ -23,24 +23,37 @@ typedef struct
94401 atomic_long_t a;
94402 } local_t;
94403
94404+typedef struct {
94405+ atomic_long_unchecked_t a;
94406+} local_unchecked_t;
94407+
94408 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
94409
94410 #define local_read(l) atomic_long_read(&(l)->a)
94411+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
94412 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
94413+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
94414 #define local_inc(l) atomic_long_inc(&(l)->a)
94415+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
94416 #define local_dec(l) atomic_long_dec(&(l)->a)
94417+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
94418 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
94419+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
94420 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
94421+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
94422
94423 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
94424 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
94425 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
94426 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
94427 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
94428+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
94429 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
94430 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
94431+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
94432
94433 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94434+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94435 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
94436 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
94437 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
94438diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
94439index 725612b..9cc513a 100644
94440--- a/include/asm-generic/pgtable-nopmd.h
94441+++ b/include/asm-generic/pgtable-nopmd.h
94442@@ -1,14 +1,19 @@
94443 #ifndef _PGTABLE_NOPMD_H
94444 #define _PGTABLE_NOPMD_H
94445
94446-#ifndef __ASSEMBLY__
94447-
94448 #include <asm-generic/pgtable-nopud.h>
94449
94450-struct mm_struct;
94451-
94452 #define __PAGETABLE_PMD_FOLDED
94453
94454+#define PMD_SHIFT PUD_SHIFT
94455+#define PTRS_PER_PMD 1
94456+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
94457+#define PMD_MASK (~(PMD_SIZE-1))
94458+
94459+#ifndef __ASSEMBLY__
94460+
94461+struct mm_struct;
94462+
94463 /*
94464 * Having the pmd type consist of a pud gets the size right, and allows
94465 * us to conceptually access the pud entry that this pmd is folded into
94466@@ -16,11 +21,6 @@ struct mm_struct;
94467 */
94468 typedef struct { pud_t pud; } pmd_t;
94469
94470-#define PMD_SHIFT PUD_SHIFT
94471-#define PTRS_PER_PMD 1
94472-#define PMD_SIZE (1UL << PMD_SHIFT)
94473-#define PMD_MASK (~(PMD_SIZE-1))
94474-
94475 /*
94476 * The "pud_xxx()" functions here are trivial for a folded two-level
94477 * setup: the pmd is never bad, and a pmd always exists (as it's folded
94478diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
94479index 810431d..0ec4804f 100644
94480--- a/include/asm-generic/pgtable-nopud.h
94481+++ b/include/asm-generic/pgtable-nopud.h
94482@@ -1,10 +1,15 @@
94483 #ifndef _PGTABLE_NOPUD_H
94484 #define _PGTABLE_NOPUD_H
94485
94486-#ifndef __ASSEMBLY__
94487-
94488 #define __PAGETABLE_PUD_FOLDED
94489
94490+#define PUD_SHIFT PGDIR_SHIFT
94491+#define PTRS_PER_PUD 1
94492+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
94493+#define PUD_MASK (~(PUD_SIZE-1))
94494+
94495+#ifndef __ASSEMBLY__
94496+
94497 /*
94498 * Having the pud type consist of a pgd gets the size right, and allows
94499 * us to conceptually access the pgd entry that this pud is folded into
94500@@ -12,11 +17,6 @@
94501 */
94502 typedef struct { pgd_t pgd; } pud_t;
94503
94504-#define PUD_SHIFT PGDIR_SHIFT
94505-#define PTRS_PER_PUD 1
94506-#define PUD_SIZE (1UL << PUD_SHIFT)
94507-#define PUD_MASK (~(PUD_SIZE-1))
94508-
94509 /*
94510 * The "pgd_xxx()" functions here are trivial for a folded two-level
94511 * setup: the pud is never bad, and a pud always exists (as it's folded
94512@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
94513 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
94514
94515 #define pgd_populate(mm, pgd, pud) do { } while (0)
94516+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
94517 /*
94518 * (puds are folded into pgds so this doesn't get actually called,
94519 * but the define is needed for a generic inline function.)
94520diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
94521index 39f1d6a..7dae6fb 100644
94522--- a/include/asm-generic/pgtable.h
94523+++ b/include/asm-generic/pgtable.h
94524@@ -695,6 +695,22 @@ static inline int pmd_protnone(pmd_t pmd)
94525 }
94526 #endif /* CONFIG_NUMA_BALANCING */
94527
94528+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
94529+#ifdef CONFIG_PAX_KERNEXEC
94530+#error KERNEXEC requires pax_open_kernel
94531+#else
94532+static inline unsigned long pax_open_kernel(void) { return 0; }
94533+#endif
94534+#endif
94535+
94536+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
94537+#ifdef CONFIG_PAX_KERNEXEC
94538+#error KERNEXEC requires pax_close_kernel
94539+#else
94540+static inline unsigned long pax_close_kernel(void) { return 0; }
94541+#endif
94542+#endif
94543+
94544 #endif /* CONFIG_MMU */
94545
94546 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
94547diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
94548index 72d8803..cb9749c 100644
94549--- a/include/asm-generic/uaccess.h
94550+++ b/include/asm-generic/uaccess.h
94551@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
94552 return __clear_user(to, n);
94553 }
94554
94555+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
94556+#ifdef CONFIG_PAX_MEMORY_UDEREF
94557+#error UDEREF requires pax_open_userland
94558+#else
94559+static inline unsigned long pax_open_userland(void) { return 0; }
94560+#endif
94561+#endif
94562+
94563+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
94564+#ifdef CONFIG_PAX_MEMORY_UDEREF
94565+#error UDEREF requires pax_close_userland
94566+#else
94567+static inline unsigned long pax_close_userland(void) { return 0; }
94568+#endif
94569+#endif
94570+
94571 #endif /* __ASM_GENERIC_UACCESS_H */
94572diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
94573index 8bd374d..9590e70 100644
94574--- a/include/asm-generic/vmlinux.lds.h
94575+++ b/include/asm-generic/vmlinux.lds.h
94576@@ -246,6 +246,7 @@
94577 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
94578 VMLINUX_SYMBOL(__start_rodata) = .; \
94579 *(.rodata) *(.rodata.*) \
94580+ *(.data..read_only) \
94581 *(__vermagic) /* Kernel version magic */ \
94582 . = ALIGN(8); \
94583 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
94584@@ -504,6 +505,7 @@
94585 KERNEL_CTORS() \
94586 MCOUNT_REC() \
94587 *(.init.rodata) \
94588+ *(.init.rodata.*) \
94589 FTRACE_EVENTS() \
94590 TRACE_SYSCALLS() \
94591 KPROBE_BLACKLIST() \
94592@@ -525,6 +527,8 @@
94593
94594 #define EXIT_DATA \
94595 *(.exit.data) \
94596+ *(.exit.rodata) \
94597+ *(.exit.rodata.*) \
94598 MEM_DISCARD(exit.data) \
94599 MEM_DISCARD(exit.rodata)
94600
94601@@ -741,17 +745,18 @@
94602 * section in the linker script will go there too. @phdr should have
94603 * a leading colon.
94604 *
94605- * Note that this macros defines __per_cpu_load as an absolute symbol.
94606+ * Note that this macros defines per_cpu_load as an absolute symbol.
94607 * If there is no need to put the percpu section at a predetermined
94608 * address, use PERCPU_SECTION.
94609 */
94610 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
94611- VMLINUX_SYMBOL(__per_cpu_load) = .; \
94612- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
94613+ per_cpu_load = .; \
94614+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
94615 - LOAD_OFFSET) { \
94616+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
94617 PERCPU_INPUT(cacheline) \
94618 } phdr \
94619- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
94620+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
94621
94622 /**
94623 * PERCPU_SECTION - define output section for percpu area, simple version
94624diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
94625index 0ecb768..f910132 100644
94626--- a/include/crypto/algapi.h
94627+++ b/include/crypto/algapi.h
94628@@ -34,7 +34,7 @@ struct crypto_type {
94629 unsigned int maskclear;
94630 unsigned int maskset;
94631 unsigned int tfmsize;
94632-};
94633+} __do_const;
94634
94635 struct crypto_instance {
94636 struct crypto_alg alg;
94637diff --git a/include/drm/drmP.h b/include/drm/drmP.h
94638index 62c40777..f980496 100644
94639--- a/include/drm/drmP.h
94640+++ b/include/drm/drmP.h
94641@@ -59,6 +59,7 @@
94642
94643 #include <asm/mman.h>
94644 #include <asm/pgalloc.h>
94645+#include <asm/local.h>
94646 #include <asm/uaccess.h>
94647
94648 #include <uapi/drm/drm.h>
94649@@ -137,17 +138,18 @@ void drm_err(const char *format, ...);
94650 /*@{*/
94651
94652 /* driver capabilities and requirements mask */
94653-#define DRIVER_USE_AGP 0x1
94654-#define DRIVER_PCI_DMA 0x8
94655-#define DRIVER_SG 0x10
94656-#define DRIVER_HAVE_DMA 0x20
94657-#define DRIVER_HAVE_IRQ 0x40
94658-#define DRIVER_IRQ_SHARED 0x80
94659-#define DRIVER_GEM 0x1000
94660-#define DRIVER_MODESET 0x2000
94661-#define DRIVER_PRIME 0x4000
94662-#define DRIVER_RENDER 0x8000
94663-#define DRIVER_ATOMIC 0x10000
94664+#define DRIVER_USE_AGP 0x1
94665+#define DRIVER_PCI_DMA 0x8
94666+#define DRIVER_SG 0x10
94667+#define DRIVER_HAVE_DMA 0x20
94668+#define DRIVER_HAVE_IRQ 0x40
94669+#define DRIVER_IRQ_SHARED 0x80
94670+#define DRIVER_GEM 0x1000
94671+#define DRIVER_MODESET 0x2000
94672+#define DRIVER_PRIME 0x4000
94673+#define DRIVER_RENDER 0x8000
94674+#define DRIVER_ATOMIC 0x10000
94675+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
94676
94677 /***********************************************************************/
94678 /** \name Macros to make printk easier */
94679@@ -233,10 +235,12 @@ void drm_err(const char *format, ...);
94680 * \param cmd command.
94681 * \param arg argument.
94682 */
94683-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
94684+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
94685+ struct drm_file *file_priv);
94686+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
94687 struct drm_file *file_priv);
94688
94689-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94690+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
94691 unsigned long arg);
94692
94693 #define DRM_IOCTL_NR(n) _IOC_NR(n)
94694@@ -252,9 +256,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94695 struct drm_ioctl_desc {
94696 unsigned int cmd;
94697 int flags;
94698- drm_ioctl_t *func;
94699+ drm_ioctl_t func;
94700 const char *name;
94701-};
94702+} __do_const;
94703
94704 /**
94705 * Creates a driver or general drm_ioctl_desc array entry for the given
94706@@ -645,7 +649,8 @@ struct drm_info_list {
94707 int (*show)(struct seq_file*, void*); /** show callback */
94708 u32 driver_features; /**< Required driver features for this entry */
94709 void *data;
94710-};
94711+} __do_const;
94712+typedef struct drm_info_list __no_const drm_info_list_no_const;
94713
94714 /**
94715 * debugfs node structure. This structure represents a debugfs file.
94716@@ -729,7 +734,7 @@ struct drm_device {
94717
94718 /** \name Usage Counters */
94719 /*@{ */
94720- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94721+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94722 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
94723 int buf_use; /**< Buffers in use -- cannot alloc */
94724 atomic_t buf_alloc; /**< Buffer allocation in progress */
94725diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
94726index c8fc187..079d4c2 100644
94727--- a/include/drm/drm_crtc_helper.h
94728+++ b/include/drm/drm_crtc_helper.h
94729@@ -161,7 +161,7 @@ struct drm_encoder_helper_funcs {
94730 int (*atomic_check)(struct drm_encoder *encoder,
94731 struct drm_crtc_state *crtc_state,
94732 struct drm_connector_state *conn_state);
94733-};
94734+} __no_const;
94735
94736 /**
94737 * struct drm_connector_helper_funcs - helper operations for connectors
94738diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
94739index 6133723..4c1fccb 100644
94740--- a/include/drm/i915_pciids.h
94741+++ b/include/drm/i915_pciids.h
94742@@ -37,7 +37,7 @@
94743 */
94744 #define INTEL_VGA_DEVICE(id, info) { \
94745 0x8086, id, \
94746- ~0, ~0, \
94747+ PCI_ANY_ID, PCI_ANY_ID, \
94748 0x030000, 0xff0000, \
94749 (unsigned long) info }
94750
94751diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
94752index 72dcbe8..8db58d7 100644
94753--- a/include/drm/ttm/ttm_memory.h
94754+++ b/include/drm/ttm/ttm_memory.h
94755@@ -48,7 +48,7 @@
94756
94757 struct ttm_mem_shrink {
94758 int (*do_shrink) (struct ttm_mem_shrink *);
94759-};
94760+} __no_const;
94761
94762 /**
94763 * struct ttm_mem_global - Global memory accounting structure.
94764diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
94765index 49a8284..9643967 100644
94766--- a/include/drm/ttm/ttm_page_alloc.h
94767+++ b/include/drm/ttm/ttm_page_alloc.h
94768@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
94769 */
94770 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
94771
94772+struct device;
94773 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94774 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94775
94776diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
94777index 4b840e8..155d235 100644
94778--- a/include/keys/asymmetric-subtype.h
94779+++ b/include/keys/asymmetric-subtype.h
94780@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
94781 /* Verify the signature on a key of this subtype (optional) */
94782 int (*verify_signature)(const struct key *key,
94783 const struct public_key_signature *sig);
94784-};
94785+} __do_const;
94786
94787 /**
94788 * asymmetric_key_subtype - Get the subtype from an asymmetric key
94789diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
94790index c1da539..1dcec55 100644
94791--- a/include/linux/atmdev.h
94792+++ b/include/linux/atmdev.h
94793@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
94794 #endif
94795
94796 struct k_atm_aal_stats {
94797-#define __HANDLE_ITEM(i) atomic_t i
94798+#define __HANDLE_ITEM(i) atomic_unchecked_t i
94799 __AAL_STAT_ITEMS
94800 #undef __HANDLE_ITEM
94801 };
94802@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
94803 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
94804 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
94805 struct module *owner;
94806-};
94807+} __do_const ;
94808
94809 struct atmphy_ops {
94810 int (*start)(struct atm_dev *dev);
94811diff --git a/include/linux/atomic.h b/include/linux/atomic.h
94812index 5b08a85..60922fb 100644
94813--- a/include/linux/atomic.h
94814+++ b/include/linux/atomic.h
94815@@ -12,7 +12,7 @@
94816 * Atomically adds @a to @v, so long as @v was not already @u.
94817 * Returns non-zero if @v was not @u, and zero otherwise.
94818 */
94819-static inline int atomic_add_unless(atomic_t *v, int a, int u)
94820+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
94821 {
94822 return __atomic_add_unless(v, a, u) != u;
94823 }
94824diff --git a/include/linux/audit.h b/include/linux/audit.h
94825index c2e7e3a..8bfc0e1 100644
94826--- a/include/linux/audit.h
94827+++ b/include/linux/audit.h
94828@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
94829 extern unsigned int audit_serial(void);
94830 extern int auditsc_get_stamp(struct audit_context *ctx,
94831 struct timespec *t, unsigned int *serial);
94832-extern int audit_set_loginuid(kuid_t loginuid);
94833+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
94834
94835 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
94836 {
94837diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
94838index 576e463..28fd926 100644
94839--- a/include/linux/binfmts.h
94840+++ b/include/linux/binfmts.h
94841@@ -44,7 +44,7 @@ struct linux_binprm {
94842 unsigned interp_flags;
94843 unsigned interp_data;
94844 unsigned long loader, exec;
94845-};
94846+} __randomize_layout;
94847
94848 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
94849 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
94850@@ -77,8 +77,10 @@ struct linux_binfmt {
94851 int (*load_binary)(struct linux_binprm *);
94852 int (*load_shlib)(struct file *);
94853 int (*core_dump)(struct coredump_params *cprm);
94854+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
94855+ void (*handle_mmap)(struct file *);
94856 unsigned long min_coredump; /* minimal dump size */
94857-};
94858+} __do_const __randomize_layout;
94859
94860 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
94861
94862diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
94863index ea17cca..dd56e56 100644
94864--- a/include/linux/bitmap.h
94865+++ b/include/linux/bitmap.h
94866@@ -295,7 +295,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
94867 return find_first_zero_bit(src, nbits) == nbits;
94868 }
94869
94870-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
94871+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
94872 {
94873 if (small_const_nbits(nbits))
94874 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
94875diff --git a/include/linux/bitops.h b/include/linux/bitops.h
94876index 297f5bd..0b6d1e8 100644
94877--- a/include/linux/bitops.h
94878+++ b/include/linux/bitops.h
94879@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
94880 * @word: value to rotate
94881 * @shift: bits to roll
94882 */
94883-static inline __u32 rol32(__u32 word, unsigned int shift)
94884+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
94885 {
94886 return (word << shift) | (word >> (32 - shift));
94887 }
94888@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
94889 * @word: value to rotate
94890 * @shift: bits to roll
94891 */
94892-static inline __u32 ror32(__u32 word, unsigned int shift)
94893+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
94894 {
94895 return (word >> shift) | (word << (32 - shift));
94896 }
94897@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
94898 return (__s32)(value << shift) >> shift;
94899 }
94900
94901-static inline unsigned fls_long(unsigned long l)
94902+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
94903 {
94904 if (sizeof(l) == 4)
94905 return fls(l);
94906diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
94907index 5d93a66..978c4a0 100644
94908--- a/include/linux/blkdev.h
94909+++ b/include/linux/blkdev.h
94910@@ -1614,7 +1614,7 @@ struct block_device_operations {
94911 /* this callback is with swap_lock and sometimes page table lock held */
94912 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
94913 struct module *owner;
94914-};
94915+} __do_const;
94916
94917 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
94918 unsigned long);
94919diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
94920index afc1343..9735539 100644
94921--- a/include/linux/blktrace_api.h
94922+++ b/include/linux/blktrace_api.h
94923@@ -25,7 +25,7 @@ struct blk_trace {
94924 struct dentry *dropped_file;
94925 struct dentry *msg_file;
94926 struct list_head running_list;
94927- atomic_t dropped;
94928+ atomic_unchecked_t dropped;
94929 };
94930
94931 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
94932diff --git a/include/linux/cache.h b/include/linux/cache.h
94933index 17e7e82..1d7da26 100644
94934--- a/include/linux/cache.h
94935+++ b/include/linux/cache.h
94936@@ -16,6 +16,14 @@
94937 #define __read_mostly
94938 #endif
94939
94940+#ifndef __read_only
94941+#ifdef CONFIG_PAX_KERNEXEC
94942+#error KERNEXEC requires __read_only
94943+#else
94944+#define __read_only __read_mostly
94945+#endif
94946+#endif
94947+
94948 #ifndef ____cacheline_aligned
94949 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
94950 #endif
94951diff --git a/include/linux/capability.h b/include/linux/capability.h
94952index af9f0b9..71a5e5c 100644
94953--- a/include/linux/capability.h
94954+++ b/include/linux/capability.h
94955@@ -237,15 +237,28 @@ static inline bool capable(int cap)
94956 {
94957 return true;
94958 }
94959+static inline bool capable_nolog(int cap)
94960+{
94961+ return true;
94962+}
94963 static inline bool ns_capable(struct user_namespace *ns, int cap)
94964 {
94965 return true;
94966 }
94967+static inline bool ns_capable_nolog(struct user_namespace *ns, int cap)
94968+{
94969+ return true;
94970+}
94971 #endif /* CONFIG_MULTIUSER */
94972 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
94973+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
94974 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
94975+extern bool capable_nolog(int cap);
94976+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
94977
94978 /* audit system wants to get cap info from files as well */
94979 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
94980
94981+extern int is_privileged_binary(const struct dentry *dentry);
94982+
94983 #endif /* !_LINUX_CAPABILITY_H */
94984diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
94985index 8609d57..86e4d79 100644
94986--- a/include/linux/cdrom.h
94987+++ b/include/linux/cdrom.h
94988@@ -87,7 +87,6 @@ struct cdrom_device_ops {
94989
94990 /* driver specifications */
94991 const int capability; /* capability flags */
94992- int n_minors; /* number of active minor devices */
94993 /* handle uniform packets for scsi type devices (scsi,atapi) */
94994 int (*generic_packet) (struct cdrom_device_info *,
94995 struct packet_command *);
94996diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
94997index bda5ec0b4..51d8ea1 100644
94998--- a/include/linux/cleancache.h
94999+++ b/include/linux/cleancache.h
95000@@ -35,7 +35,7 @@ struct cleancache_ops {
95001 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
95002 void (*invalidate_inode)(int, struct cleancache_filekey);
95003 void (*invalidate_fs)(int);
95004-};
95005+} __no_const;
95006
95007 extern int cleancache_register_ops(struct cleancache_ops *ops);
95008 extern void __cleancache_init_fs(struct super_block *);
95009diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
95010index df69531..0180e68 100644
95011--- a/include/linux/clk-provider.h
95012+++ b/include/linux/clk-provider.h
95013@@ -195,6 +195,7 @@ struct clk_ops {
95014 void (*init)(struct clk_hw *hw);
95015 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
95016 };
95017+typedef struct clk_ops __no_const clk_ops_no_const;
95018
95019 /**
95020 * struct clk_init_data - holds init data that's common to all clocks and is
95021@@ -209,7 +210,7 @@ struct clk_ops {
95022 struct clk_init_data {
95023 const char *name;
95024 const struct clk_ops *ops;
95025- const char **parent_names;
95026+ const char * const *parent_names;
95027 u8 num_parents;
95028 unsigned long flags;
95029 };
95030@@ -426,12 +427,12 @@ extern const struct clk_ops clk_mux_ops;
95031 extern const struct clk_ops clk_mux_ro_ops;
95032
95033 struct clk *clk_register_mux(struct device *dev, const char *name,
95034- const char **parent_names, u8 num_parents, unsigned long flags,
95035+ const char * const *parent_names, u8 num_parents, unsigned long flags,
95036 void __iomem *reg, u8 shift, u8 width,
95037 u8 clk_mux_flags, spinlock_t *lock);
95038
95039 struct clk *clk_register_mux_table(struct device *dev, const char *name,
95040- const char **parent_names, u8 num_parents, unsigned long flags,
95041+ const char * const *parent_names, u8 num_parents, unsigned long flags,
95042 void __iomem *reg, u8 shift, u32 mask,
95043 u8 clk_mux_flags, u32 *table, spinlock_t *lock);
95044
95045diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
95046index 94bad77..a39e810 100644
95047--- a/include/linux/clkdev.h
95048+++ b/include/linux/clkdev.h
95049@@ -32,7 +32,7 @@ struct clk_lookup {
95050 }
95051
95052 struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
95053- const char *dev_fmt, ...);
95054+ const char *dev_fmt, ...) __printf(3, 4);
95055
95056 void clkdev_add(struct clk_lookup *cl);
95057 void clkdev_drop(struct clk_lookup *cl);
95058@@ -40,7 +40,8 @@ void clkdev_drop(struct clk_lookup *cl);
95059 void clkdev_add_table(struct clk_lookup *, size_t);
95060 int clk_add_alias(const char *, const char *, char *, struct device *);
95061
95062-int clk_register_clkdev(struct clk *, const char *, const char *, ...);
95063+int clk_register_clkdev(struct clk *, const char *, const char *, ...)
95064+ __printf(3, 4);
95065 int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
95066
95067 #ifdef CONFIG_COMMON_CLK
95068diff --git a/include/linux/compat.h b/include/linux/compat.h
95069index ab25814..63b52db 100644
95070--- a/include/linux/compat.h
95071+++ b/include/linux/compat.h
95072@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
95073 compat_size_t __user *len_ptr);
95074
95075 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
95076-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
95077+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
95078 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
95079 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
95080 compat_ssize_t msgsz, int msgflg);
95081@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
95082 long compat_sys_msgctl(int first, int second, void __user *uptr);
95083 long compat_sys_shmctl(int first, int second, void __user *uptr);
95084 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
95085- unsigned nsems, const struct compat_timespec __user *timeout);
95086+ compat_long_t nsems, const struct compat_timespec __user *timeout);
95087 asmlinkage long compat_sys_keyctl(u32 option,
95088 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
95089 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
95090@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
95091
95092 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
95093
95094-extern int compat_printk(const char *fmt, ...);
95095+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
95096 extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
95097 extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);
95098
95099@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
95100 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
95101 compat_ulong_t addr, compat_ulong_t data);
95102 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
95103- compat_long_t addr, compat_long_t data);
95104+ compat_ulong_t addr, compat_ulong_t data);
95105
95106 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
95107 /*
95108diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
95109index 371e560..e2e4e3e 100644
95110--- a/include/linux/compiler-gcc.h
95111+++ b/include/linux/compiler-gcc.h
95112@@ -108,8 +108,8 @@
95113 */
95114 #define __pure __attribute__((pure))
95115 #define __aligned(x) __attribute__((aligned(x)))
95116-#define __printf(a, b) __attribute__((format(printf, a, b)))
95117-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
95118+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
95119+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
95120 #define noinline __attribute__((noinline))
95121 #define __attribute_const__ __attribute__((__const__))
95122 #define __maybe_unused __attribute__((unused))
95123diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
95124index 769e198..7ee7cb5 100644
95125--- a/include/linux/compiler-gcc4.h
95126+++ b/include/linux/compiler-gcc4.h
95127@@ -39,9 +39,38 @@
95128 # define __compiletime_warning(message) __attribute__((warning(message)))
95129 # define __compiletime_error(message) __attribute__((error(message)))
95130 #endif /* __CHECKER__ */
95131+
95132+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
95133+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
95134+#define __bos0(ptr) __bos((ptr), 0)
95135+#define __bos1(ptr) __bos((ptr), 1)
95136 #endif /* GCC_VERSION >= 40300 */
95137
95138 #if GCC_VERSION >= 40500
95139+
95140+#ifdef RANDSTRUCT_PLUGIN
95141+#define __randomize_layout __attribute__((randomize_layout))
95142+#define __no_randomize_layout __attribute__((no_randomize_layout))
95143+#endif
95144+
95145+#ifdef CONSTIFY_PLUGIN
95146+#define __no_const __attribute__((no_const))
95147+#define __do_const __attribute__((do_const))
95148+#endif
95149+
95150+#ifdef SIZE_OVERFLOW_PLUGIN
95151+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
95152+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
95153+#endif
95154+
95155+#ifdef LATENT_ENTROPY_PLUGIN
95156+#define __latent_entropy __attribute__((latent_entropy))
95157+#endif
95158+
95159+#ifdef INITIFY_PLUGIN
95160+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
95161+#endif
95162+
95163 /*
95164 * Mark a position in code as unreachable. This can be used to
95165 * suppress control flow warnings after asm blocks that transfer
95166diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
95167index efee493..8aa8f6b 100644
95168--- a/include/linux/compiler-gcc5.h
95169+++ b/include/linux/compiler-gcc5.h
95170@@ -28,6 +28,34 @@
95171 # define __compiletime_error(message) __attribute__((error(message)))
95172 #endif /* __CHECKER__ */
95173
95174+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
95175+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
95176+#define __bos0(ptr) __bos((ptr), 0)
95177+#define __bos1(ptr) __bos((ptr), 1)
95178+
95179+#ifdef RANDSTRUCT_PLUGIN
95180+#define __randomize_layout __attribute__((randomize_layout))
95181+#define __no_randomize_layout __attribute__((no_randomize_layout))
95182+#endif
95183+
95184+#ifdef CONSTIFY_PLUGIN
95185+#define __no_const __attribute__((no_const))
95186+#define __do_const __attribute__((do_const))
95187+#endif
95188+
95189+#ifdef SIZE_OVERFLOW_PLUGIN
95190+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
95191+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
95192+#endif
95193+
95194+#ifdef LATENT_ENTROPY_PLUGIN
95195+#define __latent_entropy __attribute__((latent_entropy))
95196+#endif
95197+
95198+#ifdef INITIFY_PLUGIN
95199+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
95200+#endif
95201+
95202 /*
95203 * Mark a position in code as unreachable. This can be used to
95204 * suppress control flow warnings after asm blocks that transfer
95205diff --git a/include/linux/compiler.h b/include/linux/compiler.h
95206index 8677225..2d49df1 100644
95207--- a/include/linux/compiler.h
95208+++ b/include/linux/compiler.h
95209@@ -5,11 +5,14 @@
95210
95211 #ifdef __CHECKER__
95212 # define __user __attribute__((noderef, address_space(1)))
95213+# define __force_user __force __user
95214 # define __kernel __attribute__((address_space(0)))
95215+# define __force_kernel __force __kernel
95216 # define __safe __attribute__((safe))
95217 # define __force __attribute__((force))
95218 # define __nocast __attribute__((nocast))
95219 # define __iomem __attribute__((noderef, address_space(2)))
95220+# define __force_iomem __force __iomem
95221 # define __must_hold(x) __attribute__((context(x,1,1)))
95222 # define __acquires(x) __attribute__((context(x,0,1)))
95223 # define __releases(x) __attribute__((context(x,1,0)))
95224@@ -17,20 +20,37 @@
95225 # define __release(x) __context__(x,-1)
95226 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
95227 # define __percpu __attribute__((noderef, address_space(3)))
95228+# define __force_percpu __force __percpu
95229 #ifdef CONFIG_SPARSE_RCU_POINTER
95230 # define __rcu __attribute__((noderef, address_space(4)))
95231+# define __force_rcu __force __rcu
95232 #else
95233 # define __rcu
95234+# define __force_rcu
95235 #endif
95236 extern void __chk_user_ptr(const volatile void __user *);
95237 extern void __chk_io_ptr(const volatile void __iomem *);
95238 #else
95239-# define __user
95240-# define __kernel
95241+# ifdef CHECKER_PLUGIN
95242+//# define __user
95243+//# define __force_user
95244+//# define __kernel
95245+//# define __force_kernel
95246+# else
95247+# ifdef STRUCTLEAK_PLUGIN
95248+# define __user __attribute__((user))
95249+# else
95250+# define __user
95251+# endif
95252+# define __force_user
95253+# define __kernel
95254+# define __force_kernel
95255+# endif
95256 # define __safe
95257 # define __force
95258 # define __nocast
95259 # define __iomem
95260+# define __force_iomem
95261 # define __chk_user_ptr(x) (void)0
95262 # define __chk_io_ptr(x) (void)0
95263 # define __builtin_warning(x, y...) (1)
95264@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
95265 # define __release(x) (void)0
95266 # define __cond_lock(x,c) (c)
95267 # define __percpu
95268+# define __force_percpu
95269 # define __rcu
95270+# define __force_rcu
95271 #endif
95272
95273 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
95274@@ -199,27 +221,27 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
95275 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
95276 {
95277 switch (size) {
95278- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
95279- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
95280- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
95281- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
95282+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
95283+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
95284+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
95285+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
95286 default:
95287 barrier();
95288- __builtin_memcpy((void *)res, (const void *)p, size);
95289+ __builtin_memcpy(res, (const void *)p, size);
95290 barrier();
95291 }
95292 }
95293
95294-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
95295+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
95296 {
95297 switch (size) {
95298- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
95299- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
95300- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
95301- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
95302+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
95303+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
95304+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
95305+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
95306 default:
95307 barrier();
95308- __builtin_memcpy((void *)p, (const void *)res, size);
95309+ __builtin_memcpy((void *)p, res, size);
95310 barrier();
95311 }
95312 }
95313@@ -352,6 +374,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95314 # define __attribute_const__ /* unimplemented */
95315 #endif
95316
95317+#ifndef __randomize_layout
95318+# define __randomize_layout
95319+#endif
95320+
95321+#ifndef __no_randomize_layout
95322+# define __no_randomize_layout
95323+#endif
95324+
95325+#ifndef __no_const
95326+# define __no_const
95327+#endif
95328+
95329+#ifndef __do_const
95330+# define __do_const
95331+#endif
95332+
95333+#ifndef __size_overflow
95334+# define __size_overflow(...)
95335+#endif
95336+
95337+#ifndef __intentional_overflow
95338+# define __intentional_overflow(...)
95339+#endif
95340+
95341+#ifndef __latent_entropy
95342+# define __latent_entropy
95343+#endif
95344+
95345+#ifndef __nocapture
95346+# define __nocapture(...)
95347+#endif
95348+
95349 /*
95350 * Tell gcc if a function is cold. The compiler will assume any path
95351 * directly leading to the call is unlikely.
95352@@ -361,6 +415,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95353 #define __cold
95354 #endif
95355
95356+#ifndef __alloc_size
95357+#define __alloc_size(...)
95358+#endif
95359+
95360+#ifndef __bos
95361+#define __bos(ptr, arg)
95362+#endif
95363+
95364+#ifndef __bos0
95365+#define __bos0(ptr)
95366+#endif
95367+
95368+#ifndef __bos1
95369+#define __bos1(ptr)
95370+#endif
95371+
95372 /* Simple shorthand for a section definition */
95373 #ifndef __section
95374 # define __section(S) __attribute__ ((__section__(#S)))
95375@@ -375,6 +445,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95376 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
95377 #endif
95378
95379+#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))
95380+
95381 /* Is this type a native word size -- useful for atomic operations */
95382 #ifndef __native_word
95383 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
95384@@ -454,8 +526,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95385 */
95386 #define __ACCESS_ONCE(x) ({ \
95387 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
95388- (volatile typeof(x) *)&(x); })
95389+ (volatile const typeof(x) *)&(x); })
95390 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
95391+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
95392
95393 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
95394 #ifdef CONFIG_KPROBES
95395diff --git a/include/linux/completion.h b/include/linux/completion.h
95396index 5d5aaae..0ea9b84 100644
95397--- a/include/linux/completion.h
95398+++ b/include/linux/completion.h
95399@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
95400
95401 extern void wait_for_completion(struct completion *);
95402 extern void wait_for_completion_io(struct completion *);
95403-extern int wait_for_completion_interruptible(struct completion *x);
95404-extern int wait_for_completion_killable(struct completion *x);
95405+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
95406+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
95407 extern unsigned long wait_for_completion_timeout(struct completion *x,
95408- unsigned long timeout);
95409+ unsigned long timeout) __intentional_overflow(-1);
95410 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
95411- unsigned long timeout);
95412+ unsigned long timeout) __intentional_overflow(-1);
95413 extern long wait_for_completion_interruptible_timeout(
95414- struct completion *x, unsigned long timeout);
95415+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95416 extern long wait_for_completion_killable_timeout(
95417- struct completion *x, unsigned long timeout);
95418+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95419 extern bool try_wait_for_completion(struct completion *x);
95420 extern bool completion_done(struct completion *x);
95421
95422diff --git a/include/linux/configfs.h b/include/linux/configfs.h
95423index 34025df..9c263df 100644
95424--- a/include/linux/configfs.h
95425+++ b/include/linux/configfs.h
95426@@ -64,7 +64,8 @@ struct config_item {
95427 struct dentry *ci_dentry;
95428 };
95429
95430-extern int config_item_set_name(struct config_item *, const char *, ...);
95431+extern __printf(2, 3)
95432+int config_item_set_name(struct config_item *, const char *, ...);
95433
95434 static inline char *config_item_name(struct config_item * item)
95435 {
95436@@ -125,7 +126,7 @@ struct configfs_attribute {
95437 const char *ca_name;
95438 struct module *ca_owner;
95439 umode_t ca_mode;
95440-};
95441+} __do_const;
95442
95443 /*
95444 * Users often need to create attribute structures for their configurable
95445diff --git a/include/linux/cpu.h b/include/linux/cpu.h
95446index c0fb6b1..23c30bd 100644
95447--- a/include/linux/cpu.h
95448+++ b/include/linux/cpu.h
95449@@ -40,9 +40,10 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
95450 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
95451 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
95452
95453-extern struct device *cpu_device_create(struct device *parent, void *drvdata,
95454- const struct attribute_group **groups,
95455- const char *fmt, ...);
95456+extern __printf(4, 5)
95457+struct device *cpu_device_create(struct device *parent, void *drvdata,
95458+ const struct attribute_group **groups,
95459+ const char *fmt, ...);
95460 #ifdef CONFIG_HOTPLUG_CPU
95461 extern void unregister_cpu(struct cpu *cpu);
95462 extern ssize_t arch_cpu_probe(const char *, size_t);
95463diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
95464index 2ee4888..0451f5e 100644
95465--- a/include/linux/cpufreq.h
95466+++ b/include/linux/cpufreq.h
95467@@ -207,6 +207,7 @@ struct global_attr {
95468 ssize_t (*store)(struct kobject *a, struct attribute *b,
95469 const char *c, size_t count);
95470 };
95471+typedef struct global_attr __no_const global_attr_no_const;
95472
95473 #define define_one_global_ro(_name) \
95474 static struct global_attr _name = \
95475@@ -278,7 +279,7 @@ struct cpufreq_driver {
95476 bool boost_supported;
95477 bool boost_enabled;
95478 int (*set_boost)(int state);
95479-};
95480+} __do_const;
95481
95482 /* flags */
95483 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
95484diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
95485index 9c5e892..feb34e0 100644
95486--- a/include/linux/cpuidle.h
95487+++ b/include/linux/cpuidle.h
95488@@ -59,7 +59,8 @@ struct cpuidle_state {
95489 void (*enter_freeze) (struct cpuidle_device *dev,
95490 struct cpuidle_driver *drv,
95491 int index);
95492-};
95493+} __do_const;
95494+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
95495
95496 /* Idle State Flags */
95497 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
95498@@ -227,7 +228,7 @@ struct cpuidle_governor {
95499 void (*reflect) (struct cpuidle_device *dev, int index);
95500
95501 struct module *owner;
95502-};
95503+} __do_const;
95504
95505 #ifdef CONFIG_CPU_IDLE
95506 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
95507diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
95508index 59915ea..81ebec0 100644
95509--- a/include/linux/cpumask.h
95510+++ b/include/linux/cpumask.h
95511@@ -127,17 +127,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95512 }
95513
95514 /* Valid inputs for n are -1 and 0. */
95515-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95516+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95517 {
95518 return n+1;
95519 }
95520
95521-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95522+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95523 {
95524 return n+1;
95525 }
95526
95527-static inline unsigned int cpumask_next_and(int n,
95528+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
95529 const struct cpumask *srcp,
95530 const struct cpumask *andp)
95531 {
95532@@ -181,7 +181,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95533 *
95534 * Returns >= nr_cpu_ids if no further cpus set.
95535 */
95536-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95537+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95538 {
95539 /* -1 is a legal arg here. */
95540 if (n != -1)
95541@@ -196,7 +196,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95542 *
95543 * Returns >= nr_cpu_ids if no further cpus unset.
95544 */
95545-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95546+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95547 {
95548 /* -1 is a legal arg here. */
95549 if (n != -1)
95550@@ -204,7 +204,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95551 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
95552 }
95553
95554-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
95555+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
95556 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
95557 unsigned int cpumask_local_spread(unsigned int i, int node);
95558
95559@@ -471,7 +471,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
95560 * cpumask_weight - Count of bits in *srcp
95561 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
95562 */
95563-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
95564+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
95565 {
95566 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
95567 }
95568diff --git a/include/linux/cred.h b/include/linux/cred.h
95569index 8b6c083..51cb9f5 100644
95570--- a/include/linux/cred.h
95571+++ b/include/linux/cred.h
95572@@ -35,7 +35,7 @@ struct group_info {
95573 int nblocks;
95574 kgid_t small_block[NGROUPS_SMALL];
95575 kgid_t *blocks[0];
95576-};
95577+} __randomize_layout;
95578
95579 /**
95580 * get_group_info - Get a reference to a group info structure
95581@@ -152,7 +152,7 @@ struct cred {
95582 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
95583 struct group_info *group_info; /* supplementary groups for euid/fsgid */
95584 struct rcu_head rcu; /* RCU deletion hook */
95585-};
95586+} __randomize_layout;
95587
95588 extern void __put_cred(struct cred *);
95589 extern void exit_creds(struct task_struct *);
95590@@ -210,6 +210,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
95591 static inline void validate_process_creds(void)
95592 {
95593 }
95594+static inline void validate_task_creds(struct task_struct *task)
95595+{
95596+}
95597 #endif
95598
95599 /**
95600@@ -347,6 +350,7 @@ static inline void put_cred(const struct cred *_cred)
95601
95602 #define task_uid(task) (task_cred_xxx((task), uid))
95603 #define task_euid(task) (task_cred_xxx((task), euid))
95604+#define task_securebits(task) (task_cred_xxx((task), securebits))
95605
95606 #define current_cred_xxx(xxx) \
95607 ({ \
95608diff --git a/include/linux/crypto.h b/include/linux/crypto.h
95609index 10df5d2..503d678 100644
95610--- a/include/linux/crypto.h
95611+++ b/include/linux/crypto.h
95612@@ -632,7 +632,7 @@ struct cipher_tfm {
95613 const u8 *key, unsigned int keylen);
95614 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95615 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95616-};
95617+} __no_const;
95618
95619 struct hash_tfm {
95620 int (*init)(struct hash_desc *desc);
95621@@ -653,13 +653,13 @@ struct compress_tfm {
95622 int (*cot_decompress)(struct crypto_tfm *tfm,
95623 const u8 *src, unsigned int slen,
95624 u8 *dst, unsigned int *dlen);
95625-};
95626+} __no_const;
95627
95628 struct rng_tfm {
95629 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
95630 unsigned int dlen);
95631 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
95632-};
95633+} __no_const;
95634
95635 #define crt_ablkcipher crt_u.ablkcipher
95636 #define crt_aead crt_u.aead
95637diff --git a/include/linux/ctype.h b/include/linux/ctype.h
95638index 653589e..4ef254a 100644
95639--- a/include/linux/ctype.h
95640+++ b/include/linux/ctype.h
95641@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
95642 * Fast implementation of tolower() for internal usage. Do not use in your
95643 * code.
95644 */
95645-static inline char _tolower(const char c)
95646+static inline unsigned char _tolower(const unsigned char c)
95647 {
95648 return c | 0x20;
95649 }
95650diff --git a/include/linux/dcache.h b/include/linux/dcache.h
95651index df334cb..e730faa 100644
95652--- a/include/linux/dcache.h
95653+++ b/include/linux/dcache.h
95654@@ -123,6 +123,9 @@ struct dentry {
95655 unsigned long d_time; /* used by d_revalidate */
95656 void *d_fsdata; /* fs-specific data */
95657
95658+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
95659+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
95660+#endif
95661 struct list_head d_lru; /* LRU list */
95662 struct list_head d_child; /* child of parent list */
95663 struct list_head d_subdirs; /* our children */
95664@@ -133,7 +136,7 @@ struct dentry {
95665 struct hlist_node d_alias; /* inode alias list */
95666 struct rcu_head d_rcu;
95667 } d_u;
95668-};
95669+} __randomize_layout;
95670
95671 /*
95672 * dentry->d_lock spinlock nesting subclasses:
95673@@ -319,13 +322,14 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
95674
95675 static inline unsigned d_count(const struct dentry *dentry)
95676 {
95677- return dentry->d_lockref.count;
95678+ return __lockref_read(&dentry->d_lockref);
95679 }
95680
95681 /*
95682 * helper function for dentry_operations.d_dname() members
95683 */
95684-extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95685+extern __printf(4, 5)
95686+char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95687 extern char *simple_dname(struct dentry *, char *, int);
95688
95689 extern char *__d_path(const struct path *, const struct path *, char *, int);
95690@@ -347,7 +351,7 @@ extern char *dentry_path(struct dentry *, char *, int);
95691 static inline struct dentry *dget_dlock(struct dentry *dentry)
95692 {
95693 if (dentry)
95694- dentry->d_lockref.count++;
95695+ __lockref_inc(&dentry->d_lockref);
95696 return dentry;
95697 }
95698
95699diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
95700index 7925bf0..d5143d2 100644
95701--- a/include/linux/decompress/mm.h
95702+++ b/include/linux/decompress/mm.h
95703@@ -77,7 +77,7 @@ static void free(void *where)
95704 * warnings when not needed (indeed large_malloc / large_free are not
95705 * needed by inflate */
95706
95707-#define malloc(a) kmalloc(a, GFP_KERNEL)
95708+#define malloc(a) kmalloc((a), GFP_KERNEL)
95709 #define free(a) kfree(a)
95710
95711 #define large_malloc(a) vmalloc(a)
95712diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
95713index ce447f0..83c66bd 100644
95714--- a/include/linux/devfreq.h
95715+++ b/include/linux/devfreq.h
95716@@ -114,7 +114,7 @@ struct devfreq_governor {
95717 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
95718 int (*event_handler)(struct devfreq *devfreq,
95719 unsigned int event, void *data);
95720-};
95721+} __do_const;
95722
95723 /**
95724 * struct devfreq - Device devfreq structure
95725diff --git a/include/linux/device.h b/include/linux/device.h
95726index 6558af9..48bce1a 100644
95727--- a/include/linux/device.h
95728+++ b/include/linux/device.h
95729@@ -312,7 +312,7 @@ struct subsys_interface {
95730 struct list_head node;
95731 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
95732 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
95733-};
95734+} __do_const;
95735
95736 int subsys_interface_register(struct subsys_interface *sif);
95737 void subsys_interface_unregister(struct subsys_interface *sif);
95738@@ -508,7 +508,7 @@ struct device_type {
95739 void (*release)(struct device *dev);
95740
95741 const struct dev_pm_ops *pm;
95742-};
95743+} __do_const;
95744
95745 /* interface for exporting device attributes */
95746 struct device_attribute {
95747@@ -518,11 +518,12 @@ struct device_attribute {
95748 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
95749 const char *buf, size_t count);
95750 };
95751+typedef struct device_attribute __no_const device_attribute_no_const;
95752
95753 struct dev_ext_attribute {
95754 struct device_attribute attr;
95755 void *var;
95756-};
95757+} __do_const;
95758
95759 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
95760 char *buf);
95761@@ -607,8 +608,9 @@ extern int devres_release_group(struct device *dev, void *id);
95762
95763 /* managed devm_k.alloc/kfree for device drivers */
95764 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
95765-extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95766- va_list ap);
95767+extern __printf(3, 0)
95768+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95769+ va_list ap);
95770 extern __printf(3, 4)
95771 char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
95772 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
95773@@ -980,12 +982,10 @@ extern int __must_check device_reprobe(struct device *dev);
95774 /*
95775 * Easy functions for dynamically creating devices on the fly
95776 */
95777-extern struct device *device_create_vargs(struct class *cls,
95778- struct device *parent,
95779- dev_t devt,
95780- void *drvdata,
95781- const char *fmt,
95782- va_list vargs);
95783+extern __printf(5, 0)
95784+struct device *device_create_vargs(struct class *cls, struct device *parent,
95785+ dev_t devt, void *drvdata,
95786+ const char *fmt, va_list vargs);
95787 extern __printf(5, 6)
95788 struct device *device_create(struct class *cls, struct device *parent,
95789 dev_t devt, void *drvdata,
95790diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
95791index ac07ff0..edff186 100644
95792--- a/include/linux/dma-mapping.h
95793+++ b/include/linux/dma-mapping.h
95794@@ -64,7 +64,7 @@ struct dma_map_ops {
95795 u64 (*get_required_mask)(struct device *dev);
95796 #endif
95797 int is_phys;
95798-};
95799+} __do_const;
95800
95801 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
95802
95803diff --git a/include/linux/efi.h b/include/linux/efi.h
95804index af5be03..d8a6ae2 100644
95805--- a/include/linux/efi.h
95806+++ b/include/linux/efi.h
95807@@ -1057,6 +1057,7 @@ struct efivar_operations {
95808 efi_set_variable_nonblocking_t *set_variable_nonblocking;
95809 efi_query_variable_store_t *query_variable_store;
95810 };
95811+typedef struct efivar_operations __no_const efivar_operations_no_const;
95812
95813 struct efivars {
95814 /*
95815diff --git a/include/linux/elf.h b/include/linux/elf.h
95816index 20fa8d8..3d0dd18 100644
95817--- a/include/linux/elf.h
95818+++ b/include/linux/elf.h
95819@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
95820 #define elf_note elf32_note
95821 #define elf_addr_t Elf32_Off
95822 #define Elf_Half Elf32_Half
95823+#define elf_dyn Elf32_Dyn
95824
95825 #else
95826
95827@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
95828 #define elf_note elf64_note
95829 #define elf_addr_t Elf64_Off
95830 #define Elf_Half Elf64_Half
95831+#define elf_dyn Elf64_Dyn
95832
95833 #endif
95834
95835diff --git a/include/linux/err.h b/include/linux/err.h
95836index a729120..6ede2c9 100644
95837--- a/include/linux/err.h
95838+++ b/include/linux/err.h
95839@@ -20,12 +20,12 @@
95840
95841 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
95842
95843-static inline void * __must_check ERR_PTR(long error)
95844+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
95845 {
95846 return (void *) error;
95847 }
95848
95849-static inline long __must_check PTR_ERR(__force const void *ptr)
95850+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
95851 {
95852 return (long) ptr;
95853 }
95854diff --git a/include/linux/extcon.h b/include/linux/extcon.h
95855index 36f49c4..a2a1f4c 100644
95856--- a/include/linux/extcon.h
95857+++ b/include/linux/extcon.h
95858@@ -135,7 +135,7 @@ struct extcon_dev {
95859 /* /sys/class/extcon/.../mutually_exclusive/... */
95860 struct attribute_group attr_g_muex;
95861 struct attribute **attrs_muex;
95862- struct device_attribute *d_attrs_muex;
95863+ device_attribute_no_const *d_attrs_muex;
95864 };
95865
95866 /**
95867diff --git a/include/linux/fb.h b/include/linux/fb.h
95868index 043f328..180ccbf 100644
95869--- a/include/linux/fb.h
95870+++ b/include/linux/fb.h
95871@@ -305,7 +305,8 @@ struct fb_ops {
95872 /* called at KDB enter and leave time to prepare the console */
95873 int (*fb_debug_enter)(struct fb_info *info);
95874 int (*fb_debug_leave)(struct fb_info *info);
95875-};
95876+} __do_const;
95877+typedef struct fb_ops __no_const fb_ops_no_const;
95878
95879 #ifdef CONFIG_FB_TILEBLITTING
95880 #define FB_TILE_CURSOR_NONE 0
95881diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
95882index 230f87b..1fd0485 100644
95883--- a/include/linux/fdtable.h
95884+++ b/include/linux/fdtable.h
95885@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
95886 void put_files_struct(struct files_struct *fs);
95887 void reset_files_struct(struct files_struct *);
95888 int unshare_files(struct files_struct **);
95889-struct files_struct *dup_fd(struct files_struct *, int *);
95890+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
95891 void do_close_on_exec(struct files_struct *);
95892 int iterate_fd(struct files_struct *, unsigned,
95893 int (*)(const void *, struct file *, unsigned),
95894diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
95895index 8293262..2b3b8bd 100644
95896--- a/include/linux/frontswap.h
95897+++ b/include/linux/frontswap.h
95898@@ -11,7 +11,7 @@ struct frontswap_ops {
95899 int (*load)(unsigned, pgoff_t, struct page *);
95900 void (*invalidate_page)(unsigned, pgoff_t);
95901 void (*invalidate_area)(unsigned);
95902-};
95903+} __no_const;
95904
95905 extern bool frontswap_enabled;
95906 extern struct frontswap_ops *
95907diff --git a/include/linux/fs.h b/include/linux/fs.h
95908index 571aab9..03a5b06 100644
95909--- a/include/linux/fs.h
95910+++ b/include/linux/fs.h
95911@@ -437,7 +437,7 @@ struct address_space {
95912 spinlock_t private_lock; /* for use by the address_space */
95913 struct list_head private_list; /* ditto */
95914 void *private_data; /* ditto */
95915-} __attribute__((aligned(sizeof(long))));
95916+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
95917 /*
95918 * On most architectures that alignment is already the case; but
95919 * must be enforced here for CRIS, to let the least significant bit
95920@@ -480,7 +480,7 @@ struct block_device {
95921 int bd_fsfreeze_count;
95922 /* Mutex for freeze */
95923 struct mutex bd_fsfreeze_mutex;
95924-};
95925+} __randomize_layout;
95926
95927 /*
95928 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
95929@@ -666,7 +666,7 @@ struct inode {
95930 #endif
95931
95932 void *i_private; /* fs or device private pointer */
95933-};
95934+} __randomize_layout;
95935
95936 static inline int inode_unhashed(struct inode *inode)
95937 {
95938@@ -861,7 +861,7 @@ struct file {
95939 struct list_head f_tfile_llink;
95940 #endif /* #ifdef CONFIG_EPOLL */
95941 struct address_space *f_mapping;
95942-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
95943+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
95944
95945 struct file_handle {
95946 __u32 handle_bytes;
95947@@ -990,7 +990,7 @@ struct file_lock {
95948 int state; /* state of grant or error if -ve */
95949 } afs;
95950 } fl_u;
95951-};
95952+} __randomize_layout;
95953
95954 struct file_lock_context {
95955 spinlock_t flc_lock;
95956@@ -1351,7 +1351,7 @@ struct super_block {
95957 * Indicates how deep in a filesystem stack this SB is
95958 */
95959 int s_stack_depth;
95960-};
95961+} __randomize_layout;
95962
95963 extern struct timespec current_fs_time(struct super_block *sb);
95964
95965@@ -1603,7 +1603,8 @@ struct file_operations {
95966 #ifndef CONFIG_MMU
95967 unsigned (*mmap_capabilities)(struct file *);
95968 #endif
95969-};
95970+} __do_const __randomize_layout;
95971+typedef struct file_operations __no_const file_operations_no_const;
95972
95973 struct inode_operations {
95974 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
95975@@ -2303,7 +2304,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
95976 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
95977 unsigned int count, const char *name,
95978 const struct file_operations *fops);
95979-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95980+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95981 unsigned int count, const char *name);
95982 extern void unregister_chrdev_region(dev_t, unsigned);
95983 extern void chrdev_show(struct seq_file *,off_t);
95984@@ -2989,4 +2990,14 @@ static inline bool dir_relax(struct inode *inode)
95985 return !IS_DEADDIR(inode);
95986 }
95987
95988+static inline bool is_sidechannel_device(const struct inode *inode)
95989+{
95990+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
95991+ umode_t mode = inode->i_mode;
95992+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
95993+#else
95994+ return false;
95995+#endif
95996+}
95997+
95998 #endif /* _LINUX_FS_H */
95999diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
96000index 0efc3e6..fd23610 100644
96001--- a/include/linux/fs_struct.h
96002+++ b/include/linux/fs_struct.h
96003@@ -6,13 +6,13 @@
96004 #include <linux/seqlock.h>
96005
96006 struct fs_struct {
96007- int users;
96008+ atomic_t users;
96009 spinlock_t lock;
96010 seqcount_t seq;
96011 int umask;
96012 int in_exec;
96013 struct path root, pwd;
96014-};
96015+} __randomize_layout;
96016
96017 extern struct kmem_cache *fs_cachep;
96018
96019diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
96020index 7714849..a4a5c7a 100644
96021--- a/include/linux/fscache-cache.h
96022+++ b/include/linux/fscache-cache.h
96023@@ -113,7 +113,7 @@ struct fscache_operation {
96024 fscache_operation_release_t release;
96025 };
96026
96027-extern atomic_t fscache_op_debug_id;
96028+extern atomic_unchecked_t fscache_op_debug_id;
96029 extern void fscache_op_work_func(struct work_struct *work);
96030
96031 extern void fscache_enqueue_operation(struct fscache_operation *);
96032@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
96033 INIT_WORK(&op->work, fscache_op_work_func);
96034 atomic_set(&op->usage, 1);
96035 op->state = FSCACHE_OP_ST_INITIALISED;
96036- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
96037+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
96038 op->processor = processor;
96039 op->release = release;
96040 INIT_LIST_HEAD(&op->pend_link);
96041diff --git a/include/linux/fscache.h b/include/linux/fscache.h
96042index 115bb81..e7b812b 100644
96043--- a/include/linux/fscache.h
96044+++ b/include/linux/fscache.h
96045@@ -152,7 +152,7 @@ struct fscache_cookie_def {
96046 * - this is mandatory for any object that may have data
96047 */
96048 void (*now_uncached)(void *cookie_netfs_data);
96049-};
96050+} __do_const;
96051
96052 /*
96053 * fscache cached network filesystem type
96054diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
96055index 7ee1774..72505b8 100644
96056--- a/include/linux/fsnotify.h
96057+++ b/include/linux/fsnotify.h
96058@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
96059 struct inode *inode = file_inode(file);
96060 __u32 mask = FS_ACCESS;
96061
96062+ if (is_sidechannel_device(inode))
96063+ return;
96064+
96065 if (S_ISDIR(inode->i_mode))
96066 mask |= FS_ISDIR;
96067
96068@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
96069 struct inode *inode = file_inode(file);
96070 __u32 mask = FS_MODIFY;
96071
96072+ if (is_sidechannel_device(inode))
96073+ return;
96074+
96075 if (S_ISDIR(inode->i_mode))
96076 mask |= FS_ISDIR;
96077
96078@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
96079 */
96080 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
96081 {
96082- return kstrdup(name, GFP_KERNEL);
96083+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
96084 }
96085
96086 /*
96087diff --git a/include/linux/genhd.h b/include/linux/genhd.h
96088index ec274e0..e678159 100644
96089--- a/include/linux/genhd.h
96090+++ b/include/linux/genhd.h
96091@@ -194,7 +194,7 @@ struct gendisk {
96092 struct kobject *slave_dir;
96093
96094 struct timer_rand_state *random;
96095- atomic_t sync_io; /* RAID */
96096+ atomic_unchecked_t sync_io; /* RAID */
96097 struct disk_events *ev;
96098 #ifdef CONFIG_BLK_DEV_INTEGRITY
96099 struct blk_integrity *integrity;
96100@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
96101 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
96102
96103 /* drivers/char/random.c */
96104-extern void add_disk_randomness(struct gendisk *disk);
96105+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
96106 extern void rand_initialize_disk(struct gendisk *disk);
96107
96108 static inline sector_t get_start_sect(struct block_device *bdev)
96109diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
96110index 667c311..abac2a7 100644
96111--- a/include/linux/genl_magic_func.h
96112+++ b/include/linux/genl_magic_func.h
96113@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
96114 },
96115
96116 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
96117-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
96118+static struct genl_ops ZZZ_genl_ops[] = {
96119 #include GENL_MAGIC_INCLUDE_FILE
96120 };
96121
96122diff --git a/include/linux/gfp.h b/include/linux/gfp.h
96123index 15928f0..90b31d7 100644
96124--- a/include/linux/gfp.h
96125+++ b/include/linux/gfp.h
96126@@ -35,6 +35,13 @@ struct vm_area_struct;
96127 #define ___GFP_NO_KSWAPD 0x400000u
96128 #define ___GFP_OTHER_NODE 0x800000u
96129 #define ___GFP_WRITE 0x1000000u
96130+
96131+#ifdef CONFIG_PAX_USERCOPY_SLABS
96132+#define ___GFP_USERCOPY 0x2000000u
96133+#else
96134+#define ___GFP_USERCOPY 0
96135+#endif
96136+
96137 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
96138
96139 /*
96140@@ -94,6 +101,7 @@ struct vm_area_struct;
96141 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
96142 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
96143 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
96144+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
96145
96146 /*
96147 * This may seem redundant, but it's a way of annotating false positives vs.
96148@@ -101,7 +109,7 @@ struct vm_area_struct;
96149 */
96150 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
96151
96152-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
96153+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
96154 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
96155
96156 /* This equals 0, but use constants in case they ever change */
96157@@ -146,6 +154,8 @@ struct vm_area_struct;
96158 /* 4GB DMA on some platforms */
96159 #define GFP_DMA32 __GFP_DMA32
96160
96161+#define GFP_USERCOPY __GFP_USERCOPY
96162+
96163 /* Convert GFP flags to their corresponding migrate type */
96164 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
96165 {
96166diff --git a/include/linux/gracl.h b/include/linux/gracl.h
96167new file mode 100644
96168index 0000000..91858e4
96169--- /dev/null
96170+++ b/include/linux/gracl.h
96171@@ -0,0 +1,342 @@
96172+#ifndef GR_ACL_H
96173+#define GR_ACL_H
96174+
96175+#include <linux/grdefs.h>
96176+#include <linux/resource.h>
96177+#include <linux/capability.h>
96178+#include <linux/dcache.h>
96179+#include <asm/resource.h>
96180+
96181+/* Major status information */
96182+
96183+#define GR_VERSION "grsecurity 3.1"
96184+#define GRSECURITY_VERSION 0x3100
96185+
96186+enum {
96187+ GR_SHUTDOWN = 0,
96188+ GR_ENABLE = 1,
96189+ GR_SPROLE = 2,
96190+ GR_OLDRELOAD = 3,
96191+ GR_SEGVMOD = 4,
96192+ GR_STATUS = 5,
96193+ GR_UNSPROLE = 6,
96194+ GR_PASSSET = 7,
96195+ GR_SPROLEPAM = 8,
96196+ GR_RELOAD = 9,
96197+};
96198+
96199+/* Password setup definitions
96200+ * kernel/grhash.c */
96201+enum {
96202+ GR_PW_LEN = 128,
96203+ GR_SALT_LEN = 16,
96204+ GR_SHA_LEN = 32,
96205+};
96206+
96207+enum {
96208+ GR_SPROLE_LEN = 64,
96209+};
96210+
96211+enum {
96212+ GR_NO_GLOB = 0,
96213+ GR_REG_GLOB,
96214+ GR_CREATE_GLOB
96215+};
96216+
96217+#define GR_NLIMITS 32
96218+
96219+/* Begin Data Structures */
96220+
96221+struct sprole_pw {
96222+ unsigned char *rolename;
96223+ unsigned char salt[GR_SALT_LEN];
96224+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
96225+};
96226+
96227+struct name_entry {
96228+ __u32 key;
96229+ u64 inode;
96230+ dev_t device;
96231+ char *name;
96232+ __u16 len;
96233+ __u8 deleted;
96234+ struct name_entry *prev;
96235+ struct name_entry *next;
96236+};
96237+
96238+struct inodev_entry {
96239+ struct name_entry *nentry;
96240+ struct inodev_entry *prev;
96241+ struct inodev_entry *next;
96242+};
96243+
96244+struct acl_role_db {
96245+ struct acl_role_label **r_hash;
96246+ __u32 r_size;
96247+};
96248+
96249+struct inodev_db {
96250+ struct inodev_entry **i_hash;
96251+ __u32 i_size;
96252+};
96253+
96254+struct name_db {
96255+ struct name_entry **n_hash;
96256+ __u32 n_size;
96257+};
96258+
96259+struct crash_uid {
96260+ uid_t uid;
96261+ unsigned long expires;
96262+};
96263+
96264+struct gr_hash_struct {
96265+ void **table;
96266+ void **nametable;
96267+ void *first;
96268+ __u32 table_size;
96269+ __u32 used_size;
96270+ int type;
96271+};
96272+
96273+/* Userspace Grsecurity ACL data structures */
96274+
96275+struct acl_subject_label {
96276+ char *filename;
96277+ u64 inode;
96278+ dev_t device;
96279+ __u32 mode;
96280+ kernel_cap_t cap_mask;
96281+ kernel_cap_t cap_lower;
96282+ kernel_cap_t cap_invert_audit;
96283+
96284+ struct rlimit res[GR_NLIMITS];
96285+ __u32 resmask;
96286+
96287+ __u8 user_trans_type;
96288+ __u8 group_trans_type;
96289+ uid_t *user_transitions;
96290+ gid_t *group_transitions;
96291+ __u16 user_trans_num;
96292+ __u16 group_trans_num;
96293+
96294+ __u32 sock_families[2];
96295+ __u32 ip_proto[8];
96296+ __u32 ip_type;
96297+ struct acl_ip_label **ips;
96298+ __u32 ip_num;
96299+ __u32 inaddr_any_override;
96300+
96301+ __u32 crashes;
96302+ unsigned long expires;
96303+
96304+ struct acl_subject_label *parent_subject;
96305+ struct gr_hash_struct *hash;
96306+ struct acl_subject_label *prev;
96307+ struct acl_subject_label *next;
96308+
96309+ struct acl_object_label **obj_hash;
96310+ __u32 obj_hash_size;
96311+ __u16 pax_flags;
96312+};
96313+
96314+struct role_allowed_ip {
96315+ __u32 addr;
96316+ __u32 netmask;
96317+
96318+ struct role_allowed_ip *prev;
96319+ struct role_allowed_ip *next;
96320+};
96321+
96322+struct role_transition {
96323+ char *rolename;
96324+
96325+ struct role_transition *prev;
96326+ struct role_transition *next;
96327+};
96328+
96329+struct acl_role_label {
96330+ char *rolename;
96331+ uid_t uidgid;
96332+ __u16 roletype;
96333+
96334+ __u16 auth_attempts;
96335+ unsigned long expires;
96336+
96337+ struct acl_subject_label *root_label;
96338+ struct gr_hash_struct *hash;
96339+
96340+ struct acl_role_label *prev;
96341+ struct acl_role_label *next;
96342+
96343+ struct role_transition *transitions;
96344+ struct role_allowed_ip *allowed_ips;
96345+ uid_t *domain_children;
96346+ __u16 domain_child_num;
96347+
96348+ umode_t umask;
96349+
96350+ struct acl_subject_label **subj_hash;
96351+ __u32 subj_hash_size;
96352+};
96353+
96354+struct user_acl_role_db {
96355+ struct acl_role_label **r_table;
96356+ __u32 num_pointers; /* Number of allocations to track */
96357+ __u32 num_roles; /* Number of roles */
96358+ __u32 num_domain_children; /* Number of domain children */
96359+ __u32 num_subjects; /* Number of subjects */
96360+ __u32 num_objects; /* Number of objects */
96361+};
96362+
96363+struct acl_object_label {
96364+ char *filename;
96365+ u64 inode;
96366+ dev_t device;
96367+ __u32 mode;
96368+
96369+ struct acl_subject_label *nested;
96370+ struct acl_object_label *globbed;
96371+
96372+ /* next two structures not used */
96373+
96374+ struct acl_object_label *prev;
96375+ struct acl_object_label *next;
96376+};
96377+
96378+struct acl_ip_label {
96379+ char *iface;
96380+ __u32 addr;
96381+ __u32 netmask;
96382+ __u16 low, high;
96383+ __u8 mode;
96384+ __u32 type;
96385+ __u32 proto[8];
96386+
96387+ /* next two structures not used */
96388+
96389+ struct acl_ip_label *prev;
96390+ struct acl_ip_label *next;
96391+};
96392+
96393+struct gr_arg {
96394+ struct user_acl_role_db role_db;
96395+ unsigned char pw[GR_PW_LEN];
96396+ unsigned char salt[GR_SALT_LEN];
96397+ unsigned char sum[GR_SHA_LEN];
96398+ unsigned char sp_role[GR_SPROLE_LEN];
96399+ struct sprole_pw *sprole_pws;
96400+ dev_t segv_device;
96401+ u64 segv_inode;
96402+ uid_t segv_uid;
96403+ __u16 num_sprole_pws;
96404+ __u16 mode;
96405+};
96406+
96407+struct gr_arg_wrapper {
96408+ struct gr_arg *arg;
96409+ __u32 version;
96410+ __u32 size;
96411+};
96412+
96413+struct subject_map {
96414+ struct acl_subject_label *user;
96415+ struct acl_subject_label *kernel;
96416+ struct subject_map *prev;
96417+ struct subject_map *next;
96418+};
96419+
96420+struct acl_subj_map_db {
96421+ struct subject_map **s_hash;
96422+ __u32 s_size;
96423+};
96424+
96425+struct gr_policy_state {
96426+ struct sprole_pw **acl_special_roles;
96427+ __u16 num_sprole_pws;
96428+ struct acl_role_label *kernel_role;
96429+ struct acl_role_label *role_list;
96430+ struct acl_role_label *default_role;
96431+ struct acl_role_db acl_role_set;
96432+ struct acl_subj_map_db subj_map_set;
96433+ struct name_db name_set;
96434+ struct inodev_db inodev_set;
96435+};
96436+
96437+struct gr_alloc_state {
96438+ unsigned long alloc_stack_next;
96439+ unsigned long alloc_stack_size;
96440+ void **alloc_stack;
96441+};
96442+
96443+struct gr_reload_state {
96444+ struct gr_policy_state oldpolicy;
96445+ struct gr_alloc_state oldalloc;
96446+ struct gr_policy_state newpolicy;
96447+ struct gr_alloc_state newalloc;
96448+ struct gr_policy_state *oldpolicy_ptr;
96449+ struct gr_alloc_state *oldalloc_ptr;
96450+ unsigned char oldmode;
96451+};
96452+
96453+/* End Data Structures Section */
96454+
96455+/* Hash functions generated by empirical testing by Brad Spengler
96456+ Makes good use of the low bits of the inode. Generally 0-1 times
96457+ in loop for successful match. 0-3 for unsuccessful match.
96458+ Shift/add algorithm with modulus of table size and an XOR*/
96459+
96460+static __inline__ unsigned int
96461+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
96462+{
96463+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
96464+}
96465+
96466+ static __inline__ unsigned int
96467+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
96468+{
96469+ return ((const unsigned long)userp % sz);
96470+}
96471+
96472+static __inline__ unsigned int
96473+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
96474+{
96475+ unsigned int rem;
96476+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
96477+ return rem;
96478+}
96479+
96480+static __inline__ unsigned int
96481+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
96482+{
96483+ return full_name_hash((const unsigned char *)name, len) % sz;
96484+}
96485+
96486+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
96487+ subj = NULL; \
96488+ iter = 0; \
96489+ while (iter < role->subj_hash_size) { \
96490+ if (subj == NULL) \
96491+ subj = role->subj_hash[iter]; \
96492+ if (subj == NULL) { \
96493+ iter++; \
96494+ continue; \
96495+ }
96496+
96497+#define FOR_EACH_SUBJECT_END(subj,iter) \
96498+ subj = subj->next; \
96499+ if (subj == NULL) \
96500+ iter++; \
96501+ }
96502+
96503+
96504+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
96505+ subj = role->hash->first; \
96506+ while (subj != NULL) {
96507+
96508+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
96509+ subj = subj->next; \
96510+ }
96511+
96512+#endif
96513+
96514diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
96515new file mode 100644
96516index 0000000..af64092
96517--- /dev/null
96518+++ b/include/linux/gracl_compat.h
96519@@ -0,0 +1,156 @@
96520+#ifndef GR_ACL_COMPAT_H
96521+#define GR_ACL_COMPAT_H
96522+
96523+#include <linux/resource.h>
96524+#include <asm/resource.h>
96525+
96526+struct sprole_pw_compat {
96527+ compat_uptr_t rolename;
96528+ unsigned char salt[GR_SALT_LEN];
96529+ unsigned char sum[GR_SHA_LEN];
96530+};
96531+
96532+struct gr_hash_struct_compat {
96533+ compat_uptr_t table;
96534+ compat_uptr_t nametable;
96535+ compat_uptr_t first;
96536+ __u32 table_size;
96537+ __u32 used_size;
96538+ int type;
96539+};
96540+
96541+struct acl_subject_label_compat {
96542+ compat_uptr_t filename;
96543+ compat_u64 inode;
96544+ __u32 device;
96545+ __u32 mode;
96546+ kernel_cap_t cap_mask;
96547+ kernel_cap_t cap_lower;
96548+ kernel_cap_t cap_invert_audit;
96549+
96550+ struct compat_rlimit res[GR_NLIMITS];
96551+ __u32 resmask;
96552+
96553+ __u8 user_trans_type;
96554+ __u8 group_trans_type;
96555+ compat_uptr_t user_transitions;
96556+ compat_uptr_t group_transitions;
96557+ __u16 user_trans_num;
96558+ __u16 group_trans_num;
96559+
96560+ __u32 sock_families[2];
96561+ __u32 ip_proto[8];
96562+ __u32 ip_type;
96563+ compat_uptr_t ips;
96564+ __u32 ip_num;
96565+ __u32 inaddr_any_override;
96566+
96567+ __u32 crashes;
96568+ compat_ulong_t expires;
96569+
96570+ compat_uptr_t parent_subject;
96571+ compat_uptr_t hash;
96572+ compat_uptr_t prev;
96573+ compat_uptr_t next;
96574+
96575+ compat_uptr_t obj_hash;
96576+ __u32 obj_hash_size;
96577+ __u16 pax_flags;
96578+};
96579+
96580+struct role_allowed_ip_compat {
96581+ __u32 addr;
96582+ __u32 netmask;
96583+
96584+ compat_uptr_t prev;
96585+ compat_uptr_t next;
96586+};
96587+
96588+struct role_transition_compat {
96589+ compat_uptr_t rolename;
96590+
96591+ compat_uptr_t prev;
96592+ compat_uptr_t next;
96593+};
96594+
96595+struct acl_role_label_compat {
96596+ compat_uptr_t rolename;
96597+ uid_t uidgid;
96598+ __u16 roletype;
96599+
96600+ __u16 auth_attempts;
96601+ compat_ulong_t expires;
96602+
96603+ compat_uptr_t root_label;
96604+ compat_uptr_t hash;
96605+
96606+ compat_uptr_t prev;
96607+ compat_uptr_t next;
96608+
96609+ compat_uptr_t transitions;
96610+ compat_uptr_t allowed_ips;
96611+ compat_uptr_t domain_children;
96612+ __u16 domain_child_num;
96613+
96614+ umode_t umask;
96615+
96616+ compat_uptr_t subj_hash;
96617+ __u32 subj_hash_size;
96618+};
96619+
96620+struct user_acl_role_db_compat {
96621+ compat_uptr_t r_table;
96622+ __u32 num_pointers;
96623+ __u32 num_roles;
96624+ __u32 num_domain_children;
96625+ __u32 num_subjects;
96626+ __u32 num_objects;
96627+};
96628+
96629+struct acl_object_label_compat {
96630+ compat_uptr_t filename;
96631+ compat_u64 inode;
96632+ __u32 device;
96633+ __u32 mode;
96634+
96635+ compat_uptr_t nested;
96636+ compat_uptr_t globbed;
96637+
96638+ compat_uptr_t prev;
96639+ compat_uptr_t next;
96640+};
96641+
96642+struct acl_ip_label_compat {
96643+ compat_uptr_t iface;
96644+ __u32 addr;
96645+ __u32 netmask;
96646+ __u16 low, high;
96647+ __u8 mode;
96648+ __u32 type;
96649+ __u32 proto[8];
96650+
96651+ compat_uptr_t prev;
96652+ compat_uptr_t next;
96653+};
96654+
96655+struct gr_arg_compat {
96656+ struct user_acl_role_db_compat role_db;
96657+ unsigned char pw[GR_PW_LEN];
96658+ unsigned char salt[GR_SALT_LEN];
96659+ unsigned char sum[GR_SHA_LEN];
96660+ unsigned char sp_role[GR_SPROLE_LEN];
96661+ compat_uptr_t sprole_pws;
96662+ __u32 segv_device;
96663+ compat_u64 segv_inode;
96664+ uid_t segv_uid;
96665+ __u16 num_sprole_pws;
96666+ __u16 mode;
96667+};
96668+
96669+struct gr_arg_wrapper_compat {
96670+ compat_uptr_t arg;
96671+ __u32 version;
96672+ __u32 size;
96673+};
96674+
96675+#endif
96676diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
96677new file mode 100644
96678index 0000000..323ecf2
96679--- /dev/null
96680+++ b/include/linux/gralloc.h
96681@@ -0,0 +1,9 @@
96682+#ifndef __GRALLOC_H
96683+#define __GRALLOC_H
96684+
96685+void acl_free_all(void);
96686+int acl_alloc_stack_init(unsigned long size);
96687+void *acl_alloc(unsigned long len);
96688+void *acl_alloc_num(unsigned long num, unsigned long len);
96689+
96690+#endif
96691diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
96692new file mode 100644
96693index 0000000..be66033
96694--- /dev/null
96695+++ b/include/linux/grdefs.h
96696@@ -0,0 +1,140 @@
96697+#ifndef GRDEFS_H
96698+#define GRDEFS_H
96699+
96700+/* Begin grsecurity status declarations */
96701+
96702+enum {
96703+ GR_READY = 0x01,
96704+ GR_STATUS_INIT = 0x00 // disabled state
96705+};
96706+
96707+/* Begin ACL declarations */
96708+
96709+/* Role flags */
96710+
96711+enum {
96712+ GR_ROLE_USER = 0x0001,
96713+ GR_ROLE_GROUP = 0x0002,
96714+ GR_ROLE_DEFAULT = 0x0004,
96715+ GR_ROLE_SPECIAL = 0x0008,
96716+ GR_ROLE_AUTH = 0x0010,
96717+ GR_ROLE_NOPW = 0x0020,
96718+ GR_ROLE_GOD = 0x0040,
96719+ GR_ROLE_LEARN = 0x0080,
96720+ GR_ROLE_TPE = 0x0100,
96721+ GR_ROLE_DOMAIN = 0x0200,
96722+ GR_ROLE_PAM = 0x0400,
96723+ GR_ROLE_PERSIST = 0x0800
96724+};
96725+
96726+/* ACL Subject and Object mode flags */
96727+enum {
96728+ GR_DELETED = 0x80000000
96729+};
96730+
96731+/* ACL Object-only mode flags */
96732+enum {
96733+ GR_READ = 0x00000001,
96734+ GR_APPEND = 0x00000002,
96735+ GR_WRITE = 0x00000004,
96736+ GR_EXEC = 0x00000008,
96737+ GR_FIND = 0x00000010,
96738+ GR_INHERIT = 0x00000020,
96739+ GR_SETID = 0x00000040,
96740+ GR_CREATE = 0x00000080,
96741+ GR_DELETE = 0x00000100,
96742+ GR_LINK = 0x00000200,
96743+ GR_AUDIT_READ = 0x00000400,
96744+ GR_AUDIT_APPEND = 0x00000800,
96745+ GR_AUDIT_WRITE = 0x00001000,
96746+ GR_AUDIT_EXEC = 0x00002000,
96747+ GR_AUDIT_FIND = 0x00004000,
96748+ GR_AUDIT_INHERIT= 0x00008000,
96749+ GR_AUDIT_SETID = 0x00010000,
96750+ GR_AUDIT_CREATE = 0x00020000,
96751+ GR_AUDIT_DELETE = 0x00040000,
96752+ GR_AUDIT_LINK = 0x00080000,
96753+ GR_PTRACERD = 0x00100000,
96754+ GR_NOPTRACE = 0x00200000,
96755+ GR_SUPPRESS = 0x00400000,
96756+ GR_NOLEARN = 0x00800000,
96757+ GR_INIT_TRANSFER= 0x01000000
96758+};
96759+
96760+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
96761+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
96762+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
96763+
96764+/* ACL subject-only mode flags */
96765+enum {
96766+ GR_KILL = 0x00000001,
96767+ GR_VIEW = 0x00000002,
96768+ GR_PROTECTED = 0x00000004,
96769+ GR_LEARN = 0x00000008,
96770+ GR_OVERRIDE = 0x00000010,
96771+ /* just a placeholder, this mode is only used in userspace */
96772+ GR_DUMMY = 0x00000020,
96773+ GR_PROTSHM = 0x00000040,
96774+ GR_KILLPROC = 0x00000080,
96775+ GR_KILLIPPROC = 0x00000100,
96776+ /* just a placeholder, this mode is only used in userspace */
96777+ GR_NOTROJAN = 0x00000200,
96778+ GR_PROTPROCFD = 0x00000400,
96779+ GR_PROCACCT = 0x00000800,
96780+ GR_RELAXPTRACE = 0x00001000,
96781+ //GR_NESTED = 0x00002000,
96782+ GR_INHERITLEARN = 0x00004000,
96783+ GR_PROCFIND = 0x00008000,
96784+ GR_POVERRIDE = 0x00010000,
96785+ GR_KERNELAUTH = 0x00020000,
96786+ GR_ATSECURE = 0x00040000,
96787+ GR_SHMEXEC = 0x00080000
96788+};
96789+
96790+enum {
96791+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
96792+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
96793+ GR_PAX_ENABLE_MPROTECT = 0x0004,
96794+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
96795+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
96796+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
96797+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
96798+ GR_PAX_DISABLE_MPROTECT = 0x0400,
96799+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
96800+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
96801+};
96802+
96803+enum {
96804+ GR_ID_USER = 0x01,
96805+ GR_ID_GROUP = 0x02,
96806+};
96807+
96808+enum {
96809+ GR_ID_ALLOW = 0x01,
96810+ GR_ID_DENY = 0x02,
96811+};
96812+
96813+#define GR_CRASH_RES 31
96814+#define GR_UIDTABLE_MAX 500
96815+
96816+/* begin resource learning section */
96817+enum {
96818+ GR_RLIM_CPU_BUMP = 60,
96819+ GR_RLIM_FSIZE_BUMP = 50000,
96820+ GR_RLIM_DATA_BUMP = 10000,
96821+ GR_RLIM_STACK_BUMP = 1000,
96822+ GR_RLIM_CORE_BUMP = 10000,
96823+ GR_RLIM_RSS_BUMP = 500000,
96824+ GR_RLIM_NPROC_BUMP = 1,
96825+ GR_RLIM_NOFILE_BUMP = 5,
96826+ GR_RLIM_MEMLOCK_BUMP = 50000,
96827+ GR_RLIM_AS_BUMP = 500000,
96828+ GR_RLIM_LOCKS_BUMP = 2,
96829+ GR_RLIM_SIGPENDING_BUMP = 5,
96830+ GR_RLIM_MSGQUEUE_BUMP = 10000,
96831+ GR_RLIM_NICE_BUMP = 1,
96832+ GR_RLIM_RTPRIO_BUMP = 1,
96833+ GR_RLIM_RTTIME_BUMP = 1000000
96834+};
96835+
96836+#endif
96837diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
96838new file mode 100644
96839index 0000000..fb1de5d
96840--- /dev/null
96841+++ b/include/linux/grinternal.h
96842@@ -0,0 +1,230 @@
96843+#ifndef __GRINTERNAL_H
96844+#define __GRINTERNAL_H
96845+
96846+#ifdef CONFIG_GRKERNSEC
96847+
96848+#include <linux/fs.h>
96849+#include <linux/mnt_namespace.h>
96850+#include <linux/nsproxy.h>
96851+#include <linux/gracl.h>
96852+#include <linux/grdefs.h>
96853+#include <linux/grmsg.h>
96854+
96855+void gr_add_learn_entry(const char *fmt, ...)
96856+ __attribute__ ((format (printf, 1, 2)));
96857+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
96858+ const struct vfsmount *mnt);
96859+__u32 gr_check_create(const struct dentry *new_dentry,
96860+ const struct dentry *parent,
96861+ const struct vfsmount *mnt, const __u32 mode);
96862+int gr_check_protected_task(const struct task_struct *task);
96863+__u32 to_gr_audit(const __u32 reqmode);
96864+int gr_set_acls(const int type);
96865+int gr_acl_is_enabled(void);
96866+char gr_roletype_to_char(void);
96867+
96868+void gr_handle_alertkill(struct task_struct *task);
96869+char *gr_to_filename(const struct dentry *dentry,
96870+ const struct vfsmount *mnt);
96871+char *gr_to_filename1(const struct dentry *dentry,
96872+ const struct vfsmount *mnt);
96873+char *gr_to_filename2(const struct dentry *dentry,
96874+ const struct vfsmount *mnt);
96875+char *gr_to_filename3(const struct dentry *dentry,
96876+ const struct vfsmount *mnt);
96877+
96878+extern int grsec_enable_ptrace_readexec;
96879+extern int grsec_enable_harden_ptrace;
96880+extern int grsec_enable_link;
96881+extern int grsec_enable_fifo;
96882+extern int grsec_enable_execve;
96883+extern int grsec_enable_shm;
96884+extern int grsec_enable_execlog;
96885+extern int grsec_enable_signal;
96886+extern int grsec_enable_audit_ptrace;
96887+extern int grsec_enable_forkfail;
96888+extern int grsec_enable_time;
96889+extern int grsec_enable_rofs;
96890+extern int grsec_deny_new_usb;
96891+extern int grsec_enable_chroot_shmat;
96892+extern int grsec_enable_chroot_mount;
96893+extern int grsec_enable_chroot_double;
96894+extern int grsec_enable_chroot_pivot;
96895+extern int grsec_enable_chroot_chdir;
96896+extern int grsec_enable_chroot_chmod;
96897+extern int grsec_enable_chroot_mknod;
96898+extern int grsec_enable_chroot_fchdir;
96899+extern int grsec_enable_chroot_nice;
96900+extern int grsec_enable_chroot_execlog;
96901+extern int grsec_enable_chroot_caps;
96902+extern int grsec_enable_chroot_rename;
96903+extern int grsec_enable_chroot_sysctl;
96904+extern int grsec_enable_chroot_unix;
96905+extern int grsec_enable_symlinkown;
96906+extern kgid_t grsec_symlinkown_gid;
96907+extern int grsec_enable_tpe;
96908+extern kgid_t grsec_tpe_gid;
96909+extern int grsec_enable_tpe_all;
96910+extern int grsec_enable_tpe_invert;
96911+extern int grsec_enable_socket_all;
96912+extern kgid_t grsec_socket_all_gid;
96913+extern int grsec_enable_socket_client;
96914+extern kgid_t grsec_socket_client_gid;
96915+extern int grsec_enable_socket_server;
96916+extern kgid_t grsec_socket_server_gid;
96917+extern kgid_t grsec_audit_gid;
96918+extern int grsec_enable_group;
96919+extern int grsec_enable_log_rwxmaps;
96920+extern int grsec_enable_mount;
96921+extern int grsec_enable_chdir;
96922+extern int grsec_resource_logging;
96923+extern int grsec_enable_blackhole;
96924+extern int grsec_lastack_retries;
96925+extern int grsec_enable_brute;
96926+extern int grsec_enable_harden_ipc;
96927+extern int grsec_lock;
96928+
96929+extern spinlock_t grsec_alert_lock;
96930+extern unsigned long grsec_alert_wtime;
96931+extern unsigned long grsec_alert_fyet;
96932+
96933+extern spinlock_t grsec_audit_lock;
96934+
96935+extern rwlock_t grsec_exec_file_lock;
96936+
96937+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
96938+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
96939+ (tsk)->exec_file->f_path.mnt) : "/")
96940+
96941+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
96942+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
96943+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96944+
96945+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
96946+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
96947+ (tsk)->exec_file->f_path.mnt) : "/")
96948+
96949+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
96950+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
96951+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96952+
96953+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
96954+
96955+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
96956+
96957+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
96958+{
96959+ if (file1 && file2) {
96960+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
96961+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
96962+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
96963+ return true;
96964+ }
96965+
96966+ return false;
96967+}
96968+
96969+#define GR_CHROOT_CAPS {{ \
96970+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
96971+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
96972+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
96973+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
96974+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
96975+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
96976+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
96977+
96978+#define security_learn(normal_msg,args...) \
96979+({ \
96980+ read_lock(&grsec_exec_file_lock); \
96981+ gr_add_learn_entry(normal_msg "\n", ## args); \
96982+ read_unlock(&grsec_exec_file_lock); \
96983+})
96984+
96985+enum {
96986+ GR_DO_AUDIT,
96987+ GR_DONT_AUDIT,
96988+ /* used for non-audit messages that we shouldn't kill the task on */
96989+ GR_DONT_AUDIT_GOOD
96990+};
96991+
96992+enum {
96993+ GR_TTYSNIFF,
96994+ GR_RBAC,
96995+ GR_RBAC_STR,
96996+ GR_STR_RBAC,
96997+ GR_RBAC_MODE2,
96998+ GR_RBAC_MODE3,
96999+ GR_FILENAME,
97000+ GR_SYSCTL_HIDDEN,
97001+ GR_NOARGS,
97002+ GR_ONE_INT,
97003+ GR_ONE_INT_TWO_STR,
97004+ GR_ONE_STR,
97005+ GR_STR_INT,
97006+ GR_TWO_STR_INT,
97007+ GR_TWO_INT,
97008+ GR_TWO_U64,
97009+ GR_THREE_INT,
97010+ GR_FIVE_INT_TWO_STR,
97011+ GR_TWO_STR,
97012+ GR_THREE_STR,
97013+ GR_FOUR_STR,
97014+ GR_STR_FILENAME,
97015+ GR_FILENAME_STR,
97016+ GR_FILENAME_TWO_INT,
97017+ GR_FILENAME_TWO_INT_STR,
97018+ GR_TEXTREL,
97019+ GR_PTRACE,
97020+ GR_RESOURCE,
97021+ GR_CAP,
97022+ GR_SIG,
97023+ GR_SIG2,
97024+ GR_CRASH1,
97025+ GR_CRASH2,
97026+ GR_PSACCT,
97027+ GR_RWXMAP,
97028+ GR_RWXMAPVMA
97029+};
97030+
97031+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
97032+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
97033+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
97034+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
97035+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
97036+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
97037+#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)
97038+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
97039+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
97040+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
97041+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
97042+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
97043+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
97044+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
97045+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
97046+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
97047+#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)
97048+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
97049+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
97050+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
97051+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
97052+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
97053+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
97054+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
97055+#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)
97056+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
97057+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
97058+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
97059+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
97060+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
97061+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
97062+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
97063+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
97064+#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)
97065+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
97066+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
97067+
97068+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
97069+
97070+#endif
97071+
97072+#endif
97073diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
97074new file mode 100644
97075index 0000000..26ef560
97076--- /dev/null
97077+++ b/include/linux/grmsg.h
97078@@ -0,0 +1,118 @@
97079+#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"
97080+#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"
97081+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
97082+#define GR_STOPMOD_MSG "denied modification of module state by "
97083+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
97084+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
97085+#define GR_IOPERM_MSG "denied use of ioperm() by "
97086+#define GR_IOPL_MSG "denied use of iopl() by "
97087+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
97088+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
97089+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
97090+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
97091+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
97092+#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"
97093+#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"
97094+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
97095+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
97096+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
97097+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
97098+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
97099+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
97100+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
97101+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
97102+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
97103+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
97104+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
97105+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
97106+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
97107+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
97108+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
97109+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
97110+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
97111+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
97112+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
97113+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
97114+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
97115+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
97116+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
97117+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
97118+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
97119+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
97120+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
97121+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
97122+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
97123+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
97124+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
97125+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
97126+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
97127+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
97128+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
97129+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
97130+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
97131+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
97132+#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"
97133+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
97134+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
97135+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
97136+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
97137+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
97138+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
97139+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
97140+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
97141+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
97142+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
97143+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
97144+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
97145+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
97146+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
97147+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
97148+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
97149+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
97150+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
97151+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
97152+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
97153+#define GR_FAILFORK_MSG "failed fork with errno %s by "
97154+#define GR_NICE_CHROOT_MSG "denied priority change by "
97155+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
97156+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
97157+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
97158+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
97159+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
97160+#define GR_TIME_MSG "time set by "
97161+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
97162+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
97163+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
97164+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
97165+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
97166+#define GR_BIND_MSG "denied bind() by "
97167+#define GR_CONNECT_MSG "denied connect() by "
97168+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
97169+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
97170+#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"
97171+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
97172+#define GR_CAP_ACL_MSG "use of %s denied for "
97173+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
97174+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
97175+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
97176+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
97177+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
97178+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
97179+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
97180+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
97181+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
97182+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
97183+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
97184+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
97185+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
97186+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
97187+#define GR_VM86_MSG "denied use of vm86 by "
97188+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
97189+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
97190+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
97191+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
97192+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
97193+#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 "
97194+#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 "
97195+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
97196+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
97197diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
97198new file mode 100644
97199index 0000000..085a746
97200--- /dev/null
97201+++ b/include/linux/grsecurity.h
97202@@ -0,0 +1,247 @@
97203+#ifndef GR_SECURITY_H
97204+#define GR_SECURITY_H
97205+#include <linux/fs.h>
97206+#include <linux/fs_struct.h>
97207+#include <linux/binfmts.h>
97208+#include <linux/gracl.h>
97209+
97210+/* notify of brain-dead configs */
97211+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97212+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
97213+#endif
97214+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97215+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
97216+#endif
97217+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
97218+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
97219+#endif
97220+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
97221+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
97222+#endif
97223+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
97224+#error "CONFIG_PAX enabled, but no PaX options are enabled."
97225+#endif
97226+
97227+int gr_handle_new_usb(void);
97228+
97229+void gr_handle_brute_attach(int dumpable);
97230+void gr_handle_brute_check(void);
97231+void gr_handle_kernel_exploit(void);
97232+
97233+char gr_roletype_to_char(void);
97234+
97235+int gr_proc_is_restricted(void);
97236+
97237+int gr_acl_enable_at_secure(void);
97238+
97239+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
97240+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
97241+
97242+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
97243+
97244+void gr_del_task_from_ip_table(struct task_struct *p);
97245+
97246+int gr_pid_is_chrooted(struct task_struct *p);
97247+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
97248+int gr_handle_chroot_nice(void);
97249+int gr_handle_chroot_sysctl(const int op);
97250+int gr_handle_chroot_setpriority(struct task_struct *p,
97251+ const int niceval);
97252+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
97253+int gr_chroot_fhandle(void);
97254+int gr_handle_chroot_chroot(const struct dentry *dentry,
97255+ const struct vfsmount *mnt);
97256+void gr_handle_chroot_chdir(const struct path *path);
97257+int gr_handle_chroot_chmod(const struct dentry *dentry,
97258+ const struct vfsmount *mnt, const int mode);
97259+int gr_handle_chroot_mknod(const struct dentry *dentry,
97260+ const struct vfsmount *mnt, const int mode);
97261+int gr_handle_chroot_mount(const struct dentry *dentry,
97262+ const struct vfsmount *mnt,
97263+ const char *dev_name);
97264+int gr_handle_chroot_pivot(void);
97265+int gr_handle_chroot_unix(const pid_t pid);
97266+
97267+int gr_handle_rawio(const struct inode *inode);
97268+
97269+void gr_handle_ioperm(void);
97270+void gr_handle_iopl(void);
97271+void gr_handle_msr_write(void);
97272+
97273+umode_t gr_acl_umask(void);
97274+
97275+int gr_tpe_allow(const struct file *file);
97276+
97277+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
97278+void gr_clear_chroot_entries(struct task_struct *task);
97279+
97280+void gr_log_forkfail(const int retval);
97281+void gr_log_timechange(void);
97282+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
97283+void gr_log_chdir(const struct dentry *dentry,
97284+ const struct vfsmount *mnt);
97285+void gr_log_chroot_exec(const struct dentry *dentry,
97286+ const struct vfsmount *mnt);
97287+void gr_log_remount(const char *devname, const int retval);
97288+void gr_log_unmount(const char *devname, const int retval);
97289+void gr_log_mount(const char *from, struct path *to, const int retval);
97290+void gr_log_textrel(struct vm_area_struct *vma);
97291+void gr_log_ptgnustack(struct file *file);
97292+void gr_log_rwxmmap(struct file *file);
97293+void gr_log_rwxmprotect(struct vm_area_struct *vma);
97294+
97295+int gr_handle_follow_link(const struct dentry *dentry,
97296+ const struct vfsmount *mnt);
97297+int gr_handle_fifo(const struct dentry *dentry,
97298+ const struct vfsmount *mnt,
97299+ const struct dentry *dir, const int flag,
97300+ const int acc_mode);
97301+int gr_handle_hardlink(const struct dentry *dentry,
97302+ const struct vfsmount *mnt,
97303+ const struct filename *to);
97304+
97305+int gr_is_capable(const int cap);
97306+int gr_is_capable_nolog(const int cap);
97307+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
97308+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
97309+
97310+void gr_copy_label(struct task_struct *tsk);
97311+void gr_handle_crash(struct task_struct *task, const int sig);
97312+int gr_handle_signal(const struct task_struct *p, const int sig);
97313+int gr_check_crash_uid(const kuid_t uid);
97314+int gr_check_protected_task(const struct task_struct *task);
97315+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
97316+int gr_acl_handle_mmap(const struct file *file,
97317+ const unsigned long prot);
97318+int gr_acl_handle_mprotect(const struct file *file,
97319+ const unsigned long prot);
97320+int gr_check_hidden_task(const struct task_struct *tsk);
97321+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
97322+ const struct vfsmount *mnt);
97323+__u32 gr_acl_handle_utime(const struct dentry *dentry,
97324+ const struct vfsmount *mnt);
97325+__u32 gr_acl_handle_access(const struct dentry *dentry,
97326+ const struct vfsmount *mnt, const int fmode);
97327+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
97328+ const struct vfsmount *mnt, umode_t *mode);
97329+__u32 gr_acl_handle_chown(const struct dentry *dentry,
97330+ const struct vfsmount *mnt);
97331+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
97332+ const struct vfsmount *mnt);
97333+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
97334+ const struct vfsmount *mnt);
97335+int gr_handle_ptrace(struct task_struct *task, const long request);
97336+int gr_handle_proc_ptrace(struct task_struct *task);
97337+__u32 gr_acl_handle_execve(const struct dentry *dentry,
97338+ const struct vfsmount *mnt);
97339+int gr_check_crash_exec(const struct file *filp);
97340+int gr_acl_is_enabled(void);
97341+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
97342+ const kgid_t gid);
97343+int gr_set_proc_label(const struct dentry *dentry,
97344+ const struct vfsmount *mnt,
97345+ const int unsafe_flags);
97346+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
97347+ const struct vfsmount *mnt);
97348+__u32 gr_acl_handle_open(const struct dentry *dentry,
97349+ const struct vfsmount *mnt, int acc_mode);
97350+__u32 gr_acl_handle_creat(const struct dentry *dentry,
97351+ const struct dentry *p_dentry,
97352+ const struct vfsmount *p_mnt,
97353+ int open_flags, int acc_mode, const int imode);
97354+void gr_handle_create(const struct dentry *dentry,
97355+ const struct vfsmount *mnt);
97356+void gr_handle_proc_create(const struct dentry *dentry,
97357+ const struct inode *inode);
97358+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
97359+ const struct dentry *parent_dentry,
97360+ const struct vfsmount *parent_mnt,
97361+ const int mode);
97362+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
97363+ const struct dentry *parent_dentry,
97364+ const struct vfsmount *parent_mnt);
97365+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
97366+ const struct vfsmount *mnt);
97367+void gr_handle_delete(const u64 ino, const dev_t dev);
97368+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
97369+ const struct vfsmount *mnt);
97370+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
97371+ const struct dentry *parent_dentry,
97372+ const struct vfsmount *parent_mnt,
97373+ const struct filename *from);
97374+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
97375+ const struct dentry *parent_dentry,
97376+ const struct vfsmount *parent_mnt,
97377+ const struct dentry *old_dentry,
97378+ const struct vfsmount *old_mnt, const struct filename *to);
97379+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
97380+int gr_acl_handle_rename(struct dentry *new_dentry,
97381+ struct dentry *parent_dentry,
97382+ const struct vfsmount *parent_mnt,
97383+ struct dentry *old_dentry,
97384+ struct inode *old_parent_inode,
97385+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
97386+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
97387+ struct dentry *old_dentry,
97388+ struct dentry *new_dentry,
97389+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
97390+__u32 gr_check_link(const struct dentry *new_dentry,
97391+ const struct dentry *parent_dentry,
97392+ const struct vfsmount *parent_mnt,
97393+ const struct dentry *old_dentry,
97394+ const struct vfsmount *old_mnt);
97395+int gr_acl_handle_filldir(const struct file *file, const char *name,
97396+ const unsigned int namelen, const u64 ino);
97397+
97398+__u32 gr_acl_handle_unix(const struct dentry *dentry,
97399+ const struct vfsmount *mnt);
97400+void gr_acl_handle_exit(void);
97401+void gr_acl_handle_psacct(struct task_struct *task, const long code);
97402+int gr_acl_handle_procpidmem(const struct task_struct *task);
97403+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
97404+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
97405+void gr_audit_ptrace(struct task_struct *task);
97406+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
97407+u64 gr_get_ino_from_dentry(struct dentry *dentry);
97408+void gr_put_exec_file(struct task_struct *task);
97409+
97410+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
97411+
97412+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97413+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97414+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
97415+ struct dentry *newdentry, struct vfsmount *newmnt);
97416+
97417+#ifdef CONFIG_GRKERNSEC_RESLOG
97418+extern void gr_log_resource(const struct task_struct *task, const int res,
97419+ const unsigned long wanted, const int gt);
97420+#else
97421+static inline void gr_log_resource(const struct task_struct *task, const int res,
97422+ const unsigned long wanted, const int gt)
97423+{
97424+}
97425+#endif
97426+
97427+#ifdef CONFIG_GRKERNSEC
97428+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
97429+void gr_handle_vm86(void);
97430+void gr_handle_mem_readwrite(u64 from, u64 to);
97431+
97432+void gr_log_badprocpid(const char *entry);
97433+
97434+extern int grsec_enable_dmesg;
97435+extern int grsec_disable_privio;
97436+
97437+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97438+extern kgid_t grsec_proc_gid;
97439+#endif
97440+
97441+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
97442+extern int grsec_enable_chroot_findtask;
97443+#endif
97444+#ifdef CONFIG_GRKERNSEC_SETXID
97445+extern int grsec_enable_setxid;
97446+#endif
97447+#endif
97448+
97449+#endif
97450diff --git a/include/linux/grsock.h b/include/linux/grsock.h
97451new file mode 100644
97452index 0000000..e7ffaaf
97453--- /dev/null
97454+++ b/include/linux/grsock.h
97455@@ -0,0 +1,19 @@
97456+#ifndef __GRSOCK_H
97457+#define __GRSOCK_H
97458+
97459+extern void gr_attach_curr_ip(const struct sock *sk);
97460+extern int gr_handle_sock_all(const int family, const int type,
97461+ const int protocol);
97462+extern int gr_handle_sock_server(const struct sockaddr *sck);
97463+extern int gr_handle_sock_server_other(const struct sock *sck);
97464+extern int gr_handle_sock_client(const struct sockaddr *sck);
97465+extern int gr_search_connect(struct socket * sock,
97466+ struct sockaddr_in * addr);
97467+extern int gr_search_bind(struct socket * sock,
97468+ struct sockaddr_in * addr);
97469+extern int gr_search_listen(struct socket * sock);
97470+extern int gr_search_accept(struct socket * sock);
97471+extern int gr_search_socket(const int domain, const int type,
97472+ const int protocol);
97473+
97474+#endif
97475diff --git a/include/linux/highmem.h b/include/linux/highmem.h
97476index 9286a46..373f27f 100644
97477--- a/include/linux/highmem.h
97478+++ b/include/linux/highmem.h
97479@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
97480 kunmap_atomic(kaddr);
97481 }
97482
97483+static inline void sanitize_highpage(struct page *page)
97484+{
97485+ void *kaddr;
97486+ unsigned long flags;
97487+
97488+ local_irq_save(flags);
97489+ kaddr = kmap_atomic(page);
97490+ clear_page(kaddr);
97491+ kunmap_atomic(kaddr);
97492+ local_irq_restore(flags);
97493+}
97494+
97495 static inline void zero_user_segments(struct page *page,
97496 unsigned start1, unsigned end1,
97497 unsigned start2, unsigned end2)
97498diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
97499index 1c7b89a..7dda400 100644
97500--- a/include/linux/hwmon-sysfs.h
97501+++ b/include/linux/hwmon-sysfs.h
97502@@ -25,7 +25,8 @@
97503 struct sensor_device_attribute{
97504 struct device_attribute dev_attr;
97505 int index;
97506-};
97507+} __do_const;
97508+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
97509 #define to_sensor_dev_attr(_dev_attr) \
97510 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
97511
97512@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
97513 struct device_attribute dev_attr;
97514 u8 index;
97515 u8 nr;
97516-};
97517+} __do_const;
97518+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
97519 #define to_sensor_dev_attr_2(_dev_attr) \
97520 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
97521
97522diff --git a/include/linux/i2c.h b/include/linux/i2c.h
97523index e83a738..8b323fa 100644
97524--- a/include/linux/i2c.h
97525+++ b/include/linux/i2c.h
97526@@ -409,6 +409,7 @@ struct i2c_algorithm {
97527 int (*unreg_slave)(struct i2c_client *client);
97528 #endif
97529 };
97530+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
97531
97532 /**
97533 * struct i2c_bus_recovery_info - I2C bus recovery information
97534diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
97535index 66a7d76..5e68d20 100644
97536--- a/include/linux/if_pppox.h
97537+++ b/include/linux/if_pppox.h
97538@@ -78,7 +78,7 @@ struct pppox_proto {
97539 int (*ioctl)(struct socket *sock, unsigned int cmd,
97540 unsigned long arg);
97541 struct module *owner;
97542-};
97543+} __do_const;
97544
97545 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
97546 extern void unregister_pppox_proto(int proto_num);
97547diff --git a/include/linux/init.h b/include/linux/init.h
97548index 21b6d76..4a6775c 100644
97549--- a/include/linux/init.h
97550+++ b/include/linux/init.h
97551@@ -37,9 +37,17 @@
97552 * section.
97553 */
97554
97555+#define add_init_latent_entropy __latent_entropy
97556+
97557+#ifdef CONFIG_MEMORY_HOTPLUG
97558+#define add_meminit_latent_entropy
97559+#else
97560+#define add_meminit_latent_entropy __latent_entropy
97561+#endif
97562+
97563 /* These are for everybody (although not all archs will actually
97564 discard it in modules) */
97565-#define __init __section(.init.text) __cold notrace
97566+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
97567 #define __initdata __section(.init.data)
97568 #define __initconst __constsection(.init.rodata)
97569 #define __exitdata __section(.exit.data)
97570@@ -100,7 +108,7 @@
97571 #define __cpuexitconst
97572
97573 /* Used for MEMORY_HOTPLUG */
97574-#define __meminit __section(.meminit.text) __cold notrace
97575+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
97576 #define __meminitdata __section(.meminit.data)
97577 #define __meminitconst __constsection(.meminit.rodata)
97578 #define __memexit __section(.memexit.text) __exitused __cold notrace
97579diff --git a/include/linux/init_task.h b/include/linux/init_task.h
97580index 696d223..6d6b39f 100644
97581--- a/include/linux/init_task.h
97582+++ b/include/linux/init_task.h
97583@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
97584
97585 #define INIT_TASK_COMM "swapper"
97586
97587+#ifdef CONFIG_X86
97588+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
97589+#else
97590+#define INIT_TASK_THREAD_INFO
97591+#endif
97592+
97593 #ifdef CONFIG_RT_MUTEXES
97594 # define INIT_RT_MUTEXES(tsk) \
97595 .pi_waiters = RB_ROOT, \
97596@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
97597 RCU_POINTER_INITIALIZER(cred, &init_cred), \
97598 .comm = INIT_TASK_COMM, \
97599 .thread = INIT_THREAD, \
97600+ INIT_TASK_THREAD_INFO \
97601 .fs = &init_fs, \
97602 .files = &init_files, \
97603 .signal = &init_signals, \
97604diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
97605index 950ae45..df6ac60 100644
97606--- a/include/linux/interrupt.h
97607+++ b/include/linux/interrupt.h
97608@@ -432,8 +432,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
97609
97610 struct softirq_action
97611 {
97612- void (*action)(struct softirq_action *);
97613-};
97614+ void (*action)(void);
97615+} __no_const;
97616
97617 asmlinkage void do_softirq(void);
97618 asmlinkage void __do_softirq(void);
97619@@ -447,7 +447,7 @@ static inline void do_softirq_own_stack(void)
97620 }
97621 #endif
97622
97623-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
97624+extern void open_softirq(int nr, void (*action)(void));
97625 extern void softirq_init(void);
97626 extern void __raise_softirq_irqoff(unsigned int nr);
97627
97628diff --git a/include/linux/iommu.h b/include/linux/iommu.h
97629index 0546b87..46fd5b6 100644
97630--- a/include/linux/iommu.h
97631+++ b/include/linux/iommu.h
97632@@ -174,7 +174,7 @@ struct iommu_ops {
97633
97634 unsigned long pgsize_bitmap;
97635 void *priv;
97636-};
97637+} __do_const;
97638
97639 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
97640 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
97641@@ -234,7 +234,7 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
97642 void *data);
97643 struct device *iommu_device_create(struct device *parent, void *drvdata,
97644 const struct attribute_group **groups,
97645- const char *fmt, ...);
97646+ const char *fmt, ...) __printf(4, 5);
97647 void iommu_device_destroy(struct device *dev);
97648 int iommu_device_link(struct device *dev, struct device *link);
97649 void iommu_device_unlink(struct device *dev, struct device *link);
97650diff --git a/include/linux/ioport.h b/include/linux/ioport.h
97651index 388e3ae..d7e45a1 100644
97652--- a/include/linux/ioport.h
97653+++ b/include/linux/ioport.h
97654@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
97655 int adjust_resource(struct resource *res, resource_size_t start,
97656 resource_size_t size);
97657 resource_size_t resource_alignment(struct resource *res);
97658-static inline resource_size_t resource_size(const struct resource *res)
97659+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
97660 {
97661 return res->end - res->start + 1;
97662 }
97663diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
97664index 1eee6bc..9cf4912 100644
97665--- a/include/linux/ipc_namespace.h
97666+++ b/include/linux/ipc_namespace.h
97667@@ -60,7 +60,7 @@ struct ipc_namespace {
97668 struct user_namespace *user_ns;
97669
97670 struct ns_common ns;
97671-};
97672+} __randomize_layout;
97673
97674 extern struct ipc_namespace init_ipc_ns;
97675 extern atomic_t nr_ipc_ns;
97676diff --git a/include/linux/irq.h b/include/linux/irq.h
97677index 62c6901..827f8f6 100644
97678--- a/include/linux/irq.h
97679+++ b/include/linux/irq.h
97680@@ -370,7 +370,8 @@ struct irq_chip {
97681 int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
97682
97683 unsigned long flags;
97684-};
97685+} __do_const;
97686+typedef struct irq_chip __no_const irq_chip_no_const;
97687
97688 /*
97689 * irq_chip specific flags
97690diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
97691index dd1109f..4f4fdda 100644
97692--- a/include/linux/irqdesc.h
97693+++ b/include/linux/irqdesc.h
97694@@ -61,7 +61,7 @@ struct irq_desc {
97695 unsigned int irq_count; /* For detecting broken IRQs */
97696 unsigned long last_unhandled; /* Aging timer for unhandled count */
97697 unsigned int irqs_unhandled;
97698- atomic_t threads_handled;
97699+ atomic_unchecked_t threads_handled;
97700 int threads_handled_last;
97701 raw_spinlock_t lock;
97702 struct cpumask *percpu_enabled;
97703diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
97704index 676d730..8d3a1ad 100644
97705--- a/include/linux/irqdomain.h
97706+++ b/include/linux/irqdomain.h
97707@@ -40,6 +40,7 @@ struct device_node;
97708 struct irq_domain;
97709 struct of_device_id;
97710 struct irq_chip;
97711+typedef struct irq_chip __no_const irq_chip_no_const;
97712 struct irq_data;
97713
97714 /* Number of irqs reserved for a legacy isa controller */
97715diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
97716index c367cbd..c9b79e6 100644
97717--- a/include/linux/jiffies.h
97718+++ b/include/linux/jiffies.h
97719@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
97720 /*
97721 * Convert various time units to each other:
97722 */
97723-extern unsigned int jiffies_to_msecs(const unsigned long j);
97724-extern unsigned int jiffies_to_usecs(const unsigned long j);
97725+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
97726+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
97727
97728-static inline u64 jiffies_to_nsecs(const unsigned long j)
97729+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
97730 {
97731 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
97732 }
97733
97734-extern unsigned long msecs_to_jiffies(const unsigned int m);
97735-extern unsigned long usecs_to_jiffies(const unsigned int u);
97736+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
97737+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
97738 extern unsigned long timespec_to_jiffies(const struct timespec *value);
97739 extern void jiffies_to_timespec(const unsigned long jiffies,
97740- struct timespec *value);
97741-extern unsigned long timeval_to_jiffies(const struct timeval *value);
97742+ struct timespec *value) __intentional_overflow(-1);
97743+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
97744 extern void jiffies_to_timeval(const unsigned long jiffies,
97745 struct timeval *value);
97746
97747diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
97748index 6883e19..e854fcb 100644
97749--- a/include/linux/kallsyms.h
97750+++ b/include/linux/kallsyms.h
97751@@ -15,7 +15,8 @@
97752
97753 struct module;
97754
97755-#ifdef CONFIG_KALLSYMS
97756+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
97757+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
97758 /* Lookup the address for a symbol. Returns 0 if not found. */
97759 unsigned long kallsyms_lookup_name(const char *name);
97760
97761@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
97762 /* Stupid that this does nothing, but I didn't create this mess. */
97763 #define __print_symbol(fmt, addr)
97764 #endif /*CONFIG_KALLSYMS*/
97765+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
97766+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
97767+extern unsigned long kallsyms_lookup_name(const char *name);
97768+extern void __print_symbol(const char *fmt, unsigned long address);
97769+extern int sprint_backtrace(char *buffer, unsigned long address);
97770+extern int sprint_symbol(char *buffer, unsigned long address);
97771+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
97772+const char *kallsyms_lookup(unsigned long addr,
97773+ unsigned long *symbolsize,
97774+ unsigned long *offset,
97775+ char **modname, char *namebuf);
97776+extern int kallsyms_lookup_size_offset(unsigned long addr,
97777+ unsigned long *symbolsize,
97778+ unsigned long *offset);
97779+#endif
97780
97781 /* This macro allows us to keep printk typechecking */
97782 static __printf(1, 2)
97783diff --git a/include/linux/kernel.h b/include/linux/kernel.h
97784index 3a5b48e..240107b 100644
97785--- a/include/linux/kernel.h
97786+++ b/include/linux/kernel.h
97787@@ -390,7 +390,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
97788 /* Obsolete, do not use. Use kstrto<foo> instead */
97789
97790 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
97791-extern long simple_strtol(const char *,char **,unsigned int);
97792+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
97793 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
97794 extern long long simple_strtoll(const char *,char **,unsigned int);
97795
97796@@ -410,7 +410,8 @@ extern __printf(3, 0)
97797 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
97798 extern __printf(2, 3)
97799 char *kasprintf(gfp_t gfp, const char *fmt, ...);
97800-extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97801+extern __printf(2, 0)
97802+char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97803
97804 extern __scanf(2, 3)
97805 int sscanf(const char *, const char *, ...);
97806@@ -681,10 +682,10 @@ do { \
97807 __ftrace_vprintk(_THIS_IP_, fmt, vargs); \
97808 } while (0)
97809
97810-extern int
97811+extern __printf(2, 0) int
97812 __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
97813
97814-extern int
97815+extern __printf(2, 0) int
97816 __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
97817
97818 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
97819@@ -704,7 +705,7 @@ int trace_printk(const char *fmt, ...)
97820 {
97821 return 0;
97822 }
97823-static inline int
97824+static __printf(1, 0) inline int
97825 ftrace_vprintk(const char *fmt, va_list ap)
97826 {
97827 return 0;
97828diff --git a/include/linux/key-type.h b/include/linux/key-type.h
97829index ff9f1d3..6712be5 100644
97830--- a/include/linux/key-type.h
97831+++ b/include/linux/key-type.h
97832@@ -152,7 +152,7 @@ struct key_type {
97833 /* internal fields */
97834 struct list_head link; /* link in types list */
97835 struct lock_class_key lock_class; /* key->sem lock class */
97836-};
97837+} __do_const;
97838
97839 extern struct key_type key_type_keyring;
97840
97841diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
97842index e465bb1..19f605fd 100644
97843--- a/include/linux/kgdb.h
97844+++ b/include/linux/kgdb.h
97845@@ -52,7 +52,7 @@ extern int kgdb_connected;
97846 extern int kgdb_io_module_registered;
97847
97848 extern atomic_t kgdb_setting_breakpoint;
97849-extern atomic_t kgdb_cpu_doing_single_step;
97850+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
97851
97852 extern struct task_struct *kgdb_usethread;
97853 extern struct task_struct *kgdb_contthread;
97854@@ -254,7 +254,7 @@ struct kgdb_arch {
97855 void (*correct_hw_break)(void);
97856
97857 void (*enable_nmi)(bool on);
97858-};
97859+} __do_const;
97860
97861 /**
97862 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
97863@@ -279,7 +279,7 @@ struct kgdb_io {
97864 void (*pre_exception) (void);
97865 void (*post_exception) (void);
97866 int is_console;
97867-};
97868+} __do_const;
97869
97870 extern struct kgdb_arch arch_kgdb_ops;
97871
97872diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
97873index d0a1f99..0bd8b7c 100644
97874--- a/include/linux/kmemleak.h
97875+++ b/include/linux/kmemleak.h
97876@@ -27,7 +27,7 @@
97877
97878 extern void kmemleak_init(void) __ref;
97879 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97880- gfp_t gfp) __ref;
97881+ gfp_t gfp) __ref __size_overflow(2);
97882 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
97883 gfp_t gfp) __ref;
97884 extern void kmemleak_free(const void *ptr) __ref;
97885@@ -63,7 +63,7 @@ static inline void kmemleak_erase(void **ptr)
97886 static inline void kmemleak_init(void)
97887 {
97888 }
97889-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97890+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
97891 gfp_t gfp)
97892 {
97893 }
97894diff --git a/include/linux/kmod.h b/include/linux/kmod.h
97895index 0555cc6..40116ce 100644
97896--- a/include/linux/kmod.h
97897+++ b/include/linux/kmod.h
97898@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
97899 * usually useless though. */
97900 extern __printf(2, 3)
97901 int __request_module(bool wait, const char *name, ...);
97902+extern __printf(3, 4)
97903+int ___request_module(bool wait, char *param_name, const char *name, ...);
97904 #define request_module(mod...) __request_module(true, mod)
97905 #define request_module_nowait(mod...) __request_module(false, mod)
97906 #define try_then_request_module(x, mod...) \
97907@@ -57,6 +59,9 @@ struct subprocess_info {
97908 struct work_struct work;
97909 struct completion *complete;
97910 char *path;
97911+#ifdef CONFIG_GRKERNSEC
97912+ char *origpath;
97913+#endif
97914 char **argv;
97915 char **envp;
97916 int wait;
97917diff --git a/include/linux/kobject.h b/include/linux/kobject.h
97918index 2d61b90..3d69945 100644
97919--- a/include/linux/kobject.h
97920+++ b/include/linux/kobject.h
97921@@ -80,8 +80,9 @@ struct kobject {
97922
97923 extern __printf(2, 3)
97924 int kobject_set_name(struct kobject *kobj, const char *name, ...);
97925-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97926- va_list vargs);
97927+extern __printf(2, 0)
97928+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97929+ va_list vargs);
97930
97931 static inline const char *kobject_name(const struct kobject *kobj)
97932 {
97933@@ -118,7 +119,7 @@ struct kobj_type {
97934 struct attribute **default_attrs;
97935 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
97936 const void *(*namespace)(struct kobject *kobj);
97937-};
97938+} __do_const;
97939
97940 struct kobj_uevent_env {
97941 char *argv[3];
97942@@ -142,6 +143,7 @@ struct kobj_attribute {
97943 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
97944 const char *buf, size_t count);
97945 };
97946+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
97947
97948 extern const struct sysfs_ops kobj_sysfs_ops;
97949
97950@@ -169,7 +171,7 @@ struct kset {
97951 spinlock_t list_lock;
97952 struct kobject kobj;
97953 const struct kset_uevent_ops *uevent_ops;
97954-};
97955+} __randomize_layout;
97956
97957 extern void kset_init(struct kset *kset);
97958 extern int __must_check kset_register(struct kset *kset);
97959diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
97960index df32d25..fb52e27 100644
97961--- a/include/linux/kobject_ns.h
97962+++ b/include/linux/kobject_ns.h
97963@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
97964 const void *(*netlink_ns)(struct sock *sk);
97965 const void *(*initial_ns)(void);
97966 void (*drop_ns)(void *);
97967-};
97968+} __do_const;
97969
97970 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
97971 int kobj_ns_type_registered(enum kobj_ns_type type);
97972diff --git a/include/linux/kref.h b/include/linux/kref.h
97973index 484604d..0f6c5b6 100644
97974--- a/include/linux/kref.h
97975+++ b/include/linux/kref.h
97976@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
97977 static inline int kref_sub(struct kref *kref, unsigned int count,
97978 void (*release)(struct kref *kref))
97979 {
97980- WARN_ON(release == NULL);
97981+ BUG_ON(release == NULL);
97982
97983 if (atomic_sub_and_test((int) count, &kref->refcount)) {
97984 release(kref);
97985diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
97986index ad45054..7c54663 100644
97987--- a/include/linux/kvm_host.h
97988+++ b/include/linux/kvm_host.h
97989@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
97990 {
97991 }
97992 #endif
97993-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97994+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97995 struct module *module);
97996 void kvm_exit(void);
97997
97998@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
97999 struct kvm_guest_debug *dbg);
98000 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
98001
98002-int kvm_arch_init(void *opaque);
98003+int kvm_arch_init(const void *opaque);
98004 void kvm_arch_exit(void);
98005
98006 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
98007diff --git a/include/linux/libata.h b/include/linux/libata.h
98008index 28aeae4..320b3bf6 100644
98009--- a/include/linux/libata.h
98010+++ b/include/linux/libata.h
98011@@ -988,7 +988,7 @@ struct ata_port_operations {
98012 * fields must be pointers.
98013 */
98014 const struct ata_port_operations *inherits;
98015-};
98016+} __do_const;
98017
98018 struct ata_port_info {
98019 unsigned long flags;
98020diff --git a/include/linux/linkage.h b/include/linux/linkage.h
98021index a6a42dd..6c5ebce 100644
98022--- a/include/linux/linkage.h
98023+++ b/include/linux/linkage.h
98024@@ -36,6 +36,7 @@
98025 #endif
98026
98027 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
98028+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
98029 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
98030
98031 /*
98032diff --git a/include/linux/list.h b/include/linux/list.h
98033index feb773c..98f3075 100644
98034--- a/include/linux/list.h
98035+++ b/include/linux/list.h
98036@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
98037 extern void list_del(struct list_head *entry);
98038 #endif
98039
98040+extern void __pax_list_add(struct list_head *new,
98041+ struct list_head *prev,
98042+ struct list_head *next);
98043+static inline void pax_list_add(struct list_head *new, struct list_head *head)
98044+{
98045+ __pax_list_add(new, head, head->next);
98046+}
98047+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
98048+{
98049+ __pax_list_add(new, head->prev, head);
98050+}
98051+extern void pax_list_del(struct list_head *entry);
98052+
98053 /**
98054 * list_replace - replace old entry by new one
98055 * @old : the element to be replaced
98056@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
98057 INIT_LIST_HEAD(entry);
98058 }
98059
98060+extern void pax_list_del_init(struct list_head *entry);
98061+
98062 /**
98063 * list_move - delete from one list and add as another's head
98064 * @list: the entry to move
98065diff --git a/include/linux/lockref.h b/include/linux/lockref.h
98066index b10b122..d37b3de 100644
98067--- a/include/linux/lockref.h
98068+++ b/include/linux/lockref.h
98069@@ -28,7 +28,7 @@ struct lockref {
98070 #endif
98071 struct {
98072 spinlock_t lock;
98073- int count;
98074+ atomic_t count;
98075 };
98076 };
98077 };
98078@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
98079 extern int lockref_get_not_dead(struct lockref *);
98080
98081 /* Must be called under spinlock for reliable results */
98082-static inline int __lockref_is_dead(const struct lockref *l)
98083+static inline int __lockref_is_dead(const struct lockref *lockref)
98084 {
98085- return ((int)l->count < 0);
98086+ return atomic_read(&lockref->count) < 0;
98087+}
98088+
98089+static inline int __lockref_read(const struct lockref *lockref)
98090+{
98091+ return atomic_read(&lockref->count);
98092+}
98093+
98094+static inline void __lockref_set(struct lockref *lockref, int count)
98095+{
98096+ atomic_set(&lockref->count, count);
98097+}
98098+
98099+static inline void __lockref_inc(struct lockref *lockref)
98100+{
98101+ atomic_inc(&lockref->count);
98102+}
98103+
98104+static inline void __lockref_dec(struct lockref *lockref)
98105+{
98106+ atomic_dec(&lockref->count);
98107 }
98108
98109 #endif /* __LINUX_LOCKREF_H */
98110diff --git a/include/linux/math64.h b/include/linux/math64.h
98111index c45c089..298841c 100644
98112--- a/include/linux/math64.h
98113+++ b/include/linux/math64.h
98114@@ -15,7 +15,7 @@
98115 * This is commonly provided by 32bit archs to provide an optimized 64bit
98116 * divide.
98117 */
98118-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98119+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98120 {
98121 *remainder = dividend % divisor;
98122 return dividend / divisor;
98123@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
98124 /**
98125 * div64_u64 - unsigned 64bit divide with 64bit divisor
98126 */
98127-static inline u64 div64_u64(u64 dividend, u64 divisor)
98128+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
98129 {
98130 return dividend / divisor;
98131 }
98132@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
98133 #define div64_ul(x, y) div_u64((x), (y))
98134
98135 #ifndef div_u64_rem
98136-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98137+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98138 {
98139 *remainder = do_div(dividend, divisor);
98140 return dividend;
98141@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
98142 #endif
98143
98144 #ifndef div64_u64
98145-extern u64 div64_u64(u64 dividend, u64 divisor);
98146+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
98147 #endif
98148
98149 #ifndef div64_s64
98150@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
98151 * divide.
98152 */
98153 #ifndef div_u64
98154-static inline u64 div_u64(u64 dividend, u32 divisor)
98155+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
98156 {
98157 u32 remainder;
98158 return div_u64_rem(dividend, divisor, &remainder);
98159diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
98160index 3d385c8..deacb6a 100644
98161--- a/include/linux/mempolicy.h
98162+++ b/include/linux/mempolicy.h
98163@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
98164 }
98165
98166 #define vma_policy(vma) ((vma)->vm_policy)
98167+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
98168+{
98169+ vma->vm_policy = pol;
98170+}
98171
98172 static inline void mpol_get(struct mempolicy *pol)
98173 {
98174@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
98175 }
98176
98177 #define vma_policy(vma) NULL
98178+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
98179+{
98180+}
98181
98182 static inline int
98183 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
98184diff --git a/include/linux/mm.h b/include/linux/mm.h
98185index 0755b9f..2960e96 100644
98186--- a/include/linux/mm.h
98187+++ b/include/linux/mm.h
98188@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
98189
98190 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
98191 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
98192+
98193+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
98194+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
98195+#endif
98196+
98197 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
98198 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
98199 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
98200@@ -257,8 +262,8 @@ struct vm_operations_struct {
98201 /* called by access_process_vm when get_user_pages() fails, typically
98202 * for use by special VMAs that can switch between memory and hardware
98203 */
98204- int (*access)(struct vm_area_struct *vma, unsigned long addr,
98205- void *buf, int len, int write);
98206+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
98207+ void *buf, size_t len, int write);
98208
98209 /* Called by the /proc/PID/maps code to ask the vma whether it
98210 * has a special name. Returning non-NULL will also cause this
98211@@ -296,6 +301,7 @@ struct vm_operations_struct {
98212 struct page *(*find_special_page)(struct vm_area_struct *vma,
98213 unsigned long addr);
98214 };
98215+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
98216
98217 struct mmu_gather;
98218 struct inode;
98219@@ -1131,8 +1137,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
98220 unsigned long *pfn);
98221 int follow_phys(struct vm_area_struct *vma, unsigned long address,
98222 unsigned int flags, unsigned long *prot, resource_size_t *phys);
98223-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98224- void *buf, int len, int write);
98225+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98226+ void *buf, size_t len, int write);
98227
98228 static inline void unmap_shared_mapping_range(struct address_space *mapping,
98229 loff_t const holebegin, loff_t const holelen)
98230@@ -1172,9 +1178,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
98231 }
98232 #endif
98233
98234-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
98235-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98236- void *buf, int len, int write);
98237+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
98238+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98239+ void *buf, size_t len, int write);
98240
98241 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
98242 unsigned long start, unsigned long nr_pages,
98243@@ -1219,34 +1225,6 @@ int clear_page_dirty_for_io(struct page *page);
98244
98245 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
98246
98247-/* Is the vma a continuation of the stack vma above it? */
98248-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
98249-{
98250- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
98251-}
98252-
98253-static inline int stack_guard_page_start(struct vm_area_struct *vma,
98254- unsigned long addr)
98255-{
98256- return (vma->vm_flags & VM_GROWSDOWN) &&
98257- (vma->vm_start == addr) &&
98258- !vma_growsdown(vma->vm_prev, addr);
98259-}
98260-
98261-/* Is the vma a continuation of the stack vma below it? */
98262-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
98263-{
98264- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
98265-}
98266-
98267-static inline int stack_guard_page_end(struct vm_area_struct *vma,
98268- unsigned long addr)
98269-{
98270- return (vma->vm_flags & VM_GROWSUP) &&
98271- (vma->vm_end == addr) &&
98272- !vma_growsup(vma->vm_next, addr);
98273-}
98274-
98275 extern struct task_struct *task_of_stack(struct task_struct *task,
98276 struct vm_area_struct *vma, bool in_group);
98277
98278@@ -1369,8 +1347,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
98279 {
98280 return 0;
98281 }
98282+
98283+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
98284+ unsigned long address)
98285+{
98286+ return 0;
98287+}
98288 #else
98289 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98290+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98291 #endif
98292
98293 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
98294@@ -1380,6 +1365,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
98295 return 0;
98296 }
98297
98298+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
98299+ unsigned long address)
98300+{
98301+ return 0;
98302+}
98303+
98304 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
98305
98306 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
98307@@ -1392,6 +1383,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
98308
98309 #else
98310 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
98311+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
98312
98313 static inline void mm_nr_pmds_init(struct mm_struct *mm)
98314 {
98315@@ -1429,11 +1421,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
98316 NULL: pud_offset(pgd, address);
98317 }
98318
98319+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
98320+{
98321+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
98322+ NULL: pud_offset(pgd, address);
98323+}
98324+
98325 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
98326 {
98327 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
98328 NULL: pmd_offset(pud, address);
98329 }
98330+
98331+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
98332+{
98333+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
98334+ NULL: pmd_offset(pud, address);
98335+}
98336 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
98337
98338 #if USE_SPLIT_PTE_PTLOCKS
98339@@ -1810,12 +1814,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
98340 bool *need_rmap_locks);
98341 extern void exit_mmap(struct mm_struct *);
98342
98343+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
98344+extern void gr_learn_resource(const struct task_struct *task, const int res,
98345+ const unsigned long wanted, const int gt);
98346+#else
98347+static inline void gr_learn_resource(const struct task_struct *task, const int res,
98348+ const unsigned long wanted, const int gt)
98349+{
98350+}
98351+#endif
98352+
98353 static inline int check_data_rlimit(unsigned long rlim,
98354 unsigned long new,
98355 unsigned long start,
98356 unsigned long end_data,
98357 unsigned long start_data)
98358 {
98359+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
98360 if (rlim < RLIM_INFINITY) {
98361 if (((new - start) + (end_data - start_data)) > rlim)
98362 return -ENOSPC;
98363@@ -1840,7 +1855,7 @@ extern int install_special_mapping(struct mm_struct *mm,
98364 unsigned long addr, unsigned long len,
98365 unsigned long flags, struct page **pages);
98366
98367-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
98368+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
98369
98370 extern unsigned long mmap_region(struct file *file, unsigned long addr,
98371 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
98372@@ -1848,6 +1863,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98373 unsigned long len, unsigned long prot, unsigned long flags,
98374 unsigned long pgoff, unsigned long *populate);
98375 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
98376+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
98377
98378 #ifdef CONFIG_MMU
98379 extern int __mm_populate(unsigned long addr, unsigned long len,
98380@@ -1876,10 +1892,11 @@ struct vm_unmapped_area_info {
98381 unsigned long high_limit;
98382 unsigned long align_mask;
98383 unsigned long align_offset;
98384+ unsigned long threadstack_offset;
98385 };
98386
98387-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
98388-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98389+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
98390+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
98391
98392 /*
98393 * Search for an unmapped address range.
98394@@ -1891,7 +1908,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98395 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
98396 */
98397 static inline unsigned long
98398-vm_unmapped_area(struct vm_unmapped_area_info *info)
98399+vm_unmapped_area(const struct vm_unmapped_area_info *info)
98400 {
98401 if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
98402 return unmapped_area_topdown(info);
98403@@ -1953,6 +1970,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
98404 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
98405 struct vm_area_struct **pprev);
98406
98407+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
98408+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
98409+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
98410+
98411 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
98412 NULL if none. Assume start_addr < end_addr. */
98413 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
98414@@ -1982,10 +2003,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
98415 }
98416
98417 #ifdef CONFIG_MMU
98418-pgprot_t vm_get_page_prot(unsigned long vm_flags);
98419+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
98420 void vma_set_page_prot(struct vm_area_struct *vma);
98421 #else
98422-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
98423+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98424 {
98425 return __pgprot(0);
98426 }
98427@@ -2047,6 +2068,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
98428 static inline void vm_stat_account(struct mm_struct *mm,
98429 unsigned long flags, struct file *file, long pages)
98430 {
98431+
98432+#ifdef CONFIG_PAX_RANDMMAP
98433+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98434+#endif
98435+
98436 mm->total_vm += pages;
98437 }
98438 #endif /* CONFIG_PROC_FS */
98439@@ -2149,7 +2175,7 @@ extern int unpoison_memory(unsigned long pfn);
98440 extern int sysctl_memory_failure_early_kill;
98441 extern int sysctl_memory_failure_recovery;
98442 extern void shake_page(struct page *p, int access);
98443-extern atomic_long_t num_poisoned_pages;
98444+extern atomic_long_unchecked_t num_poisoned_pages;
98445 extern int soft_offline_page(struct page *page, int flags);
98446
98447 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
98448@@ -2200,5 +2226,11 @@ void __init setup_nr_node_ids(void);
98449 static inline void setup_nr_node_ids(void) {}
98450 #endif
98451
98452+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98453+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
98454+#else
98455+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
98456+#endif
98457+
98458 #endif /* __KERNEL__ */
98459 #endif /* _LINUX_MM_H */
98460diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
98461index 8d37e26..6a6f55b 100644
98462--- a/include/linux/mm_types.h
98463+++ b/include/linux/mm_types.h
98464@@ -313,7 +313,9 @@ struct vm_area_struct {
98465 #ifdef CONFIG_NUMA
98466 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
98467 #endif
98468-};
98469+
98470+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
98471+} __randomize_layout;
98472
98473 struct core_thread {
98474 struct task_struct *task;
98475@@ -466,7 +468,25 @@ struct mm_struct {
98476 /* address of the bounds directory */
98477 void __user *bd_addr;
98478 #endif
98479-};
98480+
98481+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
98482+ unsigned long pax_flags;
98483+#endif
98484+
98485+#ifdef CONFIG_PAX_DLRESOLVE
98486+ unsigned long call_dl_resolve;
98487+#endif
98488+
98489+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
98490+ unsigned long call_syscall;
98491+#endif
98492+
98493+#ifdef CONFIG_PAX_ASLR
98494+ unsigned long delta_mmap; /* randomized offset */
98495+ unsigned long delta_stack; /* randomized offset */
98496+#endif
98497+
98498+} __randomize_layout;
98499
98500 static inline void mm_init_cpumask(struct mm_struct *mm)
98501 {
98502diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
98503index c5d5278..85cd5ce 100644
98504--- a/include/linux/mmiotrace.h
98505+++ b/include/linux/mmiotrace.h
98506@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
98507 /* Called from ioremap.c */
98508 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
98509 void __iomem *addr);
98510-extern void mmiotrace_iounmap(volatile void __iomem *addr);
98511+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
98512
98513 /* For anyone to insert markers. Remember trailing newline. */
98514 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
98515@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
98516 {
98517 }
98518
98519-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
98520+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
98521 {
98522 }
98523
98524@@ -106,6 +106,6 @@ extern void enable_mmiotrace(void);
98525 extern void disable_mmiotrace(void);
98526 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
98527 extern void mmio_trace_mapping(struct mmiotrace_map *map);
98528-extern int mmio_trace_printk(const char *fmt, va_list args);
98529+extern __printf(1, 0) int mmio_trace_printk(const char *fmt, va_list args);
98530
98531 #endif /* _LINUX_MMIOTRACE_H */
98532diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
98533index 54d74f6..0728424 100644
98534--- a/include/linux/mmzone.h
98535+++ b/include/linux/mmzone.h
98536@@ -526,7 +526,7 @@ struct zone {
98537
98538 ZONE_PADDING(_pad3_)
98539 /* Zone statistics */
98540- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98541+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98542 } ____cacheline_internodealigned_in_smp;
98543
98544 enum zone_flags {
98545diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
98546index 3bfd567..72e7d8f 100644
98547--- a/include/linux/mod_devicetable.h
98548+++ b/include/linux/mod_devicetable.h
98549@@ -139,7 +139,7 @@ struct usb_device_id {
98550 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
98551 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
98552
98553-#define HID_ANY_ID (~0)
98554+#define HID_ANY_ID (~0U)
98555 #define HID_BUS_ANY 0xffff
98556 #define HID_GROUP_ANY 0x0000
98557
98558@@ -470,7 +470,7 @@ struct dmi_system_id {
98559 const char *ident;
98560 struct dmi_strmatch matches[4];
98561 void *driver_data;
98562-};
98563+} __do_const;
98564 /*
98565 * struct dmi_device_id appears during expansion of
98566 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
98567diff --git a/include/linux/module.h b/include/linux/module.h
98568index c883b86..516812e 100644
98569--- a/include/linux/module.h
98570+++ b/include/linux/module.h
98571@@ -17,9 +17,11 @@
98572 #include <linux/moduleparam.h>
98573 #include <linux/jump_label.h>
98574 #include <linux/export.h>
98575+#include <linux/fs.h>
98576
98577 #include <linux/percpu.h>
98578 #include <asm/module.h>
98579+#include <asm/pgtable.h>
98580
98581 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
98582 #define MODULE_SIG_STRING "~Module signature appended~\n"
98583@@ -42,7 +44,7 @@ struct module_kobject {
98584 struct kobject *drivers_dir;
98585 struct module_param_attrs *mp;
98586 struct completion *kobj_completion;
98587-};
98588+} __randomize_layout;
98589
98590 struct module_attribute {
98591 struct attribute attr;
98592@@ -54,12 +56,13 @@ struct module_attribute {
98593 int (*test)(struct module *);
98594 void (*free)(struct module *);
98595 };
98596+typedef struct module_attribute __no_const module_attribute_no_const;
98597
98598 struct module_version_attribute {
98599 struct module_attribute mattr;
98600 const char *module_name;
98601 const char *version;
98602-} __attribute__ ((__aligned__(sizeof(void *))));
98603+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
98604
98605 extern ssize_t __modver_version_show(struct module_attribute *,
98606 struct module_kobject *, char *);
98607@@ -221,7 +224,7 @@ struct module {
98608
98609 /* Sysfs stuff. */
98610 struct module_kobject mkobj;
98611- struct module_attribute *modinfo_attrs;
98612+ module_attribute_no_const *modinfo_attrs;
98613 const char *version;
98614 const char *srcversion;
98615 struct kobject *holders_dir;
98616@@ -270,19 +273,16 @@ struct module {
98617 int (*init)(void);
98618
98619 /* If this is non-NULL, vfree after init() returns */
98620- void *module_init;
98621+ void *module_init_rx, *module_init_rw;
98622
98623 /* Here is the actual code + data, vfree'd on unload. */
98624- void *module_core;
98625+ void *module_core_rx, *module_core_rw;
98626
98627 /* Here are the sizes of the init and core sections */
98628- unsigned int init_size, core_size;
98629+ unsigned int init_size_rw, core_size_rw;
98630
98631 /* The size of the executable code in each section. */
98632- unsigned int init_text_size, core_text_size;
98633-
98634- /* Size of RO sections of the module (text+rodata) */
98635- unsigned int init_ro_size, core_ro_size;
98636+ unsigned int init_size_rx, core_size_rx;
98637
98638 /* Arch-specific module values */
98639 struct mod_arch_specific arch;
98640@@ -340,6 +340,10 @@ struct module {
98641 unsigned int num_trace_events;
98642 struct trace_enum_map **trace_enums;
98643 unsigned int num_trace_enums;
98644+ struct file_operations trace_id;
98645+ struct file_operations trace_enable;
98646+ struct file_operations trace_format;
98647+ struct file_operations trace_filter;
98648 #endif
98649 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
98650 unsigned int num_ftrace_callsites;
98651@@ -367,7 +371,7 @@ struct module {
98652 ctor_fn_t *ctors;
98653 unsigned int num_ctors;
98654 #endif
98655-};
98656+} __randomize_layout;
98657 #ifndef MODULE_ARCH_INIT
98658 #define MODULE_ARCH_INIT {}
98659 #endif
98660@@ -388,18 +392,48 @@ bool is_module_address(unsigned long addr);
98661 bool is_module_percpu_address(unsigned long addr);
98662 bool is_module_text_address(unsigned long addr);
98663
98664+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
98665+{
98666+
98667+#ifdef CONFIG_PAX_KERNEXEC
98668+ if (ktla_ktva(addr) >= (unsigned long)start &&
98669+ ktla_ktva(addr) < (unsigned long)start + size)
98670+ return 1;
98671+#endif
98672+
98673+ return ((void *)addr >= start && (void *)addr < start + size);
98674+}
98675+
98676+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
98677+{
98678+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
98679+}
98680+
98681+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
98682+{
98683+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
98684+}
98685+
98686+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
98687+{
98688+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
98689+}
98690+
98691+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
98692+{
98693+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
98694+}
98695+
98696 static inline bool within_module_core(unsigned long addr,
98697 const struct module *mod)
98698 {
98699- return (unsigned long)mod->module_core <= addr &&
98700- addr < (unsigned long)mod->module_core + mod->core_size;
98701+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
98702 }
98703
98704 static inline bool within_module_init(unsigned long addr,
98705 const struct module *mod)
98706 {
98707- return (unsigned long)mod->module_init <= addr &&
98708- addr < (unsigned long)mod->module_init + mod->init_size;
98709+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
98710 }
98711
98712 static inline bool within_module(unsigned long addr, const struct module *mod)
98713diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
98714index 4d0cb9b..3169ac7 100644
98715--- a/include/linux/moduleloader.h
98716+++ b/include/linux/moduleloader.h
98717@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
98718 sections. Returns NULL on failure. */
98719 void *module_alloc(unsigned long size);
98720
98721+#ifdef CONFIG_PAX_KERNEXEC
98722+void *module_alloc_exec(unsigned long size);
98723+#else
98724+#define module_alloc_exec(x) module_alloc(x)
98725+#endif
98726+
98727 /* Free memory returned from module_alloc. */
98728 void module_memfree(void *module_region);
98729
98730+#ifdef CONFIG_PAX_KERNEXEC
98731+void module_memfree_exec(void *module_region);
98732+#else
98733+#define module_memfree_exec(x) module_memfree((x))
98734+#endif
98735+
98736 /*
98737 * Apply the given relocation to the (simplified) ELF. Return -error
98738 * or 0.
98739@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
98740 unsigned int relsec,
98741 struct module *me)
98742 {
98743+#ifdef CONFIG_MODULES
98744 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98745 module_name(me));
98746+#endif
98747 return -ENOEXEC;
98748 }
98749 #endif
98750@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
98751 unsigned int relsec,
98752 struct module *me)
98753 {
98754+#ifdef CONFIG_MODULES
98755 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98756 module_name(me));
98757+#endif
98758 return -ENOEXEC;
98759 }
98760 #endif
98761diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
98762index 1c9effa..1160bdd 100644
98763--- a/include/linux/moduleparam.h
98764+++ b/include/linux/moduleparam.h
98765@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
98766 * @len is usually just sizeof(string).
98767 */
98768 #define module_param_string(name, string, len, perm) \
98769- static const struct kparam_string __param_string_##name \
98770+ static const struct kparam_string __param_string_##name __used \
98771 = { len, string }; \
98772 __module_param_call(MODULE_PARAM_PREFIX, name, \
98773 &param_ops_string, \
98774@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
98775 */
98776 #define module_param_array_named(name, array, type, nump, perm) \
98777 param_check_##type(name, &(array)[0]); \
98778- static const struct kparam_array __param_arr_##name \
98779+ static const struct kparam_array __param_arr_##name __used \
98780 = { .max = ARRAY_SIZE(array), .num = nump, \
98781 .ops = &param_ops_##type, \
98782 .elemsize = sizeof(array[0]), .elem = array }; \
98783diff --git a/include/linux/mount.h b/include/linux/mount.h
98784index f822c3c..958ca0a 100644
98785--- a/include/linux/mount.h
98786+++ b/include/linux/mount.h
98787@@ -67,7 +67,7 @@ struct vfsmount {
98788 struct dentry *mnt_root; /* root of the mounted tree */
98789 struct super_block *mnt_sb; /* pointer to superblock */
98790 int mnt_flags;
98791-};
98792+} __randomize_layout;
98793
98794 struct file; /* forward dec */
98795 struct path;
98796diff --git a/include/linux/namei.h b/include/linux/namei.h
98797index c899077..b9a2010 100644
98798--- a/include/linux/namei.h
98799+++ b/include/linux/namei.h
98800@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
98801 extern void unlock_rename(struct dentry *, struct dentry *);
98802
98803 extern void nd_jump_link(struct nameidata *nd, struct path *path);
98804-extern void nd_set_link(struct nameidata *nd, char *path);
98805-extern char *nd_get_link(struct nameidata *nd);
98806+extern void nd_set_link(struct nameidata *nd, const char *path);
98807+extern const char *nd_get_link(const struct nameidata *nd);
98808
98809 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
98810 {
98811diff --git a/include/linux/net.h b/include/linux/net.h
98812index 738ea48..409dc09 100644
98813--- a/include/linux/net.h
98814+++ b/include/linux/net.h
98815@@ -190,7 +190,7 @@ struct net_proto_family {
98816 int (*create)(struct net *net, struct socket *sock,
98817 int protocol, int kern);
98818 struct module *owner;
98819-};
98820+} __do_const;
98821
98822 struct iovec;
98823 struct kvec;
98824diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
98825index 05b9a69..4d7e300 100644
98826--- a/include/linux/netdevice.h
98827+++ b/include/linux/netdevice.h
98828@@ -1208,6 +1208,7 @@ struct net_device_ops {
98829 u32 maxrate);
98830 int (*ndo_get_iflink)(const struct net_device *dev);
98831 };
98832+typedef struct net_device_ops __no_const net_device_ops_no_const;
98833
98834 /**
98835 * enum net_device_priv_flags - &struct net_device priv_flags
98836@@ -1515,7 +1516,7 @@ struct net_device {
98837 unsigned long base_addr;
98838 int irq;
98839
98840- atomic_t carrier_changes;
98841+ atomic_unchecked_t carrier_changes;
98842
98843 /*
98844 * Some hardware also needs these fields (state,dev_list,
98845@@ -1554,8 +1555,8 @@ struct net_device {
98846
98847 struct net_device_stats stats;
98848
98849- atomic_long_t rx_dropped;
98850- atomic_long_t tx_dropped;
98851+ atomic_long_unchecked_t rx_dropped;
98852+ atomic_long_unchecked_t tx_dropped;
98853
98854 #ifdef CONFIG_WIRELESS_EXT
98855 const struct iw_handler_def * wireless_handlers;
98856diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
98857index 63560d0..64aba5c 100644
98858--- a/include/linux/netfilter.h
98859+++ b/include/linux/netfilter.h
98860@@ -113,7 +113,7 @@ struct nf_sockopt_ops {
98861 #endif
98862 /* Use the module struct to lock set/get code in place */
98863 struct module *owner;
98864-};
98865+} __do_const;
98866
98867 /* Function to register/unregister hook points. */
98868 int nf_register_hook(struct nf_hook_ops *reg);
98869diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
98870index e955d47..04a5338 100644
98871--- a/include/linux/netfilter/nfnetlink.h
98872+++ b/include/linux/netfilter/nfnetlink.h
98873@@ -19,7 +19,7 @@ struct nfnl_callback {
98874 const struct nlattr * const cda[]);
98875 const struct nla_policy *policy; /* netlink attribute policy */
98876 const u_int16_t attr_count; /* number of nlattr's */
98877-};
98878+} __do_const;
98879
98880 struct nfnetlink_subsystem {
98881 const char *name;
98882diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
98883new file mode 100644
98884index 0000000..33f4af8
98885--- /dev/null
98886+++ b/include/linux/netfilter/xt_gradm.h
98887@@ -0,0 +1,9 @@
98888+#ifndef _LINUX_NETFILTER_XT_GRADM_H
98889+#define _LINUX_NETFILTER_XT_GRADM_H 1
98890+
98891+struct xt_gradm_mtinfo {
98892+ __u16 flags;
98893+ __u16 invflags;
98894+};
98895+
98896+#endif
98897diff --git a/include/linux/nls.h b/include/linux/nls.h
98898index 520681b..2b7fabb 100644
98899--- a/include/linux/nls.h
98900+++ b/include/linux/nls.h
98901@@ -31,7 +31,7 @@ struct nls_table {
98902 const unsigned char *charset2upper;
98903 struct module *owner;
98904 struct nls_table *next;
98905-};
98906+} __do_const;
98907
98908 /* this value hold the maximum octet of charset */
98909 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
98910@@ -46,7 +46,7 @@ enum utf16_endian {
98911 /* nls_base.c */
98912 extern int __register_nls(struct nls_table *, struct module *);
98913 extern int unregister_nls(struct nls_table *);
98914-extern struct nls_table *load_nls(char *);
98915+extern struct nls_table *load_nls(const char *);
98916 extern void unload_nls(struct nls_table *);
98917 extern struct nls_table *load_nls_default(void);
98918 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
98919diff --git a/include/linux/notifier.h b/include/linux/notifier.h
98920index d14a4c3..a078786 100644
98921--- a/include/linux/notifier.h
98922+++ b/include/linux/notifier.h
98923@@ -54,7 +54,8 @@ struct notifier_block {
98924 notifier_fn_t notifier_call;
98925 struct notifier_block __rcu *next;
98926 int priority;
98927-};
98928+} __do_const;
98929+typedef struct notifier_block __no_const notifier_block_no_const;
98930
98931 struct atomic_notifier_head {
98932 spinlock_t lock;
98933diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
98934index b2a0f15..4d7da32 100644
98935--- a/include/linux/oprofile.h
98936+++ b/include/linux/oprofile.h
98937@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
98938 int oprofilefs_create_ro_ulong(struct dentry * root,
98939 char const * name, ulong * val);
98940
98941-/** Create a file for read-only access to an atomic_t. */
98942+/** Create a file for read-only access to an atomic_unchecked_t. */
98943 int oprofilefs_create_ro_atomic(struct dentry * root,
98944- char const * name, atomic_t * val);
98945+ char const * name, atomic_unchecked_t * val);
98946
98947 /** create a directory */
98948 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
98949diff --git a/include/linux/padata.h b/include/linux/padata.h
98950index 4386946..f50c615 100644
98951--- a/include/linux/padata.h
98952+++ b/include/linux/padata.h
98953@@ -129,7 +129,7 @@ struct parallel_data {
98954 struct padata_serial_queue __percpu *squeue;
98955 atomic_t reorder_objects;
98956 atomic_t refcnt;
98957- atomic_t seq_nr;
98958+ atomic_unchecked_t seq_nr;
98959 struct padata_cpumask cpumask;
98960 spinlock_t lock ____cacheline_aligned;
98961 unsigned int processed;
98962diff --git a/include/linux/path.h b/include/linux/path.h
98963index d137218..be0c176 100644
98964--- a/include/linux/path.h
98965+++ b/include/linux/path.h
98966@@ -1,13 +1,15 @@
98967 #ifndef _LINUX_PATH_H
98968 #define _LINUX_PATH_H
98969
98970+#include <linux/compiler.h>
98971+
98972 struct dentry;
98973 struct vfsmount;
98974
98975 struct path {
98976 struct vfsmount *mnt;
98977 struct dentry *dentry;
98978-};
98979+} __randomize_layout;
98980
98981 extern void path_get(const struct path *);
98982 extern void path_put(const struct path *);
98983diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
98984index 8c78950..0d74ed9 100644
98985--- a/include/linux/pci_hotplug.h
98986+++ b/include/linux/pci_hotplug.h
98987@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
98988 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
98989 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
98990 int (*reset_slot) (struct hotplug_slot *slot, int probe);
98991-};
98992+} __do_const;
98993+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
98994
98995 /**
98996 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
98997diff --git a/include/linux/percpu.h b/include/linux/percpu.h
98998index caebf2a..4c3ae9d 100644
98999--- a/include/linux/percpu.h
99000+++ b/include/linux/percpu.h
99001@@ -34,7 +34,7 @@
99002 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
99003 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
99004 */
99005-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
99006+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
99007 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
99008
99009 /*
99010diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
99011index d8a82a8..8b580f0 100644
99012--- a/include/linux/perf_event.h
99013+++ b/include/linux/perf_event.h
99014@@ -379,8 +379,8 @@ struct perf_event {
99015
99016 enum perf_event_active_state state;
99017 unsigned int attach_state;
99018- local64_t count;
99019- atomic64_t child_count;
99020+ local64_t count; /* PaX: fix it one day */
99021+ atomic64_unchecked_t child_count;
99022
99023 /*
99024 * These are the total time in nanoseconds that the event
99025@@ -431,8 +431,8 @@ struct perf_event {
99026 * These accumulate total time (in nanoseconds) that children
99027 * events have been enabled and running, respectively.
99028 */
99029- atomic64_t child_total_time_enabled;
99030- atomic64_t child_total_time_running;
99031+ atomic64_unchecked_t child_total_time_enabled;
99032+ atomic64_unchecked_t child_total_time_running;
99033
99034 /*
99035 * Protect attach/detach and child_list:
99036@@ -812,7 +812,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
99037
99038 static inline u64 __perf_event_count(struct perf_event *event)
99039 {
99040- return local64_read(&event->count) + atomic64_read(&event->child_count);
99041+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
99042 }
99043
99044 extern void perf_event_mmap(struct vm_area_struct *vma);
99045@@ -836,7 +836,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
99046 entry->ip[entry->nr++] = ip;
99047 }
99048
99049-extern int sysctl_perf_event_paranoid;
99050+extern int sysctl_perf_event_legitimately_concerned;
99051 extern int sysctl_perf_event_mlock;
99052 extern int sysctl_perf_event_sample_rate;
99053 extern int sysctl_perf_cpu_time_max_percent;
99054@@ -851,19 +851,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
99055 loff_t *ppos);
99056
99057
99058+static inline bool perf_paranoid_any(void)
99059+{
99060+ return sysctl_perf_event_legitimately_concerned > 2;
99061+}
99062+
99063 static inline bool perf_paranoid_tracepoint_raw(void)
99064 {
99065- return sysctl_perf_event_paranoid > -1;
99066+ return sysctl_perf_event_legitimately_concerned > -1;
99067 }
99068
99069 static inline bool perf_paranoid_cpu(void)
99070 {
99071- return sysctl_perf_event_paranoid > 0;
99072+ return sysctl_perf_event_legitimately_concerned > 0;
99073 }
99074
99075 static inline bool perf_paranoid_kernel(void)
99076 {
99077- return sysctl_perf_event_paranoid > 1;
99078+ return sysctl_perf_event_legitimately_concerned > 1;
99079 }
99080
99081 extern void perf_event_init(void);
99082@@ -1017,7 +1022,7 @@ struct perf_pmu_events_attr {
99083 struct device_attribute attr;
99084 u64 id;
99085 const char *event_str;
99086-};
99087+} __do_const;
99088
99089 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
99090 char *page);
99091diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
99092index 918b117..7af374b7 100644
99093--- a/include/linux/pid_namespace.h
99094+++ b/include/linux/pid_namespace.h
99095@@ -45,7 +45,7 @@ struct pid_namespace {
99096 int hide_pid;
99097 int reboot; /* group exit code if this pidns was rebooted */
99098 struct ns_common ns;
99099-};
99100+} __randomize_layout;
99101
99102 extern struct pid_namespace init_pid_ns;
99103
99104diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
99105index eb8b8ac..62649e1 100644
99106--- a/include/linux/pipe_fs_i.h
99107+++ b/include/linux/pipe_fs_i.h
99108@@ -47,10 +47,10 @@ struct pipe_inode_info {
99109 struct mutex mutex;
99110 wait_queue_head_t wait;
99111 unsigned int nrbufs, curbuf, buffers;
99112- unsigned int readers;
99113- unsigned int writers;
99114- unsigned int files;
99115- unsigned int waiting_writers;
99116+ atomic_t readers;
99117+ atomic_t writers;
99118+ atomic_t files;
99119+ atomic_t waiting_writers;
99120 unsigned int r_counter;
99121 unsigned int w_counter;
99122 struct page *tmp_page;
99123diff --git a/include/linux/pm.h b/include/linux/pm.h
99124index 2d29c64..1b25b2a 100644
99125--- a/include/linux/pm.h
99126+++ b/include/linux/pm.h
99127@@ -616,6 +616,7 @@ struct dev_pm_domain {
99128 void (*sync)(struct device *dev);
99129 void (*dismiss)(struct device *dev);
99130 };
99131+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
99132
99133 /*
99134 * The PM_EVENT_ messages are also used by drivers implementing the legacy
99135diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
99136index 681ccb0..a90e0b7 100644
99137--- a/include/linux/pm_domain.h
99138+++ b/include/linux/pm_domain.h
99139@@ -39,11 +39,11 @@ struct gpd_dev_ops {
99140 int (*save_state)(struct device *dev);
99141 int (*restore_state)(struct device *dev);
99142 bool (*active_wakeup)(struct device *dev);
99143-};
99144+} __no_const;
99145
99146 struct gpd_cpuidle_data {
99147 unsigned int saved_exit_latency;
99148- struct cpuidle_state *idle_state;
99149+ cpuidle_state_no_const *idle_state;
99150 };
99151
99152 struct generic_pm_domain {
99153diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
99154index 30e84d4..22278b4 100644
99155--- a/include/linux/pm_runtime.h
99156+++ b/include/linux/pm_runtime.h
99157@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
99158
99159 static inline void pm_runtime_mark_last_busy(struct device *dev)
99160 {
99161- ACCESS_ONCE(dev->power.last_busy) = jiffies;
99162+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
99163 }
99164
99165 static inline bool pm_runtime_is_irq_safe(struct device *dev)
99166diff --git a/include/linux/pnp.h b/include/linux/pnp.h
99167index 5df733b..d55f252 100644
99168--- a/include/linux/pnp.h
99169+++ b/include/linux/pnp.h
99170@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
99171 struct pnp_fixup {
99172 char id[7];
99173 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
99174-};
99175+} __do_const;
99176
99177 /* config parameters */
99178 #define PNP_CONFIG_NORMAL 0x0001
99179diff --git a/include/linux/poison.h b/include/linux/poison.h
99180index 2110a81..13a11bb 100644
99181--- a/include/linux/poison.h
99182+++ b/include/linux/poison.h
99183@@ -19,8 +19,8 @@
99184 * under normal circumstances, used to verify that nobody uses
99185 * non-initialized list entries.
99186 */
99187-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
99188-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
99189+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
99190+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
99191
99192 /********** include/linux/timer.h **********/
99193 /*
99194diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
99195index d8b187c3..9a9257a 100644
99196--- a/include/linux/power/smartreflex.h
99197+++ b/include/linux/power/smartreflex.h
99198@@ -238,7 +238,7 @@ struct omap_sr_class_data {
99199 int (*notify)(struct omap_sr *sr, u32 status);
99200 u8 notify_flags;
99201 u8 class_type;
99202-};
99203+} __do_const;
99204
99205 /**
99206 * struct omap_sr_nvalue_table - Smartreflex n-target value info
99207diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
99208index 4ea1d37..80f4b33 100644
99209--- a/include/linux/ppp-comp.h
99210+++ b/include/linux/ppp-comp.h
99211@@ -84,7 +84,7 @@ struct compressor {
99212 struct module *owner;
99213 /* Extra skb space needed by the compressor algorithm */
99214 unsigned int comp_extra;
99215-};
99216+} __do_const;
99217
99218 /*
99219 * The return value from decompress routine is the length of the
99220diff --git a/include/linux/preempt.h b/include/linux/preempt.h
99221index de83b4e..c4b997d 100644
99222--- a/include/linux/preempt.h
99223+++ b/include/linux/preempt.h
99224@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
99225 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
99226 #endif
99227
99228+#define raw_preempt_count_add(val) __preempt_count_add(val)
99229+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
99230+
99231 #define __preempt_count_inc() __preempt_count_add(1)
99232 #define __preempt_count_dec() __preempt_count_sub(1)
99233
99234 #define preempt_count_inc() preempt_count_add(1)
99235+#define raw_preempt_count_inc() raw_preempt_count_add(1)
99236 #define preempt_count_dec() preempt_count_sub(1)
99237+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
99238
99239 #ifdef CONFIG_PREEMPT_COUNT
99240
99241@@ -41,6 +46,12 @@ do { \
99242 barrier(); \
99243 } while (0)
99244
99245+#define raw_preempt_disable() \
99246+do { \
99247+ raw_preempt_count_inc(); \
99248+ barrier(); \
99249+} while (0)
99250+
99251 #define sched_preempt_enable_no_resched() \
99252 do { \
99253 barrier(); \
99254@@ -49,6 +60,12 @@ do { \
99255
99256 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
99257
99258+#define raw_preempt_enable_no_resched() \
99259+do { \
99260+ barrier(); \
99261+ raw_preempt_count_dec(); \
99262+} while (0)
99263+
99264 #ifdef CONFIG_PREEMPT
99265 #define preempt_enable() \
99266 do { \
99267@@ -113,8 +130,10 @@ do { \
99268 * region.
99269 */
99270 #define preempt_disable() barrier()
99271+#define raw_preempt_disable() barrier()
99272 #define sched_preempt_enable_no_resched() barrier()
99273 #define preempt_enable_no_resched() barrier()
99274+#define raw_preempt_enable_no_resched() barrier()
99275 #define preempt_enable() barrier()
99276 #define preempt_check_resched() do { } while (0)
99277
99278@@ -128,11 +147,13 @@ do { \
99279 /*
99280 * Modules have no business playing preemption tricks.
99281 */
99282+#ifndef CONFIG_PAX_KERNEXEC
99283 #undef sched_preempt_enable_no_resched
99284 #undef preempt_enable_no_resched
99285 #undef preempt_enable_no_resched_notrace
99286 #undef preempt_check_resched
99287 #endif
99288+#endif
99289
99290 #define preempt_set_need_resched() \
99291 do { \
99292diff --git a/include/linux/printk.h b/include/linux/printk.h
99293index 9b30871..1aebc2d 100644
99294--- a/include/linux/printk.h
99295+++ b/include/linux/printk.h
99296@@ -120,7 +120,8 @@ static inline __printf(1, 2) __cold
99297 void early_printk(const char *s, ...) { }
99298 #endif
99299
99300-typedef int(*printk_func_t)(const char *fmt, va_list args);
99301+typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
99302+extern int kptr_restrict;
99303
99304 #ifdef CONFIG_PRINTK
99305 asmlinkage __printf(5, 0)
99306@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
99307
99308 extern int printk_delay_msec;
99309 extern int dmesg_restrict;
99310-extern int kptr_restrict;
99311
99312 extern void wake_up_klogd(void);
99313
99314@@ -164,7 +164,7 @@ char *log_buf_addr_get(void);
99315 u32 log_buf_len_get(void);
99316 void log_buf_kexec_setup(void);
99317 void __init setup_log_buf(int early);
99318-void dump_stack_set_arch_desc(const char *fmt, ...);
99319+__printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
99320 void dump_stack_print_info(const char *log_lvl);
99321 void show_regs_print_info(const char *log_lvl);
99322 #else
99323@@ -215,7 +215,7 @@ static inline void setup_log_buf(int early)
99324 {
99325 }
99326
99327-static inline void dump_stack_set_arch_desc(const char *fmt, ...)
99328+static inline __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...)
99329 {
99330 }
99331
99332diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
99333index b97bf2e..f14c92d4 100644
99334--- a/include/linux/proc_fs.h
99335+++ b/include/linux/proc_fs.h
99336@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
99337 extern struct proc_dir_entry *proc_symlink(const char *,
99338 struct proc_dir_entry *, const char *);
99339 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
99340+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
99341 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
99342 struct proc_dir_entry *, void *);
99343+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
99344+ struct proc_dir_entry *, void *);
99345 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
99346 struct proc_dir_entry *);
99347
99348@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
99349 return proc_create_data(name, mode, parent, proc_fops, NULL);
99350 }
99351
99352+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
99353+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
99354+{
99355+#ifdef CONFIG_GRKERNSEC_PROC_USER
99356+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
99357+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99358+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
99359+#else
99360+ return proc_create_data(name, mode, parent, proc_fops, NULL);
99361+#endif
99362+}
99363+
99364+
99365 extern void proc_set_size(struct proc_dir_entry *, loff_t);
99366 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
99367 extern void *PDE_DATA(const struct inode *);
99368@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
99369 struct proc_dir_entry *parent,const char *dest) { return NULL;}
99370 static inline struct proc_dir_entry *proc_mkdir(const char *name,
99371 struct proc_dir_entry *parent) {return NULL;}
99372+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
99373+ struct proc_dir_entry *parent) { return NULL; }
99374 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
99375 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99376+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
99377+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99378 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
99379 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
99380 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
99381@@ -79,7 +99,7 @@ struct net;
99382 static inline struct proc_dir_entry *proc_net_mkdir(
99383 struct net *net, const char *name, struct proc_dir_entry *parent)
99384 {
99385- return proc_mkdir_data(name, 0, parent, net);
99386+ return proc_mkdir_data_restrict(name, 0, parent, net);
99387 }
99388
99389 #endif /* _LINUX_PROC_FS_H */
99390diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
99391index 42dfc61..8113a99 100644
99392--- a/include/linux/proc_ns.h
99393+++ b/include/linux/proc_ns.h
99394@@ -16,7 +16,7 @@ struct proc_ns_operations {
99395 struct ns_common *(*get)(struct task_struct *task);
99396 void (*put)(struct ns_common *ns);
99397 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
99398-};
99399+} __do_const __randomize_layout;
99400
99401 extern const struct proc_ns_operations netns_operations;
99402 extern const struct proc_ns_operations utsns_operations;
99403diff --git a/include/linux/quota.h b/include/linux/quota.h
99404index b2505ac..5f7ab55 100644
99405--- a/include/linux/quota.h
99406+++ b/include/linux/quota.h
99407@@ -76,7 +76,7 @@ struct kqid { /* Type in which we store the quota identifier */
99408
99409 extern bool qid_eq(struct kqid left, struct kqid right);
99410 extern bool qid_lt(struct kqid left, struct kqid right);
99411-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
99412+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
99413 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
99414 extern bool qid_valid(struct kqid qid);
99415
99416diff --git a/include/linux/random.h b/include/linux/random.h
99417index b05856e..0a9f14e 100644
99418--- a/include/linux/random.h
99419+++ b/include/linux/random.h
99420@@ -9,9 +9,19 @@
99421 #include <uapi/linux/random.h>
99422
99423 extern void add_device_randomness(const void *, unsigned int);
99424+
99425+static inline void add_latent_entropy(void)
99426+{
99427+
99428+#ifdef LATENT_ENTROPY_PLUGIN
99429+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99430+#endif
99431+
99432+}
99433+
99434 extern void add_input_randomness(unsigned int type, unsigned int code,
99435- unsigned int value);
99436-extern void add_interrupt_randomness(int irq, int irq_flags);
99437+ unsigned int value) __latent_entropy;
99438+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
99439
99440 extern void get_random_bytes(void *buf, int nbytes);
99441 extern void get_random_bytes_arch(void *buf, int nbytes);
99442@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
99443 extern const struct file_operations random_fops, urandom_fops;
99444 #endif
99445
99446-unsigned int get_random_int(void);
99447+unsigned int __intentional_overflow(-1) get_random_int(void);
99448 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
99449
99450-u32 prandom_u32(void);
99451+u32 prandom_u32(void) __intentional_overflow(-1);
99452 void prandom_bytes(void *buf, size_t nbytes);
99453 void prandom_seed(u32 seed);
99454 void prandom_reseed_late(void);
99455@@ -37,6 +47,11 @@ struct rnd_state {
99456 u32 prandom_u32_state(struct rnd_state *state);
99457 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99458
99459+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
99460+{
99461+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
99462+}
99463+
99464 /**
99465 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
99466 * @ep_ro: right open interval endpoint
99467@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99468 *
99469 * Returns: pseudo-random number in interval [0, ep_ro)
99470 */
99471-static inline u32 prandom_u32_max(u32 ep_ro)
99472+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
99473 {
99474 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
99475 }
99476diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
99477index 378c5ee..aa84a47 100644
99478--- a/include/linux/rbtree_augmented.h
99479+++ b/include/linux/rbtree_augmented.h
99480@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
99481 old->rbaugmented = rbcompute(old); \
99482 } \
99483 rbstatic const struct rb_augment_callbacks rbname = { \
99484- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
99485+ .propagate = rbname ## _propagate, \
99486+ .copy = rbname ## _copy, \
99487+ .rotate = rbname ## _rotate \
99488 };
99489
99490
99491diff --git a/include/linux/rculist.h b/include/linux/rculist.h
99492index a18b16f..2683096 100644
99493--- a/include/linux/rculist.h
99494+++ b/include/linux/rculist.h
99495@@ -29,8 +29,8 @@
99496 */
99497 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
99498 {
99499- ACCESS_ONCE(list->next) = list;
99500- ACCESS_ONCE(list->prev) = list;
99501+ ACCESS_ONCE_RW(list->next) = list;
99502+ ACCESS_ONCE_RW(list->prev) = list;
99503 }
99504
99505 /*
99506@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
99507 struct list_head *prev, struct list_head *next);
99508 #endif
99509
99510+void __pax_list_add_rcu(struct list_head *new,
99511+ struct list_head *prev, struct list_head *next);
99512+
99513 /**
99514 * list_add_rcu - add a new entry to rcu-protected list
99515 * @new: new entry to be added
99516@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
99517 __list_add_rcu(new, head, head->next);
99518 }
99519
99520+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
99521+{
99522+ __pax_list_add_rcu(new, head, head->next);
99523+}
99524+
99525 /**
99526 * list_add_tail_rcu - add a new entry to rcu-protected list
99527 * @new: new entry to be added
99528@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
99529 __list_add_rcu(new, head->prev, head);
99530 }
99531
99532+static inline void pax_list_add_tail_rcu(struct list_head *new,
99533+ struct list_head *head)
99534+{
99535+ __pax_list_add_rcu(new, head->prev, head);
99536+}
99537+
99538 /**
99539 * list_del_rcu - deletes entry from list without re-initialization
99540 * @entry: the element to delete from the list.
99541@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
99542 entry->prev = LIST_POISON2;
99543 }
99544
99545+extern void pax_list_del_rcu(struct list_head *entry);
99546+
99547 /**
99548 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
99549 * @n: the element to delete from the hash list.
99550diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
99551index 573a5af..de97a14 100644
99552--- a/include/linux/rcupdate.h
99553+++ b/include/linux/rcupdate.h
99554@@ -365,7 +365,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
99555 do { \
99556 rcu_all_qs(); \
99557 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
99558- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
99559+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
99560 } while (0)
99561 #else /* #ifdef CONFIG_TASKS_RCU */
99562 #define TASKS_RCU(x) do { } while (0)
99563diff --git a/include/linux/reboot.h b/include/linux/reboot.h
99564index a7ff409..03e2fa8 100644
99565--- a/include/linux/reboot.h
99566+++ b/include/linux/reboot.h
99567@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
99568 */
99569
99570 extern void migrate_to_reboot_cpu(void);
99571-extern void machine_restart(char *cmd);
99572-extern void machine_halt(void);
99573-extern void machine_power_off(void);
99574+extern void machine_restart(char *cmd) __noreturn;
99575+extern void machine_halt(void) __noreturn;
99576+extern void machine_power_off(void) __noreturn;
99577
99578 extern void machine_shutdown(void);
99579 struct pt_regs;
99580@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
99581 */
99582
99583 extern void kernel_restart_prepare(char *cmd);
99584-extern void kernel_restart(char *cmd);
99585-extern void kernel_halt(void);
99586-extern void kernel_power_off(void);
99587+extern void kernel_restart(char *cmd) __noreturn;
99588+extern void kernel_halt(void) __noreturn;
99589+extern void kernel_power_off(void) __noreturn;
99590
99591 extern int C_A_D; /* for sysctl */
99592 void ctrl_alt_del(void);
99593@@ -77,7 +77,7 @@ extern void orderly_reboot(void);
99594 * Emergency restart, callable from an interrupt handler.
99595 */
99596
99597-extern void emergency_restart(void);
99598+extern void emergency_restart(void) __noreturn;
99599 #include <asm/emergency-restart.h>
99600
99601 #endif /* _LINUX_REBOOT_H */
99602diff --git a/include/linux/regset.h b/include/linux/regset.h
99603index 8e0c9fe..ac4d221 100644
99604--- a/include/linux/regset.h
99605+++ b/include/linux/regset.h
99606@@ -161,7 +161,8 @@ struct user_regset {
99607 unsigned int align;
99608 unsigned int bias;
99609 unsigned int core_note_type;
99610-};
99611+} __do_const;
99612+typedef struct user_regset __no_const user_regset_no_const;
99613
99614 /**
99615 * struct user_regset_view - available regsets
99616diff --git a/include/linux/relay.h b/include/linux/relay.h
99617index d7c8359..818daf5 100644
99618--- a/include/linux/relay.h
99619+++ b/include/linux/relay.h
99620@@ -157,7 +157,7 @@ struct rchan_callbacks
99621 * The callback should return 0 if successful, negative if not.
99622 */
99623 int (*remove_buf_file)(struct dentry *dentry);
99624-};
99625+} __no_const;
99626
99627 /*
99628 * CONFIG_RELAY kernel API, kernel/relay.c
99629diff --git a/include/linux/rio.h b/include/linux/rio.h
99630index 6bda06f..bf39a9b 100644
99631--- a/include/linux/rio.h
99632+++ b/include/linux/rio.h
99633@@ -358,7 +358,7 @@ struct rio_ops {
99634 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
99635 u64 rstart, u32 size, u32 flags);
99636 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
99637-};
99638+} __no_const;
99639
99640 #define RIO_RESOURCE_MEM 0x00000100
99641 #define RIO_RESOURCE_DOORBELL 0x00000200
99642diff --git a/include/linux/rmap.h b/include/linux/rmap.h
99643index c89c53a..aa0a65a 100644
99644--- a/include/linux/rmap.h
99645+++ b/include/linux/rmap.h
99646@@ -146,8 +146,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
99647 void anon_vma_init(void); /* create anon_vma_cachep */
99648 int anon_vma_prepare(struct vm_area_struct *);
99649 void unlink_anon_vmas(struct vm_area_struct *);
99650-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
99651-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
99652+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
99653+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
99654
99655 static inline void anon_vma_merge(struct vm_area_struct *vma,
99656 struct vm_area_struct *next)
99657diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
99658index ed8f9e70..2e627f2 100644
99659--- a/include/linux/scatterlist.h
99660+++ b/include/linux/scatterlist.h
99661@@ -1,6 +1,7 @@
99662 #ifndef _LINUX_SCATTERLIST_H
99663 #define _LINUX_SCATTERLIST_H
99664
99665+#include <linux/sched.h>
99666 #include <linux/string.h>
99667 #include <linux/bug.h>
99668 #include <linux/mm.h>
99669@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
99670 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
99671 unsigned int buflen)
99672 {
99673+ const void *realbuf = buf;
99674+
99675+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99676+ if (object_starts_on_stack(buf))
99677+ realbuf = buf - current->stack + current->lowmem_stack;
99678+#endif
99679+
99680 #ifdef CONFIG_DEBUG_SG
99681- BUG_ON(!virt_addr_valid(buf));
99682+ BUG_ON(!virt_addr_valid(realbuf));
99683 #endif
99684- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
99685+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
99686 }
99687
99688 /*
99689diff --git a/include/linux/sched.h b/include/linux/sched.h
99690index 26a2e61..36bbf4b 100644
99691--- a/include/linux/sched.h
99692+++ b/include/linux/sched.h
99693@@ -132,6 +132,7 @@ struct fs_struct;
99694 struct perf_event_context;
99695 struct blk_plug;
99696 struct filename;
99697+struct linux_binprm;
99698
99699 #define VMACACHE_BITS 2
99700 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
99701@@ -413,7 +414,7 @@ extern char __sched_text_start[], __sched_text_end[];
99702 extern int in_sched_functions(unsigned long addr);
99703
99704 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
99705-extern signed long schedule_timeout(signed long timeout);
99706+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
99707 extern signed long schedule_timeout_interruptible(signed long timeout);
99708 extern signed long schedule_timeout_killable(signed long timeout);
99709 extern signed long schedule_timeout_uninterruptible(signed long timeout);
99710@@ -431,6 +432,19 @@ struct nsproxy;
99711 struct user_namespace;
99712
99713 #ifdef CONFIG_MMU
99714+
99715+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
99716+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
99717+#else
99718+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
99719+{
99720+ return 0;
99721+}
99722+#endif
99723+
99724+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
99725+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
99726+
99727 extern void arch_pick_mmap_layout(struct mm_struct *mm);
99728 extern unsigned long
99729 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
99730@@ -729,6 +743,17 @@ struct signal_struct {
99731 #ifdef CONFIG_TASKSTATS
99732 struct taskstats *stats;
99733 #endif
99734+
99735+#ifdef CONFIG_GRKERNSEC
99736+ u32 curr_ip;
99737+ u32 saved_ip;
99738+ u32 gr_saddr;
99739+ u32 gr_daddr;
99740+ u16 gr_sport;
99741+ u16 gr_dport;
99742+ u8 used_accept:1;
99743+#endif
99744+
99745 #ifdef CONFIG_AUDIT
99746 unsigned audit_tty;
99747 unsigned audit_tty_log_passwd;
99748@@ -755,7 +780,7 @@ struct signal_struct {
99749 struct mutex cred_guard_mutex; /* guard against foreign influences on
99750 * credential calculations
99751 * (notably. ptrace) */
99752-};
99753+} __randomize_layout;
99754
99755 /*
99756 * Bits in flags field of signal_struct.
99757@@ -808,6 +833,14 @@ struct user_struct {
99758 struct key *session_keyring; /* UID's default session keyring */
99759 #endif
99760
99761+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
99762+ unsigned char kernel_banned;
99763+#endif
99764+#ifdef CONFIG_GRKERNSEC_BRUTE
99765+ unsigned char suid_banned;
99766+ unsigned long suid_ban_expires;
99767+#endif
99768+
99769 /* Hash table maintenance information */
99770 struct hlist_node uidhash_node;
99771 kuid_t uid;
99772@@ -815,7 +848,7 @@ struct user_struct {
99773 #ifdef CONFIG_PERF_EVENTS
99774 atomic_long_t locked_vm;
99775 #endif
99776-};
99777+} __randomize_layout;
99778
99779 extern int uids_sysfs_init(void);
99780
99781@@ -1292,6 +1325,9 @@ enum perf_event_task_context {
99782 struct task_struct {
99783 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
99784 void *stack;
99785+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99786+ void *lowmem_stack;
99787+#endif
99788 atomic_t usage;
99789 unsigned int flags; /* per process flags, defined below */
99790 unsigned int ptrace;
99791@@ -1425,8 +1461,8 @@ struct task_struct {
99792 struct list_head thread_node;
99793
99794 struct completion *vfork_done; /* for vfork() */
99795- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
99796- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99797+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
99798+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99799
99800 cputime_t utime, stime, utimescaled, stimescaled;
99801 cputime_t gtime;
99802@@ -1451,11 +1487,6 @@ struct task_struct {
99803 struct task_cputime cputime_expires;
99804 struct list_head cpu_timers[3];
99805
99806-/* process credentials */
99807- const struct cred __rcu *real_cred; /* objective and real subjective task
99808- * credentials (COW) */
99809- const struct cred __rcu *cred; /* effective (overridable) subjective task
99810- * credentials (COW) */
99811 char comm[TASK_COMM_LEN]; /* executable name excluding path
99812 - access with [gs]et_task_comm (which lock
99813 it with task_lock())
99814@@ -1473,6 +1504,10 @@ struct task_struct {
99815 #endif
99816 /* CPU-specific state of this task */
99817 struct thread_struct thread;
99818+/* thread_info moved to task_struct */
99819+#ifdef CONFIG_X86
99820+ struct thread_info tinfo;
99821+#endif
99822 /* filesystem information */
99823 struct fs_struct *fs;
99824 /* open file information */
99825@@ -1547,6 +1582,10 @@ struct task_struct {
99826 gfp_t lockdep_reclaim_gfp;
99827 #endif
99828
99829+/* process credentials */
99830+ const struct cred __rcu *real_cred; /* objective and real subjective task
99831+ * credentials (COW) */
99832+
99833 /* journalling filesystem info */
99834 void *journal_info;
99835
99836@@ -1585,6 +1624,10 @@ struct task_struct {
99837 /* cg_list protected by css_set_lock and tsk->alloc_lock */
99838 struct list_head cg_list;
99839 #endif
99840+
99841+ const struct cred __rcu *cred; /* effective (overridable) subjective task
99842+ * credentials (COW) */
99843+
99844 #ifdef CONFIG_FUTEX
99845 struct robust_list_head __user *robust_list;
99846 #ifdef CONFIG_COMPAT
99847@@ -1696,7 +1739,7 @@ struct task_struct {
99848 * Number of functions that haven't been traced
99849 * because of depth overrun.
99850 */
99851- atomic_t trace_overrun;
99852+ atomic_unchecked_t trace_overrun;
99853 /* Pause for the tracing */
99854 atomic_t tracing_graph_pause;
99855 #endif
99856@@ -1724,7 +1767,78 @@ struct task_struct {
99857 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
99858 unsigned long task_state_change;
99859 #endif
99860-};
99861+
99862+#ifdef CONFIG_GRKERNSEC
99863+ /* grsecurity */
99864+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99865+ u64 exec_id;
99866+#endif
99867+#ifdef CONFIG_GRKERNSEC_SETXID
99868+ const struct cred *delayed_cred;
99869+#endif
99870+ struct dentry *gr_chroot_dentry;
99871+ struct acl_subject_label *acl;
99872+ struct acl_subject_label *tmpacl;
99873+ struct acl_role_label *role;
99874+ struct file *exec_file;
99875+ unsigned long brute_expires;
99876+ u16 acl_role_id;
99877+ u8 inherited;
99878+ /* is this the task that authenticated to the special role */
99879+ u8 acl_sp_role;
99880+ u8 is_writable;
99881+ u8 brute;
99882+ u8 gr_is_chrooted;
99883+#endif
99884+
99885+} __randomize_layout;
99886+
99887+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
99888+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
99889+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
99890+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
99891+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
99892+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
99893+
99894+#ifdef CONFIG_PAX_SOFTMODE
99895+extern int pax_softmode;
99896+#endif
99897+
99898+extern int pax_check_flags(unsigned long *);
99899+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
99900+
99901+/* if tsk != current then task_lock must be held on it */
99902+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
99903+static inline unsigned long pax_get_flags(struct task_struct *tsk)
99904+{
99905+ if (likely(tsk->mm))
99906+ return tsk->mm->pax_flags;
99907+ else
99908+ return 0UL;
99909+}
99910+
99911+/* if tsk != current then task_lock must be held on it */
99912+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
99913+{
99914+ if (likely(tsk->mm)) {
99915+ tsk->mm->pax_flags = flags;
99916+ return 0;
99917+ }
99918+ return -EINVAL;
99919+}
99920+#endif
99921+
99922+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
99923+extern void pax_set_initial_flags(struct linux_binprm *bprm);
99924+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
99925+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
99926+#endif
99927+
99928+struct path;
99929+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
99930+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
99931+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
99932+extern void pax_report_refcount_overflow(struct pt_regs *regs);
99933
99934 /* Future-safe accessor for struct task_struct's cpus_allowed. */
99935 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
99936@@ -1807,7 +1921,7 @@ struct pid_namespace;
99937 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
99938 struct pid_namespace *ns);
99939
99940-static inline pid_t task_pid_nr(struct task_struct *tsk)
99941+static inline pid_t task_pid_nr(const struct task_struct *tsk)
99942 {
99943 return tsk->pid;
99944 }
99945@@ -2175,6 +2289,25 @@ extern u64 sched_clock_cpu(int cpu);
99946
99947 extern void sched_clock_init(void);
99948
99949+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99950+static inline void populate_stack(void)
99951+{
99952+ struct task_struct *curtask = current;
99953+ int c;
99954+ int *ptr = curtask->stack;
99955+ int *end = curtask->stack + THREAD_SIZE;
99956+
99957+ while (ptr < end) {
99958+ c = *(volatile int *)ptr;
99959+ ptr += PAGE_SIZE/sizeof(int);
99960+ }
99961+}
99962+#else
99963+static inline void populate_stack(void)
99964+{
99965+}
99966+#endif
99967+
99968 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
99969 static inline void sched_clock_tick(void)
99970 {
99971@@ -2303,7 +2436,9 @@ extern void set_curr_task(int cpu, struct task_struct *p);
99972 void yield(void);
99973
99974 union thread_union {
99975+#ifndef CONFIG_X86
99976 struct thread_info thread_info;
99977+#endif
99978 unsigned long stack[THREAD_SIZE/sizeof(long)];
99979 };
99980
99981@@ -2336,6 +2471,7 @@ extern struct pid_namespace init_pid_ns;
99982 */
99983
99984 extern struct task_struct *find_task_by_vpid(pid_t nr);
99985+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
99986 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
99987 struct pid_namespace *ns);
99988
99989@@ -2500,7 +2636,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
99990 extern void exit_itimers(struct signal_struct *);
99991 extern void flush_itimer_signals(void);
99992
99993-extern void do_group_exit(int);
99994+extern __noreturn void do_group_exit(int);
99995
99996 extern int do_execve(struct filename *,
99997 const char __user * const __user *,
99998@@ -2721,9 +2857,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
99999 #define task_stack_end_corrupted(task) \
100000 (*(end_of_stack(task)) != STACK_END_MAGIC)
100001
100002-static inline int object_is_on_stack(void *obj)
100003+static inline int object_starts_on_stack(const void *obj)
100004 {
100005- void *stack = task_stack_page(current);
100006+ const void *stack = task_stack_page(current);
100007
100008 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
100009 }
100010diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
100011index 596a0e0..bea77ec 100644
100012--- a/include/linux/sched/sysctl.h
100013+++ b/include/linux/sched/sysctl.h
100014@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
100015 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
100016
100017 extern int sysctl_max_map_count;
100018+extern unsigned long sysctl_heap_stack_gap;
100019
100020 extern unsigned int sysctl_sched_latency;
100021 extern unsigned int sysctl_sched_min_granularity;
100022diff --git a/include/linux/security.h b/include/linux/security.h
100023index 18264ea..e0238e4 100644
100024--- a/include/linux/security.h
100025+++ b/include/linux/security.h
100026@@ -27,6 +27,7 @@
100027 #include <linux/slab.h>
100028 #include <linux/err.h>
100029 #include <linux/string.h>
100030+#include <linux/grsecurity.h>
100031
100032 struct linux_binprm;
100033 struct cred;
100034@@ -116,8 +117,6 @@ struct seq_file;
100035
100036 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
100037
100038-void reset_security_ops(void);
100039-
100040 #ifdef CONFIG_MMU
100041 extern unsigned long mmap_min_addr;
100042 extern unsigned long dac_mmap_min_addr;
100043@@ -1755,7 +1754,7 @@ struct security_operations {
100044 struct audit_context *actx);
100045 void (*audit_rule_free) (void *lsmrule);
100046 #endif /* CONFIG_AUDIT */
100047-};
100048+} __randomize_layout;
100049
100050 /* prototypes */
100051 extern int security_init(void);
100052diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
100053index dc368b8..e895209 100644
100054--- a/include/linux/semaphore.h
100055+++ b/include/linux/semaphore.h
100056@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
100057 }
100058
100059 extern void down(struct semaphore *sem);
100060-extern int __must_check down_interruptible(struct semaphore *sem);
100061+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
100062 extern int __must_check down_killable(struct semaphore *sem);
100063 extern int __must_check down_trylock(struct semaphore *sem);
100064 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
100065diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
100066index afbb1fd..e1d205d 100644
100067--- a/include/linux/seq_file.h
100068+++ b/include/linux/seq_file.h
100069@@ -27,6 +27,9 @@ struct seq_file {
100070 struct mutex lock;
100071 const struct seq_operations *op;
100072 int poll_event;
100073+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
100074+ u64 exec_id;
100075+#endif
100076 #ifdef CONFIG_USER_NS
100077 struct user_namespace *user_ns;
100078 #endif
100079@@ -39,6 +42,7 @@ struct seq_operations {
100080 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
100081 int (*show) (struct seq_file *m, void *v);
100082 };
100083+typedef struct seq_operations __no_const seq_operations_no_const;
100084
100085 #define SEQ_SKIP 1
100086
100087@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
100088
100089 char *mangle_path(char *s, const char *p, const char *esc);
100090 int seq_open(struct file *, const struct seq_operations *);
100091+int seq_open_restrict(struct file *, const struct seq_operations *);
100092 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
100093 loff_t seq_lseek(struct file *, loff_t, int);
100094 int seq_release(struct inode *, struct file *);
100095@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
100096 const struct path *root, const char *esc);
100097
100098 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
100099+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
100100 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
100101 int single_release(struct inode *, struct file *);
100102 void *__seq_open_private(struct file *, const struct seq_operations *, int);
100103diff --git a/include/linux/shm.h b/include/linux/shm.h
100104index 6fb8016..ab4465e 100644
100105--- a/include/linux/shm.h
100106+++ b/include/linux/shm.h
100107@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
100108 /* The task created the shm object. NULL if the task is dead. */
100109 struct task_struct *shm_creator;
100110 struct list_head shm_clist; /* list by creator */
100111+#ifdef CONFIG_GRKERNSEC
100112+ u64 shm_createtime;
100113+ pid_t shm_lapid;
100114+#endif
100115 };
100116
100117 /* shm_mode upper byte flags */
100118diff --git a/include/linux/signal.h b/include/linux/signal.h
100119index ab1e039..ad4229e 100644
100120--- a/include/linux/signal.h
100121+++ b/include/linux/signal.h
100122@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
100123 * know it'll be handled, so that they don't get converted to
100124 * SIGKILL or just silently dropped.
100125 */
100126- kernel_sigaction(sig, (__force __sighandler_t)2);
100127+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
100128 }
100129
100130 static inline void disallow_signal(int sig)
100131diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
100132index f15154a..72cf02c 100644
100133--- a/include/linux/skbuff.h
100134+++ b/include/linux/skbuff.h
100135@@ -776,7 +776,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
100136 int node);
100137 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
100138 struct sk_buff *build_skb(void *data, unsigned int frag_size);
100139-static inline struct sk_buff *alloc_skb(unsigned int size,
100140+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
100141 gfp_t priority)
100142 {
100143 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
100144@@ -1971,7 +1971,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
100145 return skb->inner_transport_header - skb->inner_network_header;
100146 }
100147
100148-static inline int skb_network_offset(const struct sk_buff *skb)
100149+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
100150 {
100151 return skb_network_header(skb) - skb->data;
100152 }
100153@@ -2031,7 +2031,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
100154 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
100155 */
100156 #ifndef NET_SKB_PAD
100157-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
100158+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
100159 #endif
100160
100161 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
100162@@ -2673,9 +2673,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
100163 int *err);
100164 unsigned int datagram_poll(struct file *file, struct socket *sock,
100165 struct poll_table_struct *wait);
100166-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100167+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100168 struct iov_iter *to, int size);
100169-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100170+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100171 struct msghdr *msg, int size)
100172 {
100173 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
100174@@ -3197,6 +3197,9 @@ static inline void nf_reset(struct sk_buff *skb)
100175 nf_bridge_put(skb->nf_bridge);
100176 skb->nf_bridge = NULL;
100177 #endif
100178+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
100179+ skb->nf_trace = 0;
100180+#endif
100181 }
100182
100183 static inline void nf_reset_trace(struct sk_buff *skb)
100184diff --git a/include/linux/slab.h b/include/linux/slab.h
100185index ffd24c8..cbbe7de 100644
100186--- a/include/linux/slab.h
100187+++ b/include/linux/slab.h
100188@@ -15,14 +15,29 @@
100189 #include <linux/types.h>
100190 #include <linux/workqueue.h>
100191
100192+#include <linux/err.h>
100193
100194 /*
100195 * Flags to pass to kmem_cache_create().
100196 * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
100197 */
100198 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
100199+
100200+#ifdef CONFIG_PAX_USERCOPY_SLABS
100201+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
100202+#else
100203+#define SLAB_USERCOPY 0x00000000UL
100204+#endif
100205+
100206 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
100207 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
100208+
100209+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100210+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
100211+#else
100212+#define SLAB_NO_SANITIZE 0x00000000UL
100213+#endif
100214+
100215 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
100216 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
100217 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
100218@@ -98,10 +113,13 @@
100219 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
100220 * Both make kfree a no-op.
100221 */
100222-#define ZERO_SIZE_PTR ((void *)16)
100223+#define ZERO_SIZE_PTR \
100224+({ \
100225+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
100226+ (void *)(-MAX_ERRNO-1L); \
100227+})
100228
100229-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
100230- (unsigned long)ZERO_SIZE_PTR)
100231+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
100232
100233 #include <linux/kmemleak.h>
100234 #include <linux/kasan.h>
100235@@ -143,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
100236 void kfree(const void *);
100237 void kzfree(const void *);
100238 size_t ksize(const void *);
100239+const char *check_heap_object(const void *ptr, unsigned long n);
100240+bool is_usercopy_object(const void *ptr);
100241
100242 /*
100243 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
100244@@ -235,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
100245 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100246 #endif
100247
100248+#ifdef CONFIG_PAX_USERCOPY_SLABS
100249+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
100250+#endif
100251+
100252 /*
100253 * Figure out which kmalloc slab an allocation of a certain size
100254 * belongs to.
100255@@ -243,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100256 * 2 = 120 .. 192 bytes
100257 * n = 2^(n-1) .. 2^n -1
100258 */
100259-static __always_inline int kmalloc_index(size_t size)
100260+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
100261 {
100262 if (!size)
100263 return 0;
100264@@ -286,15 +310,15 @@ static __always_inline int kmalloc_index(size_t size)
100265 }
100266 #endif /* !CONFIG_SLOB */
100267
100268-void *__kmalloc(size_t size, gfp_t flags);
100269+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
100270 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
100271 void kmem_cache_free(struct kmem_cache *, void *);
100272
100273 #ifdef CONFIG_NUMA
100274-void *__kmalloc_node(size_t size, gfp_t flags, int node);
100275+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
100276 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
100277 #else
100278-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
100279+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100280 {
100281 return __kmalloc(size, flags);
100282 }
100283diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
100284index 33d0490..70a6313 100644
100285--- a/include/linux/slab_def.h
100286+++ b/include/linux/slab_def.h
100287@@ -40,7 +40,7 @@ struct kmem_cache {
100288 /* 4) cache creation/removal */
100289 const char *name;
100290 struct list_head list;
100291- int refcount;
100292+ atomic_t refcount;
100293 int object_size;
100294 int align;
100295
100296@@ -56,10 +56,14 @@ struct kmem_cache {
100297 unsigned long node_allocs;
100298 unsigned long node_frees;
100299 unsigned long node_overflow;
100300- atomic_t allochit;
100301- atomic_t allocmiss;
100302- atomic_t freehit;
100303- atomic_t freemiss;
100304+ atomic_unchecked_t allochit;
100305+ atomic_unchecked_t allocmiss;
100306+ atomic_unchecked_t freehit;
100307+ atomic_unchecked_t freemiss;
100308+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100309+ atomic_unchecked_t sanitized;
100310+ atomic_unchecked_t not_sanitized;
100311+#endif
100312
100313 /*
100314 * If debugging is enabled, then the allocator can add additional
100315diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
100316index 3388511..6252f90 100644
100317--- a/include/linux/slub_def.h
100318+++ b/include/linux/slub_def.h
100319@@ -74,7 +74,7 @@ struct kmem_cache {
100320 struct kmem_cache_order_objects max;
100321 struct kmem_cache_order_objects min;
100322 gfp_t allocflags; /* gfp flags to use on each alloc */
100323- int refcount; /* Refcount for slab cache destroy */
100324+ atomic_t refcount; /* Refcount for slab cache destroy */
100325 void (*ctor)(void *);
100326 int inuse; /* Offset to metadata */
100327 int align; /* Alignment */
100328diff --git a/include/linux/smp.h b/include/linux/smp.h
100329index c441407..f487b83 100644
100330--- a/include/linux/smp.h
100331+++ b/include/linux/smp.h
100332@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
100333 #endif
100334
100335 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
100336+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
100337 #define put_cpu() preempt_enable()
100338+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
100339
100340 /*
100341 * Callback to arch code if there's nosmp or maxcpus=0 on the
100342diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
100343index 083ac38..b23e3e8 100644
100344--- a/include/linux/sock_diag.h
100345+++ b/include/linux/sock_diag.h
100346@@ -11,7 +11,7 @@ struct sock;
100347 struct sock_diag_handler {
100348 __u8 family;
100349 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
100350-};
100351+} __do_const;
100352
100353 int sock_diag_register(const struct sock_diag_handler *h);
100354 void sock_diag_unregister(const struct sock_diag_handler *h);
100355diff --git a/include/linux/sonet.h b/include/linux/sonet.h
100356index 680f9a3..f13aeb0 100644
100357--- a/include/linux/sonet.h
100358+++ b/include/linux/sonet.h
100359@@ -7,7 +7,7 @@
100360 #include <uapi/linux/sonet.h>
100361
100362 struct k_sonet_stats {
100363-#define __HANDLE_ITEM(i) atomic_t i
100364+#define __HANDLE_ITEM(i) atomic_unchecked_t i
100365 __SONET_ITEMS
100366 #undef __HANDLE_ITEM
100367 };
100368diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
100369index 07d8e53..dc934c9 100644
100370--- a/include/linux/sunrpc/addr.h
100371+++ b/include/linux/sunrpc/addr.h
100372@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
100373 {
100374 switch (sap->sa_family) {
100375 case AF_INET:
100376- return ntohs(((struct sockaddr_in *)sap)->sin_port);
100377+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
100378 case AF_INET6:
100379- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
100380+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
100381 }
100382 return 0;
100383 }
100384@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
100385 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
100386 const struct sockaddr *src)
100387 {
100388- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
100389+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
100390 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
100391
100392 dsin->sin_family = ssin->sin_family;
100393@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
100394 if (sa->sa_family != AF_INET6)
100395 return 0;
100396
100397- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
100398+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
100399 }
100400
100401 #endif /* _LINUX_SUNRPC_ADDR_H */
100402diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
100403index 598ba80..d90cba6 100644
100404--- a/include/linux/sunrpc/clnt.h
100405+++ b/include/linux/sunrpc/clnt.h
100406@@ -100,7 +100,7 @@ struct rpc_procinfo {
100407 unsigned int p_timer; /* Which RTT timer to use */
100408 u32 p_statidx; /* Which procedure to account */
100409 const char * p_name; /* name of procedure */
100410-};
100411+} __do_const;
100412
100413 #ifdef __KERNEL__
100414
100415diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
100416index fae6fb9..023fbcd 100644
100417--- a/include/linux/sunrpc/svc.h
100418+++ b/include/linux/sunrpc/svc.h
100419@@ -420,7 +420,7 @@ struct svc_procedure {
100420 unsigned int pc_count; /* call count */
100421 unsigned int pc_cachetype; /* cache info (NFS) */
100422 unsigned int pc_xdrressize; /* maximum size of XDR reply */
100423-};
100424+} __do_const;
100425
100426 /*
100427 * Function prototypes.
100428diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
100429index df8edf8..d140fec 100644
100430--- a/include/linux/sunrpc/svc_rdma.h
100431+++ b/include/linux/sunrpc/svc_rdma.h
100432@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
100433 extern unsigned int svcrdma_max_requests;
100434 extern unsigned int svcrdma_max_req_size;
100435
100436-extern atomic_t rdma_stat_recv;
100437-extern atomic_t rdma_stat_read;
100438-extern atomic_t rdma_stat_write;
100439-extern atomic_t rdma_stat_sq_starve;
100440-extern atomic_t rdma_stat_rq_starve;
100441-extern atomic_t rdma_stat_rq_poll;
100442-extern atomic_t rdma_stat_rq_prod;
100443-extern atomic_t rdma_stat_sq_poll;
100444-extern atomic_t rdma_stat_sq_prod;
100445+extern atomic_unchecked_t rdma_stat_recv;
100446+extern atomic_unchecked_t rdma_stat_read;
100447+extern atomic_unchecked_t rdma_stat_write;
100448+extern atomic_unchecked_t rdma_stat_sq_starve;
100449+extern atomic_unchecked_t rdma_stat_rq_starve;
100450+extern atomic_unchecked_t rdma_stat_rq_poll;
100451+extern atomic_unchecked_t rdma_stat_rq_prod;
100452+extern atomic_unchecked_t rdma_stat_sq_poll;
100453+extern atomic_unchecked_t rdma_stat_sq_prod;
100454
100455 /*
100456 * Contexts are built when an RDMA request is created and are a
100457diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
100458index 8d71d65..f79586e 100644
100459--- a/include/linux/sunrpc/svcauth.h
100460+++ b/include/linux/sunrpc/svcauth.h
100461@@ -120,7 +120,7 @@ struct auth_ops {
100462 int (*release)(struct svc_rqst *rq);
100463 void (*domain_release)(struct auth_domain *);
100464 int (*set_client)(struct svc_rqst *rq);
100465-};
100466+} __do_const;
100467
100468 #define SVC_GARBAGE 1
100469 #define SVC_SYSERR 2
100470diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
100471index e7a018e..49f8b17 100644
100472--- a/include/linux/swiotlb.h
100473+++ b/include/linux/swiotlb.h
100474@@ -60,7 +60,8 @@ extern void
100475
100476 extern void
100477 swiotlb_free_coherent(struct device *hwdev, size_t size,
100478- void *vaddr, dma_addr_t dma_handle);
100479+ void *vaddr, dma_addr_t dma_handle,
100480+ struct dma_attrs *attrs);
100481
100482 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
100483 unsigned long offset, size_t size,
100484diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
100485index 76d1e38..200776e 100644
100486--- a/include/linux/syscalls.h
100487+++ b/include/linux/syscalls.h
100488@@ -102,7 +102,12 @@ union bpf_attr;
100489 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
100490 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
100491 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
100492-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
100493+#define __SC_LONG(t, a) __typeof__( \
100494+ __builtin_choose_expr( \
100495+ sizeof(t) > sizeof(int), \
100496+ (t) 0, \
100497+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
100498+ )) a
100499 #define __SC_CAST(t, a) (t) a
100500 #define __SC_ARGS(t, a) a
100501 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
100502@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
100503 asmlinkage long sys_fsync(unsigned int fd);
100504 asmlinkage long sys_fdatasync(unsigned int fd);
100505 asmlinkage long sys_bdflush(int func, long data);
100506-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
100507- char __user *type, unsigned long flags,
100508+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
100509+ const char __user *type, unsigned long flags,
100510 void __user *data);
100511-asmlinkage long sys_umount(char __user *name, int flags);
100512-asmlinkage long sys_oldumount(char __user *name);
100513+asmlinkage long sys_umount(const char __user *name, int flags);
100514+asmlinkage long sys_oldumount(const char __user *name);
100515 asmlinkage long sys_truncate(const char __user *path, long length);
100516 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
100517 asmlinkage long sys_stat(const char __user *filename,
100518@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
100519 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
100520 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
100521 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
100522- struct sockaddr __user *, int);
100523+ struct sockaddr __user *, int) __intentional_overflow(0);
100524 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
100525 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
100526 unsigned int vlen, unsigned flags);
100527@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
100528
100529 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
100530 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
100531- unsigned nsops);
100532+ long nsops);
100533 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
100534 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
100535- unsigned nsops,
100536+ long nsops,
100537 const struct timespec __user *timeout);
100538 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
100539 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
100540diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
100541index 27b3b0b..e093dd9 100644
100542--- a/include/linux/syscore_ops.h
100543+++ b/include/linux/syscore_ops.h
100544@@ -16,7 +16,7 @@ struct syscore_ops {
100545 int (*suspend)(void);
100546 void (*resume)(void);
100547 void (*shutdown)(void);
100548-};
100549+} __do_const;
100550
100551 extern void register_syscore_ops(struct syscore_ops *ops);
100552 extern void unregister_syscore_ops(struct syscore_ops *ops);
100553diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
100554index fa7bc29..0d96561 100644
100555--- a/include/linux/sysctl.h
100556+++ b/include/linux/sysctl.h
100557@@ -39,10 +39,16 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
100558
100559 extern int proc_dostring(struct ctl_table *, int,
100560 void __user *, size_t *, loff_t *);
100561+extern int proc_dostring_modpriv(struct ctl_table *, int,
100562+ void __user *, size_t *, loff_t *);
100563 extern int proc_dointvec(struct ctl_table *, int,
100564 void __user *, size_t *, loff_t *);
100565+extern int proc_dointvec_secure(struct ctl_table *, int,
100566+ void __user *, size_t *, loff_t *);
100567 extern int proc_dointvec_minmax(struct ctl_table *, int,
100568 void __user *, size_t *, loff_t *);
100569+extern int proc_dointvec_minmax_secure(struct ctl_table *, int,
100570+ void __user *, size_t *, loff_t *);
100571 extern int proc_dointvec_jiffies(struct ctl_table *, int,
100572 void __user *, size_t *, loff_t *);
100573 extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int,
100574@@ -113,7 +119,8 @@ struct ctl_table
100575 struct ctl_table_poll *poll;
100576 void *extra1;
100577 void *extra2;
100578-};
100579+} __do_const __randomize_layout;
100580+typedef struct ctl_table __no_const ctl_table_no_const;
100581
100582 struct ctl_node {
100583 struct rb_node node;
100584diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
100585index 9f65758..487a6f1 100644
100586--- a/include/linux/sysfs.h
100587+++ b/include/linux/sysfs.h
100588@@ -34,7 +34,8 @@ struct attribute {
100589 struct lock_class_key *key;
100590 struct lock_class_key skey;
100591 #endif
100592-};
100593+} __do_const;
100594+typedef struct attribute __no_const attribute_no_const;
100595
100596 /**
100597 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
100598@@ -78,7 +79,8 @@ struct attribute_group {
100599 struct attribute *, int);
100600 struct attribute **attrs;
100601 struct bin_attribute **bin_attrs;
100602-};
100603+} __do_const;
100604+typedef struct attribute_group __no_const attribute_group_no_const;
100605
100606 /**
100607 * Use these macros to make defining attributes easier. See include/linux/device.h
100608@@ -152,7 +154,8 @@ struct bin_attribute {
100609 char *, loff_t, size_t);
100610 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
100611 struct vm_area_struct *vma);
100612-};
100613+} __do_const;
100614+typedef struct bin_attribute __no_const bin_attribute_no_const;
100615
100616 /**
100617 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
100618diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
100619index 387fa7d..3fcde6b 100644
100620--- a/include/linux/sysrq.h
100621+++ b/include/linux/sysrq.h
100622@@ -16,6 +16,7 @@
100623
100624 #include <linux/errno.h>
100625 #include <linux/types.h>
100626+#include <linux/compiler.h>
100627
100628 /* Possible values of bitmask for enabling sysrq functions */
100629 /* 0x0001 is reserved for enable everything */
100630@@ -33,7 +34,7 @@ struct sysrq_key_op {
100631 char *help_msg;
100632 char *action_msg;
100633 int enable_mask;
100634-};
100635+} __do_const;
100636
100637 #ifdef CONFIG_MAGIC_SYSRQ
100638
100639diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
100640index ff307b5..f1a4468 100644
100641--- a/include/linux/thread_info.h
100642+++ b/include/linux/thread_info.h
100643@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
100644 #error "no set_restore_sigmask() provided and default one won't work"
100645 #endif
100646
100647+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
100648+
100649+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
100650+{
100651+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
100652+}
100653+
100654 #endif /* __KERNEL__ */
100655
100656 #endif /* _LINUX_THREAD_INFO_H */
100657diff --git a/include/linux/tty.h b/include/linux/tty.h
100658index d76631f..de91e82 100644
100659--- a/include/linux/tty.h
100660+++ b/include/linux/tty.h
100661@@ -225,7 +225,7 @@ struct tty_port {
100662 const struct tty_port_operations *ops; /* Port operations */
100663 spinlock_t lock; /* Lock protecting tty field */
100664 int blocked_open; /* Waiting to open */
100665- int count; /* Usage count */
100666+ atomic_t count; /* Usage count */
100667 wait_queue_head_t open_wait; /* Open waiters */
100668 wait_queue_head_t close_wait; /* Close waiters */
100669 wait_queue_head_t delta_msr_wait; /* Modem status change */
100670@@ -313,7 +313,7 @@ struct tty_struct {
100671 /* If the tty has a pending do_SAK, queue it here - akpm */
100672 struct work_struct SAK_work;
100673 struct tty_port *port;
100674-};
100675+} __randomize_layout;
100676
100677 /* Each of a tty's open files has private_data pointing to tty_file_private */
100678 struct tty_file_private {
100679@@ -573,7 +573,7 @@ extern int tty_port_open(struct tty_port *port,
100680 struct tty_struct *tty, struct file *filp);
100681 static inline int tty_port_users(struct tty_port *port)
100682 {
100683- return port->count + port->blocked_open;
100684+ return atomic_read(&port->count) + port->blocked_open;
100685 }
100686
100687 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
100688diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
100689index 92e337c..f46757b 100644
100690--- a/include/linux/tty_driver.h
100691+++ b/include/linux/tty_driver.h
100692@@ -291,7 +291,7 @@ struct tty_operations {
100693 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
100694 #endif
100695 const struct file_operations *proc_fops;
100696-};
100697+} __do_const __randomize_layout;
100698
100699 struct tty_driver {
100700 int magic; /* magic number for this structure */
100701@@ -325,7 +325,7 @@ struct tty_driver {
100702
100703 const struct tty_operations *ops;
100704 struct list_head tty_drivers;
100705-};
100706+} __randomize_layout;
100707
100708 extern struct list_head tty_drivers;
100709
100710diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
100711index 00c9d68..bc0188b 100644
100712--- a/include/linux/tty_ldisc.h
100713+++ b/include/linux/tty_ldisc.h
100714@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
100715
100716 struct module *owner;
100717
100718- int refcount;
100719+ atomic_t refcount;
100720 };
100721
100722 struct tty_ldisc {
100723diff --git a/include/linux/types.h b/include/linux/types.h
100724index 8715287..1be77ee 100644
100725--- a/include/linux/types.h
100726+++ b/include/linux/types.h
100727@@ -176,10 +176,26 @@ typedef struct {
100728 int counter;
100729 } atomic_t;
100730
100731+#ifdef CONFIG_PAX_REFCOUNT
100732+typedef struct {
100733+ int counter;
100734+} atomic_unchecked_t;
100735+#else
100736+typedef atomic_t atomic_unchecked_t;
100737+#endif
100738+
100739 #ifdef CONFIG_64BIT
100740 typedef struct {
100741 long counter;
100742 } atomic64_t;
100743+
100744+#ifdef CONFIG_PAX_REFCOUNT
100745+typedef struct {
100746+ long counter;
100747+} atomic64_unchecked_t;
100748+#else
100749+typedef atomic64_t atomic64_unchecked_t;
100750+#endif
100751 #endif
100752
100753 struct list_head {
100754diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
100755index ecd3319..8a36ded 100644
100756--- a/include/linux/uaccess.h
100757+++ b/include/linux/uaccess.h
100758@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
100759 long ret; \
100760 mm_segment_t old_fs = get_fs(); \
100761 \
100762- set_fs(KERNEL_DS); \
100763 pagefault_disable(); \
100764- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
100765- pagefault_enable(); \
100766+ set_fs(KERNEL_DS); \
100767+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
100768 set_fs(old_fs); \
100769+ pagefault_enable(); \
100770 ret; \
100771 })
100772
100773diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
100774index 0383552..a0125dd 100644
100775--- a/include/linux/uidgid.h
100776+++ b/include/linux/uidgid.h
100777@@ -187,4 +187,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
100778
100779 #endif /* CONFIG_USER_NS */
100780
100781+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
100782+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
100783+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
100784+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
100785+
100786 #endif /* _LINUX_UIDGID_H */
100787diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
100788index 32c0e83..671eb35 100644
100789--- a/include/linux/uio_driver.h
100790+++ b/include/linux/uio_driver.h
100791@@ -67,7 +67,7 @@ struct uio_device {
100792 struct module *owner;
100793 struct device *dev;
100794 int minor;
100795- atomic_t event;
100796+ atomic_unchecked_t event;
100797 struct fasync_struct *async_queue;
100798 wait_queue_head_t wait;
100799 struct uio_info *info;
100800diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
100801index 99c1b4d..562e6f3 100644
100802--- a/include/linux/unaligned/access_ok.h
100803+++ b/include/linux/unaligned/access_ok.h
100804@@ -4,34 +4,34 @@
100805 #include <linux/kernel.h>
100806 #include <asm/byteorder.h>
100807
100808-static inline u16 get_unaligned_le16(const void *p)
100809+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
100810 {
100811- return le16_to_cpup((__le16 *)p);
100812+ return le16_to_cpup((const __le16 *)p);
100813 }
100814
100815-static inline u32 get_unaligned_le32(const void *p)
100816+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
100817 {
100818- return le32_to_cpup((__le32 *)p);
100819+ return le32_to_cpup((const __le32 *)p);
100820 }
100821
100822-static inline u64 get_unaligned_le64(const void *p)
100823+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
100824 {
100825- return le64_to_cpup((__le64 *)p);
100826+ return le64_to_cpup((const __le64 *)p);
100827 }
100828
100829-static inline u16 get_unaligned_be16(const void *p)
100830+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
100831 {
100832- return be16_to_cpup((__be16 *)p);
100833+ return be16_to_cpup((const __be16 *)p);
100834 }
100835
100836-static inline u32 get_unaligned_be32(const void *p)
100837+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
100838 {
100839- return be32_to_cpup((__be32 *)p);
100840+ return be32_to_cpup((const __be32 *)p);
100841 }
100842
100843-static inline u64 get_unaligned_be64(const void *p)
100844+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
100845 {
100846- return be64_to_cpup((__be64 *)p);
100847+ return be64_to_cpup((const __be64 *)p);
100848 }
100849
100850 static inline void put_unaligned_le16(u16 val, void *p)
100851diff --git a/include/linux/usb.h b/include/linux/usb.h
100852index 447fe29..9fc875f 100644
100853--- a/include/linux/usb.h
100854+++ b/include/linux/usb.h
100855@@ -592,7 +592,7 @@ struct usb_device {
100856 int maxchild;
100857
100858 u32 quirks;
100859- atomic_t urbnum;
100860+ atomic_unchecked_t urbnum;
100861
100862 unsigned long active_duration;
100863
100864@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
100865
100866 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
100867 __u8 request, __u8 requesttype, __u16 value, __u16 index,
100868- void *data, __u16 size, int timeout);
100869+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
100870 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
100871 void *data, int len, int *actual_length, int timeout);
100872 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
100873diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
100874index f06529c..dfeabd8 100644
100875--- a/include/linux/usb/renesas_usbhs.h
100876+++ b/include/linux/usb/renesas_usbhs.h
100877@@ -39,7 +39,7 @@ enum {
100878 */
100879 struct renesas_usbhs_driver_callback {
100880 int (*notify_hotplug)(struct platform_device *pdev);
100881-};
100882+} __no_const;
100883
100884 /*
100885 * callback functions for platform
100886diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
100887index 8297e5b..0dfae27 100644
100888--- a/include/linux/user_namespace.h
100889+++ b/include/linux/user_namespace.h
100890@@ -39,7 +39,7 @@ struct user_namespace {
100891 struct key *persistent_keyring_register;
100892 struct rw_semaphore persistent_keyring_register_sem;
100893 #endif
100894-};
100895+} __randomize_layout;
100896
100897 extern struct user_namespace init_user_ns;
100898
100899diff --git a/include/linux/utsname.h b/include/linux/utsname.h
100900index 5093f58..c103e58 100644
100901--- a/include/linux/utsname.h
100902+++ b/include/linux/utsname.h
100903@@ -25,7 +25,7 @@ struct uts_namespace {
100904 struct new_utsname name;
100905 struct user_namespace *user_ns;
100906 struct ns_common ns;
100907-};
100908+} __randomize_layout;
100909 extern struct uts_namespace init_uts_ns;
100910
100911 #ifdef CONFIG_UTS_NS
100912diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
100913index 6f8fbcf..4efc177 100644
100914--- a/include/linux/vermagic.h
100915+++ b/include/linux/vermagic.h
100916@@ -25,9 +25,42 @@
100917 #define MODULE_ARCH_VERMAGIC ""
100918 #endif
100919
100920+#ifdef CONFIG_PAX_REFCOUNT
100921+#define MODULE_PAX_REFCOUNT "REFCOUNT "
100922+#else
100923+#define MODULE_PAX_REFCOUNT ""
100924+#endif
100925+
100926+#ifdef CONSTIFY_PLUGIN
100927+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
100928+#else
100929+#define MODULE_CONSTIFY_PLUGIN ""
100930+#endif
100931+
100932+#ifdef STACKLEAK_PLUGIN
100933+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
100934+#else
100935+#define MODULE_STACKLEAK_PLUGIN ""
100936+#endif
100937+
100938+#ifdef RANDSTRUCT_PLUGIN
100939+#include <generated/randomize_layout_hash.h>
100940+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
100941+#else
100942+#define MODULE_RANDSTRUCT_PLUGIN
100943+#endif
100944+
100945+#ifdef CONFIG_GRKERNSEC
100946+#define MODULE_GRSEC "GRSEC "
100947+#else
100948+#define MODULE_GRSEC ""
100949+#endif
100950+
100951 #define VERMAGIC_STRING \
100952 UTS_RELEASE " " \
100953 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
100954 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
100955- MODULE_ARCH_VERMAGIC
100956+ MODULE_ARCH_VERMAGIC \
100957+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
100958+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
100959
100960diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
100961index b483abd..af305ad 100644
100962--- a/include/linux/vga_switcheroo.h
100963+++ b/include/linux/vga_switcheroo.h
100964@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
100965
100966 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
100967
100968-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
100969+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
100970 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
100971-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
100972+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
100973 #else
100974
100975 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
100976@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
100977
100978 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
100979
100980-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100981+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100982 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
100983-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100984+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100985
100986 #endif
100987 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
100988diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
100989index 0ec5983..cc61051 100644
100990--- a/include/linux/vmalloc.h
100991+++ b/include/linux/vmalloc.h
100992@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
100993 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
100994 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
100995 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
100996+
100997+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100998+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
100999+#endif
101000+
101001 /* bits [20..32] reserved for arch specific ioremap internals */
101002
101003 /*
101004@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
101005 unsigned long flags, pgprot_t prot);
101006 extern void vunmap(const void *addr);
101007
101008+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101009+extern void unmap_process_stacks(struct task_struct *task);
101010+#endif
101011+
101012 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
101013 unsigned long uaddr, void *kaddr,
101014 unsigned long size);
101015@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
101016
101017 /* for /dev/kmem */
101018 extern long vread(char *buf, char *addr, unsigned long count);
101019-extern long vwrite(char *buf, char *addr, unsigned long count);
101020+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
101021
101022 /*
101023 * Internals. Dont't use..
101024diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
101025index 82e7db7..f8ce3d0 100644
101026--- a/include/linux/vmstat.h
101027+++ b/include/linux/vmstat.h
101028@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
101029 /*
101030 * Zone based page accounting with per cpu differentials.
101031 */
101032-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
101033+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
101034
101035 static inline void zone_page_state_add(long x, struct zone *zone,
101036 enum zone_stat_item item)
101037 {
101038- atomic_long_add(x, &zone->vm_stat[item]);
101039- atomic_long_add(x, &vm_stat[item]);
101040+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
101041+ atomic_long_add_unchecked(x, &vm_stat[item]);
101042 }
101043
101044-static inline unsigned long global_page_state(enum zone_stat_item item)
101045+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
101046 {
101047- long x = atomic_long_read(&vm_stat[item]);
101048+ long x = atomic_long_read_unchecked(&vm_stat[item]);
101049 #ifdef CONFIG_SMP
101050 if (x < 0)
101051 x = 0;
101052@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
101053 return x;
101054 }
101055
101056-static inline unsigned long zone_page_state(struct zone *zone,
101057+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
101058 enum zone_stat_item item)
101059 {
101060- long x = atomic_long_read(&zone->vm_stat[item]);
101061+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
101062 #ifdef CONFIG_SMP
101063 if (x < 0)
101064 x = 0;
101065@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
101066 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
101067 enum zone_stat_item item)
101068 {
101069- long x = atomic_long_read(&zone->vm_stat[item]);
101070+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
101071
101072 #ifdef CONFIG_SMP
101073 int cpu;
101074@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
101075
101076 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
101077 {
101078- atomic_long_inc(&zone->vm_stat[item]);
101079- atomic_long_inc(&vm_stat[item]);
101080+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
101081+ atomic_long_inc_unchecked(&vm_stat[item]);
101082 }
101083
101084 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
101085 {
101086- atomic_long_dec(&zone->vm_stat[item]);
101087- atomic_long_dec(&vm_stat[item]);
101088+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
101089+ atomic_long_dec_unchecked(&vm_stat[item]);
101090 }
101091
101092 static inline void __inc_zone_page_state(struct page *page,
101093diff --git a/include/linux/xattr.h b/include/linux/xattr.h
101094index 91b0a68..0e9adf6 100644
101095--- a/include/linux/xattr.h
101096+++ b/include/linux/xattr.h
101097@@ -28,7 +28,7 @@ struct xattr_handler {
101098 size_t size, int handler_flags);
101099 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
101100 size_t size, int flags, int handler_flags);
101101-};
101102+} __do_const;
101103
101104 struct xattr {
101105 const char *name;
101106@@ -37,6 +37,9 @@ struct xattr {
101107 };
101108
101109 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
101110+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
101111+ssize_t pax_getxattr(struct dentry *, void *, size_t);
101112+#endif
101113 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
101114 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
101115 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
101116diff --git a/include/linux/zlib.h b/include/linux/zlib.h
101117index 92dbbd3..13ab0b3 100644
101118--- a/include/linux/zlib.h
101119+++ b/include/linux/zlib.h
101120@@ -31,6 +31,7 @@
101121 #define _ZLIB_H
101122
101123 #include <linux/zconf.h>
101124+#include <linux/compiler.h>
101125
101126 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
101127 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
101128@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
101129
101130 /* basic functions */
101131
101132-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
101133+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
101134 /*
101135 Returns the number of bytes that needs to be allocated for a per-
101136 stream workspace with the specified parameters. A pointer to this
101137diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
101138index acbcd2f..c3abe84 100644
101139--- a/include/media/v4l2-dev.h
101140+++ b/include/media/v4l2-dev.h
101141@@ -74,7 +74,7 @@ struct v4l2_file_operations {
101142 int (*mmap) (struct file *, struct vm_area_struct *);
101143 int (*open) (struct file *);
101144 int (*release) (struct file *);
101145-};
101146+} __do_const;
101147
101148 /*
101149 * Newer version of video_device, handled by videodev2.c
101150diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
101151index 9c58157..d86ebf5 100644
101152--- a/include/media/v4l2-device.h
101153+++ b/include/media/v4l2-device.h
101154@@ -93,7 +93,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
101155 this function returns 0. If the name ends with a digit (e.g. cx18),
101156 then the name will be set to cx18-0 since cx180 looks really odd. */
101157 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
101158- atomic_t *instance);
101159+ atomic_unchecked_t *instance);
101160
101161 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
101162 Since the parent disappears this ensures that v4l2_dev doesn't have an
101163diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
101164index 5122b5e..598b440 100644
101165--- a/include/net/9p/transport.h
101166+++ b/include/net/9p/transport.h
101167@@ -62,7 +62,7 @@ struct p9_trans_module {
101168 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
101169 int (*zc_request)(struct p9_client *, struct p9_req_t *,
101170 struct iov_iter *, struct iov_iter *, int , int, int);
101171-};
101172+} __do_const;
101173
101174 void v9fs_register_trans(struct p9_trans_module *m);
101175 void v9fs_unregister_trans(struct p9_trans_module *m);
101176diff --git a/include/net/af_unix.h b/include/net/af_unix.h
101177index a175ba4..196eb8242 100644
101178--- a/include/net/af_unix.h
101179+++ b/include/net/af_unix.h
101180@@ -36,7 +36,7 @@ struct unix_skb_parms {
101181 u32 secid; /* Security ID */
101182 #endif
101183 u32 consumed;
101184-};
101185+} __randomize_layout;
101186
101187 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
101188 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
101189diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
101190index 2239a37..a83461f 100644
101191--- a/include/net/bluetooth/l2cap.h
101192+++ b/include/net/bluetooth/l2cap.h
101193@@ -609,7 +609,7 @@ struct l2cap_ops {
101194 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
101195 unsigned long hdr_len,
101196 unsigned long len, int nb);
101197-};
101198+} __do_const;
101199
101200 struct l2cap_conn {
101201 struct hci_conn *hcon;
101202diff --git a/include/net/bonding.h b/include/net/bonding.h
101203index 78ed135..2f53667 100644
101204--- a/include/net/bonding.h
101205+++ b/include/net/bonding.h
101206@@ -658,7 +658,7 @@ extern struct rtnl_link_ops bond_link_ops;
101207
101208 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
101209 {
101210- atomic_long_inc(&dev->tx_dropped);
101211+ atomic_long_inc_unchecked(&dev->tx_dropped);
101212 dev_kfree_skb_any(skb);
101213 }
101214
101215diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
101216index f2ae33d..c457cf0 100644
101217--- a/include/net/caif/cfctrl.h
101218+++ b/include/net/caif/cfctrl.h
101219@@ -52,7 +52,7 @@ struct cfctrl_rsp {
101220 void (*radioset_rsp)(void);
101221 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
101222 struct cflayer *client_layer);
101223-};
101224+} __no_const;
101225
101226 /* Link Setup Parameters for CAIF-Links. */
101227 struct cfctrl_link_param {
101228@@ -101,8 +101,8 @@ struct cfctrl_request_info {
101229 struct cfctrl {
101230 struct cfsrvl serv;
101231 struct cfctrl_rsp res;
101232- atomic_t req_seq_no;
101233- atomic_t rsp_seq_no;
101234+ atomic_unchecked_t req_seq_no;
101235+ atomic_unchecked_t rsp_seq_no;
101236 struct list_head list;
101237 /* Protects from simultaneous access to first_req list */
101238 spinlock_t info_list_lock;
101239diff --git a/include/net/flow.h b/include/net/flow.h
101240index 8109a15..504466d 100644
101241--- a/include/net/flow.h
101242+++ b/include/net/flow.h
101243@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
101244
101245 void flow_cache_flush(struct net *net);
101246 void flow_cache_flush_deferred(struct net *net);
101247-extern atomic_t flow_cache_genid;
101248+extern atomic_unchecked_t flow_cache_genid;
101249
101250 #endif
101251diff --git a/include/net/genetlink.h b/include/net/genetlink.h
101252index a9af1cc..1f3fa7b 100644
101253--- a/include/net/genetlink.h
101254+++ b/include/net/genetlink.h
101255@@ -128,7 +128,7 @@ struct genl_ops {
101256 u8 cmd;
101257 u8 internal_flags;
101258 u8 flags;
101259-};
101260+} __do_const;
101261
101262 int __genl_register_family(struct genl_family *family);
101263
101264diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
101265index 0f712c0..cd762c4 100644
101266--- a/include/net/gro_cells.h
101267+++ b/include/net/gro_cells.h
101268@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
101269 cell = this_cpu_ptr(gcells->cells);
101270
101271 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
101272- atomic_long_inc(&dev->rx_dropped);
101273+ atomic_long_inc_unchecked(&dev->rx_dropped);
101274 kfree_skb(skb);
101275 return;
101276 }
101277diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
101278index 0320bbb..938789c 100644
101279--- a/include/net/inet_connection_sock.h
101280+++ b/include/net/inet_connection_sock.h
101281@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
101282 int (*bind_conflict)(const struct sock *sk,
101283 const struct inet_bind_bucket *tb, bool relax);
101284 void (*mtu_reduced)(struct sock *sk);
101285-};
101286+} __do_const;
101287
101288 /** inet_connection_sock - INET connection oriented sock
101289 *
101290diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
101291index d5332dd..10a5c3c 100644
101292--- a/include/net/inetpeer.h
101293+++ b/include/net/inetpeer.h
101294@@ -48,7 +48,7 @@ struct inet_peer {
101295 */
101296 union {
101297 struct {
101298- atomic_t rid; /* Frag reception counter */
101299+ atomic_unchecked_t rid; /* Frag reception counter */
101300 };
101301 struct rcu_head rcu;
101302 struct inet_peer *gc_next;
101303diff --git a/include/net/ip.h b/include/net/ip.h
101304index d14af7e..52816c2 100644
101305--- a/include/net/ip.h
101306+++ b/include/net/ip.h
101307@@ -318,7 +318,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
101308 }
101309 }
101310
101311-u32 ip_idents_reserve(u32 hash, int segs);
101312+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
101313 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
101314
101315 static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
101316diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
101317index 54271ed..eb7e0e6 100644
101318--- a/include/net/ip_fib.h
101319+++ b/include/net/ip_fib.h
101320@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
101321
101322 #define FIB_RES_SADDR(net, res) \
101323 ((FIB_RES_NH(res).nh_saddr_genid == \
101324- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
101325+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
101326 FIB_RES_NH(res).nh_saddr : \
101327 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
101328 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
101329diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
101330index 4e3731e..a242e28 100644
101331--- a/include/net/ip_vs.h
101332+++ b/include/net/ip_vs.h
101333@@ -551,7 +551,7 @@ struct ip_vs_conn {
101334 struct ip_vs_conn *control; /* Master control connection */
101335 atomic_t n_control; /* Number of controlled ones */
101336 struct ip_vs_dest *dest; /* real server */
101337- atomic_t in_pkts; /* incoming packet counter */
101338+ atomic_unchecked_t in_pkts; /* incoming packet counter */
101339
101340 /* Packet transmitter for different forwarding methods. If it
101341 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
101342@@ -699,7 +699,7 @@ struct ip_vs_dest {
101343 __be16 port; /* port number of the server */
101344 union nf_inet_addr addr; /* IP address of the server */
101345 volatile unsigned int flags; /* dest status flags */
101346- atomic_t conn_flags; /* flags to copy to conn */
101347+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
101348 atomic_t weight; /* server weight */
101349
101350 atomic_t refcnt; /* reference counter */
101351@@ -946,11 +946,11 @@ struct netns_ipvs {
101352 /* ip_vs_lblc */
101353 int sysctl_lblc_expiration;
101354 struct ctl_table_header *lblc_ctl_header;
101355- struct ctl_table *lblc_ctl_table;
101356+ ctl_table_no_const *lblc_ctl_table;
101357 /* ip_vs_lblcr */
101358 int sysctl_lblcr_expiration;
101359 struct ctl_table_header *lblcr_ctl_header;
101360- struct ctl_table *lblcr_ctl_table;
101361+ ctl_table_no_const *lblcr_ctl_table;
101362 /* ip_vs_est */
101363 struct list_head est_list; /* estimator list */
101364 spinlock_t est_lock;
101365diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
101366index 8d4f588..2e37ad2 100644
101367--- a/include/net/irda/ircomm_tty.h
101368+++ b/include/net/irda/ircomm_tty.h
101369@@ -33,6 +33,7 @@
101370 #include <linux/termios.h>
101371 #include <linux/timer.h>
101372 #include <linux/tty.h> /* struct tty_struct */
101373+#include <asm/local.h>
101374
101375 #include <net/irda/irias_object.h>
101376 #include <net/irda/ircomm_core.h>
101377diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
101378index 714cc9a..ea05f3e 100644
101379--- a/include/net/iucv/af_iucv.h
101380+++ b/include/net/iucv/af_iucv.h
101381@@ -149,7 +149,7 @@ struct iucv_skb_cb {
101382 struct iucv_sock_list {
101383 struct hlist_head head;
101384 rwlock_t lock;
101385- atomic_t autobind_name;
101386+ atomic_unchecked_t autobind_name;
101387 };
101388
101389 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
101390diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
101391index f3be818..bf46196 100644
101392--- a/include/net/llc_c_ac.h
101393+++ b/include/net/llc_c_ac.h
101394@@ -87,7 +87,7 @@
101395 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
101396 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
101397
101398-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101399+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101400
101401 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
101402 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
101403diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
101404index 3948cf1..83b28c4 100644
101405--- a/include/net/llc_c_ev.h
101406+++ b/include/net/llc_c_ev.h
101407@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
101408 return (struct llc_conn_state_ev *)skb->cb;
101409 }
101410
101411-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101412-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101413+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101414+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101415
101416 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
101417 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
101418diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
101419index 48f3f89..0e92c50 100644
101420--- a/include/net/llc_c_st.h
101421+++ b/include/net/llc_c_st.h
101422@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
101423 u8 next_state;
101424 const llc_conn_ev_qfyr_t *ev_qualifiers;
101425 const llc_conn_action_t *ev_actions;
101426-};
101427+} __do_const;
101428
101429 struct llc_conn_state {
101430 u8 current_state;
101431diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
101432index a61b98c..aade1eb 100644
101433--- a/include/net/llc_s_ac.h
101434+++ b/include/net/llc_s_ac.h
101435@@ -23,7 +23,7 @@
101436 #define SAP_ACT_TEST_IND 9
101437
101438 /* All action functions must look like this */
101439-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101440+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101441
101442 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
101443 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
101444diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
101445index c4359e2..76dbc4a 100644
101446--- a/include/net/llc_s_st.h
101447+++ b/include/net/llc_s_st.h
101448@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
101449 llc_sap_ev_t ev;
101450 u8 next_state;
101451 const llc_sap_action_t *ev_actions;
101452-};
101453+} __do_const;
101454
101455 struct llc_sap_state {
101456 u8 curr_state;
101457diff --git a/include/net/mac80211.h b/include/net/mac80211.h
101458index fc57f6b..9c1fdb2 100644
101459--- a/include/net/mac80211.h
101460+++ b/include/net/mac80211.h
101461@@ -5104,7 +5104,7 @@ struct rate_control_ops {
101462 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
101463
101464 u32 (*get_expected_throughput)(void *priv_sta);
101465-};
101466+} __do_const;
101467
101468 static inline int rate_supported(struct ieee80211_sta *sta,
101469 enum ieee80211_band band,
101470diff --git a/include/net/neighbour.h b/include/net/neighbour.h
101471index bd33e66..6508d00 100644
101472--- a/include/net/neighbour.h
101473+++ b/include/net/neighbour.h
101474@@ -162,7 +162,7 @@ struct neigh_ops {
101475 void (*error_report)(struct neighbour *, struct sk_buff *);
101476 int (*output)(struct neighbour *, struct sk_buff *);
101477 int (*connected_output)(struct neighbour *, struct sk_buff *);
101478-};
101479+} __do_const;
101480
101481 struct pneigh_entry {
101482 struct pneigh_entry *next;
101483@@ -216,7 +216,7 @@ struct neigh_table {
101484 struct neigh_statistics __percpu *stats;
101485 struct neigh_hash_table __rcu *nht;
101486 struct pneigh_entry **phash_buckets;
101487-};
101488+} __randomize_layout;
101489
101490 enum {
101491 NEIGH_ARP_TABLE = 0,
101492diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
101493index f733656..54053db 100644
101494--- a/include/net/net_namespace.h
101495+++ b/include/net/net_namespace.h
101496@@ -132,8 +132,8 @@ struct net {
101497 struct netns_mpls mpls;
101498 #endif
101499 struct sock *diag_nlsk;
101500- atomic_t fnhe_genid;
101501-};
101502+ atomic_unchecked_t fnhe_genid;
101503+} __randomize_layout;
101504
101505 #include <linux/seq_file_net.h>
101506
101507@@ -268,7 +268,11 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
101508 #define __net_init __init
101509 #define __net_exit __exit_refok
101510 #define __net_initdata __initdata
101511+#ifdef CONSTIFY_PLUGIN
101512 #define __net_initconst __initconst
101513+#else
101514+#define __net_initconst __initdata
101515+#endif
101516 #endif
101517
101518 int peernet2id(struct net *net, struct net *peer);
101519@@ -281,7 +285,7 @@ struct pernet_operations {
101520 void (*exit_batch)(struct list_head *net_exit_list);
101521 int *id;
101522 size_t size;
101523-};
101524+} __do_const;
101525
101526 /*
101527 * Use these carefully. If you implement a network device and it
101528@@ -329,12 +333,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
101529
101530 static inline int rt_genid_ipv4(struct net *net)
101531 {
101532- return atomic_read(&net->ipv4.rt_genid);
101533+ return atomic_read_unchecked(&net->ipv4.rt_genid);
101534 }
101535
101536 static inline void rt_genid_bump_ipv4(struct net *net)
101537 {
101538- atomic_inc(&net->ipv4.rt_genid);
101539+ atomic_inc_unchecked(&net->ipv4.rt_genid);
101540 }
101541
101542 extern void (*__fib6_flush_trees)(struct net *net);
101543@@ -361,12 +365,12 @@ static inline void rt_genid_bump_all(struct net *net)
101544
101545 static inline int fnhe_genid(struct net *net)
101546 {
101547- return atomic_read(&net->fnhe_genid);
101548+ return atomic_read_unchecked(&net->fnhe_genid);
101549 }
101550
101551 static inline void fnhe_genid_bump(struct net *net)
101552 {
101553- atomic_inc(&net->fnhe_genid);
101554+ atomic_inc_unchecked(&net->fnhe_genid);
101555 }
101556
101557 #endif /* __NET_NET_NAMESPACE_H */
101558diff --git a/include/net/netlink.h b/include/net/netlink.h
101559index 2a5dbcc..8243656 100644
101560--- a/include/net/netlink.h
101561+++ b/include/net/netlink.h
101562@@ -521,7 +521,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
101563 {
101564 if (mark) {
101565 WARN_ON((unsigned char *) mark < skb->data);
101566- skb_trim(skb, (unsigned char *) mark - skb->data);
101567+ skb_trim(skb, (const unsigned char *) mark - skb->data);
101568 }
101569 }
101570
101571diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
101572index 29d6a94..235d3d84 100644
101573--- a/include/net/netns/conntrack.h
101574+++ b/include/net/netns/conntrack.h
101575@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
101576 struct nf_proto_net {
101577 #ifdef CONFIG_SYSCTL
101578 struct ctl_table_header *ctl_table_header;
101579- struct ctl_table *ctl_table;
101580+ ctl_table_no_const *ctl_table;
101581 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
101582 struct ctl_table_header *ctl_compat_header;
101583- struct ctl_table *ctl_compat_table;
101584+ ctl_table_no_const *ctl_compat_table;
101585 #endif
101586 #endif
101587 unsigned int users;
101588@@ -60,7 +60,7 @@ struct nf_ip_net {
101589 struct nf_icmp_net icmpv6;
101590 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
101591 struct ctl_table_header *ctl_table_header;
101592- struct ctl_table *ctl_table;
101593+ ctl_table_no_const *ctl_table;
101594 #endif
101595 };
101596
101597diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
101598index 614a49b..0b94386 100644
101599--- a/include/net/netns/ipv4.h
101600+++ b/include/net/netns/ipv4.h
101601@@ -90,7 +90,7 @@ struct netns_ipv4 {
101602
101603 struct ping_group_range ping_group_range;
101604
101605- atomic_t dev_addr_genid;
101606+ atomic_unchecked_t dev_addr_genid;
101607
101608 #ifdef CONFIG_SYSCTL
101609 unsigned long *sysctl_local_reserved_ports;
101610@@ -104,6 +104,6 @@ struct netns_ipv4 {
101611 struct fib_rules_ops *mr_rules_ops;
101612 #endif
101613 #endif
101614- atomic_t rt_genid;
101615+ atomic_unchecked_t rt_genid;
101616 };
101617 #endif
101618diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
101619index d2527bf..2c802d5 100644
101620--- a/include/net/netns/ipv6.h
101621+++ b/include/net/netns/ipv6.h
101622@@ -78,8 +78,8 @@ struct netns_ipv6 {
101623 struct fib_rules_ops *mr6_rules_ops;
101624 #endif
101625 #endif
101626- atomic_t dev_addr_genid;
101627- atomic_t fib6_sernum;
101628+ atomic_unchecked_t dev_addr_genid;
101629+ atomic_unchecked_t fib6_sernum;
101630 };
101631
101632 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
101633diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
101634index 730d82a..045f2c4 100644
101635--- a/include/net/netns/xfrm.h
101636+++ b/include/net/netns/xfrm.h
101637@@ -78,7 +78,7 @@ struct netns_xfrm {
101638
101639 /* flow cache part */
101640 struct flow_cache flow_cache_global;
101641- atomic_t flow_cache_genid;
101642+ atomic_unchecked_t flow_cache_genid;
101643 struct list_head flow_cache_gc_list;
101644 spinlock_t flow_cache_gc_lock;
101645 struct work_struct flow_cache_gc_work;
101646diff --git a/include/net/ping.h b/include/net/ping.h
101647index ac80cb4..ec1ed09 100644
101648--- a/include/net/ping.h
101649+++ b/include/net/ping.h
101650@@ -54,7 +54,7 @@ struct ping_iter_state {
101651
101652 extern struct proto ping_prot;
101653 #if IS_ENABLED(CONFIG_IPV6)
101654-extern struct pingv6_ops pingv6_ops;
101655+extern struct pingv6_ops *pingv6_ops;
101656 #endif
101657
101658 struct pingfakehdr {
101659diff --git a/include/net/protocol.h b/include/net/protocol.h
101660index d6fcc1f..ca277058 100644
101661--- a/include/net/protocol.h
101662+++ b/include/net/protocol.h
101663@@ -49,7 +49,7 @@ struct net_protocol {
101664 * socket lookup?
101665 */
101666 icmp_strict_tag_validation:1;
101667-};
101668+} __do_const;
101669
101670 #if IS_ENABLED(CONFIG_IPV6)
101671 struct inet6_protocol {
101672@@ -62,7 +62,7 @@ struct inet6_protocol {
101673 u8 type, u8 code, int offset,
101674 __be32 info);
101675 unsigned int flags; /* INET6_PROTO_xxx */
101676-};
101677+} __do_const;
101678
101679 #define INET6_PROTO_NOPOLICY 0x1
101680 #define INET6_PROTO_FINAL 0x2
101681diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
101682index 343d922..7959cde 100644
101683--- a/include/net/rtnetlink.h
101684+++ b/include/net/rtnetlink.h
101685@@ -95,7 +95,7 @@ struct rtnl_link_ops {
101686 const struct net_device *dev,
101687 const struct net_device *slave_dev);
101688 struct net *(*get_link_net)(const struct net_device *dev);
101689-};
101690+} __do_const;
101691
101692 int __rtnl_link_register(struct rtnl_link_ops *ops);
101693 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
101694diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
101695index 4a5b9a3..ca27d73 100644
101696--- a/include/net/sctp/checksum.h
101697+++ b/include/net/sctp/checksum.h
101698@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
101699 unsigned int offset)
101700 {
101701 struct sctphdr *sh = sctp_hdr(skb);
101702- __le32 ret, old = sh->checksum;
101703- const struct skb_checksum_ops ops = {
101704+ __le32 ret, old = sh->checksum;
101705+ static const struct skb_checksum_ops ops = {
101706 .update = sctp_csum_update,
101707 .combine = sctp_csum_combine,
101708 };
101709diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
101710index 487ef34..d457f98 100644
101711--- a/include/net/sctp/sm.h
101712+++ b/include/net/sctp/sm.h
101713@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
101714 typedef struct {
101715 sctp_state_fn_t *fn;
101716 const char *name;
101717-} sctp_sm_table_entry_t;
101718+} __do_const sctp_sm_table_entry_t;
101719
101720 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
101721 * currently in use.
101722@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
101723 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
101724
101725 /* Extern declarations for major data structures. */
101726-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101727+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101728
101729
101730 /* Get the size of a DATA chunk payload. */
101731diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
101732index 495c87e..5b327ff 100644
101733--- a/include/net/sctp/structs.h
101734+++ b/include/net/sctp/structs.h
101735@@ -513,7 +513,7 @@ struct sctp_pf {
101736 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
101737 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
101738 struct sctp_af *af;
101739-};
101740+} __do_const;
101741
101742
101743 /* Structure to track chunk fragments that have been acked, but peer
101744diff --git a/include/net/sock.h b/include/net/sock.h
101745index 3a4898e..67456ac 100644
101746--- a/include/net/sock.h
101747+++ b/include/net/sock.h
101748@@ -363,7 +363,7 @@ struct sock {
101749 unsigned int sk_napi_id;
101750 unsigned int sk_ll_usec;
101751 #endif
101752- atomic_t sk_drops;
101753+ atomic_unchecked_t sk_drops;
101754 int sk_rcvbuf;
101755
101756 struct sk_filter __rcu *sk_filter;
101757@@ -1039,7 +1039,7 @@ struct proto {
101758 void (*destroy_cgroup)(struct mem_cgroup *memcg);
101759 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
101760 #endif
101761-};
101762+} __randomize_layout;
101763
101764 /*
101765 * Bits in struct cg_proto.flags
101766@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
101767 page_counter_uncharge(&prot->memory_allocated, amt);
101768 }
101769
101770-static inline long
101771+static inline long __intentional_overflow(-1)
101772 sk_memory_allocated(const struct sock *sk)
101773 {
101774 struct proto *prot = sk->sk_prot;
101775@@ -1777,7 +1777,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
101776 }
101777
101778 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
101779- struct iov_iter *from, char *to,
101780+ struct iov_iter *from, unsigned char *to,
101781 int copy, int offset)
101782 {
101783 if (skb->ip_summed == CHECKSUM_NONE) {
101784@@ -2024,7 +2024,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
101785 }
101786 }
101787
101788-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101789+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101790
101791 /**
101792 * sk_page_frag - return an appropriate page_frag
101793@@ -2099,7 +2099,7 @@ struct sock_skb_cb {
101794 static inline void
101795 sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
101796 {
101797- SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
101798+ SOCK_SKB_CB(skb)->dropcount = atomic_read_unchecked(&sk->sk_drops);
101799 }
101800
101801 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
101802diff --git a/include/net/tcp.h b/include/net/tcp.h
101803index 6d204f3..d5a8ff0 100644
101804--- a/include/net/tcp.h
101805+++ b/include/net/tcp.h
101806@@ -523,7 +523,7 @@ void tcp_retransmit_timer(struct sock *sk);
101807 void tcp_xmit_retransmit_queue(struct sock *);
101808 void tcp_simple_retransmit(struct sock *);
101809 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
101810-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101811+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101812
101813 void tcp_send_probe0(struct sock *);
101814 void tcp_send_partial(struct sock *);
101815@@ -699,8 +699,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
101816 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
101817 */
101818 struct tcp_skb_cb {
101819- __u32 seq; /* Starting sequence number */
101820- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
101821+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
101822+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
101823 union {
101824 /* Note : tcp_tw_isn is used in input path only
101825 * (isn chosen by tcp_timewait_state_process())
101826@@ -725,7 +725,7 @@ struct tcp_skb_cb {
101827
101828 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
101829 /* 1 byte hole */
101830- __u32 ack_seq; /* Sequence number ACK'd */
101831+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
101832 union {
101833 struct inet_skb_parm h4;
101834 #if IS_ENABLED(CONFIG_IPV6)
101835diff --git a/include/net/xfrm.h b/include/net/xfrm.h
101836index 36ac102..6e8b34b 100644
101837--- a/include/net/xfrm.h
101838+++ b/include/net/xfrm.h
101839@@ -283,7 +283,6 @@ struct xfrm_dst;
101840 struct xfrm_policy_afinfo {
101841 unsigned short family;
101842 struct dst_ops *dst_ops;
101843- void (*garbage_collect)(struct net *net);
101844 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
101845 const xfrm_address_t *saddr,
101846 const xfrm_address_t *daddr);
101847@@ -301,7 +300,7 @@ struct xfrm_policy_afinfo {
101848 struct net_device *dev,
101849 const struct flowi *fl);
101850 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
101851-};
101852+} __do_const;
101853
101854 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
101855 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
101856@@ -340,7 +339,7 @@ struct xfrm_state_afinfo {
101857 int (*transport_finish)(struct sk_buff *skb,
101858 int async);
101859 void (*local_error)(struct sk_buff *skb, u32 mtu);
101860-};
101861+} __do_const;
101862
101863 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
101864 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
101865@@ -435,7 +434,7 @@ struct xfrm_mode {
101866 struct module *owner;
101867 unsigned int encap;
101868 int flags;
101869-};
101870+} __do_const;
101871
101872 /* Flags for xfrm_mode. */
101873 enum {
101874@@ -530,7 +529,7 @@ struct xfrm_policy {
101875 struct timer_list timer;
101876
101877 struct flow_cache_object flo;
101878- atomic_t genid;
101879+ atomic_unchecked_t genid;
101880 u32 priority;
101881 u32 index;
101882 struct xfrm_mark mark;
101883@@ -1163,6 +1162,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
101884 }
101885
101886 void xfrm_garbage_collect(struct net *net);
101887+void xfrm_garbage_collect_deferred(struct net *net);
101888
101889 #else
101890
101891@@ -1201,6 +1201,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
101892 static inline void xfrm_garbage_collect(struct net *net)
101893 {
101894 }
101895+static inline void xfrm_garbage_collect_deferred(struct net *net)
101896+{
101897+}
101898 #endif
101899
101900 static __inline__
101901diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
101902index 1017e0b..227aa4d 100644
101903--- a/include/rdma/iw_cm.h
101904+++ b/include/rdma/iw_cm.h
101905@@ -122,7 +122,7 @@ struct iw_cm_verbs {
101906 int backlog);
101907
101908 int (*destroy_listen)(struct iw_cm_id *cm_id);
101909-};
101910+} __no_const;
101911
101912 /**
101913 * iw_create_cm_id - Create an IW CM identifier.
101914diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
101915index 93d14da..734b3d8 100644
101916--- a/include/scsi/libfc.h
101917+++ b/include/scsi/libfc.h
101918@@ -771,6 +771,7 @@ struct libfc_function_template {
101919 */
101920 void (*disc_stop_final) (struct fc_lport *);
101921 };
101922+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
101923
101924 /**
101925 * struct fc_disc - Discovery context
101926@@ -875,7 +876,7 @@ struct fc_lport {
101927 struct fc_vport *vport;
101928
101929 /* Operational Information */
101930- struct libfc_function_template tt;
101931+ libfc_function_template_no_const tt;
101932 u8 link_up;
101933 u8 qfull;
101934 enum fc_lport_state state;
101935diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
101936index a4c9336..d6f8f34 100644
101937--- a/include/scsi/scsi_device.h
101938+++ b/include/scsi/scsi_device.h
101939@@ -185,9 +185,9 @@ struct scsi_device {
101940 unsigned int max_device_blocked; /* what device_blocked counts down from */
101941 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
101942
101943- atomic_t iorequest_cnt;
101944- atomic_t iodone_cnt;
101945- atomic_t ioerr_cnt;
101946+ atomic_unchecked_t iorequest_cnt;
101947+ atomic_unchecked_t iodone_cnt;
101948+ atomic_unchecked_t ioerr_cnt;
101949
101950 struct device sdev_gendev,
101951 sdev_dev;
101952diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
101953index 891a658..fcd68df 100644
101954--- a/include/scsi/scsi_driver.h
101955+++ b/include/scsi/scsi_driver.h
101956@@ -14,7 +14,7 @@ struct scsi_driver {
101957 void (*rescan)(struct device *);
101958 int (*init_command)(struct scsi_cmnd *);
101959 void (*uninit_command)(struct scsi_cmnd *);
101960- int (*done)(struct scsi_cmnd *);
101961+ unsigned int (*done)(struct scsi_cmnd *);
101962 int (*eh_action)(struct scsi_cmnd *, int);
101963 };
101964 #define to_scsi_driver(drv) \
101965diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
101966index 784bc2c..855a04c 100644
101967--- a/include/scsi/scsi_transport_fc.h
101968+++ b/include/scsi/scsi_transport_fc.h
101969@@ -757,7 +757,8 @@ struct fc_function_template {
101970 unsigned long show_host_system_hostname:1;
101971
101972 unsigned long disable_target_scan:1;
101973-};
101974+} __do_const;
101975+typedef struct fc_function_template __no_const fc_function_template_no_const;
101976
101977
101978 /**
101979diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
101980index fa1d055..3647940 100644
101981--- a/include/sound/compress_driver.h
101982+++ b/include/sound/compress_driver.h
101983@@ -130,7 +130,7 @@ struct snd_compr_ops {
101984 struct snd_compr_caps *caps);
101985 int (*get_codec_caps) (struct snd_compr_stream *stream,
101986 struct snd_compr_codec_caps *codec);
101987-};
101988+} __no_const;
101989
101990 /**
101991 * struct snd_compr: Compressed device
101992diff --git a/include/sound/soc.h b/include/sound/soc.h
101993index f6226914..e919a2e 100644
101994--- a/include/sound/soc.h
101995+++ b/include/sound/soc.h
101996@@ -870,7 +870,7 @@ struct snd_soc_codec_driver {
101997 enum snd_soc_dapm_type, int);
101998
101999 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
102000-};
102001+} __do_const;
102002
102003 /* SoC platform interface */
102004 struct snd_soc_platform_driver {
102005@@ -897,7 +897,7 @@ struct snd_soc_platform_driver {
102006 const struct snd_compr_ops *compr_ops;
102007
102008 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
102009-};
102010+} __do_const;
102011
102012 struct snd_soc_dai_link_component {
102013 const char *name;
102014diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
102015index 480e9f8..2d59c93 100644
102016--- a/include/target/target_core_base.h
102017+++ b/include/target/target_core_base.h
102018@@ -767,7 +767,7 @@ struct se_device {
102019 atomic_long_t write_bytes;
102020 /* Active commands on this virtual SE device */
102021 atomic_t simple_cmds;
102022- atomic_t dev_ordered_id;
102023+ atomic_unchecked_t dev_ordered_id;
102024 atomic_t dev_ordered_sync;
102025 atomic_t dev_qf_count;
102026 int export_count;
102027diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
102028new file mode 100644
102029index 0000000..fb634b7
102030--- /dev/null
102031+++ b/include/trace/events/fs.h
102032@@ -0,0 +1,53 @@
102033+#undef TRACE_SYSTEM
102034+#define TRACE_SYSTEM fs
102035+
102036+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
102037+#define _TRACE_FS_H
102038+
102039+#include <linux/fs.h>
102040+#include <linux/tracepoint.h>
102041+
102042+TRACE_EVENT(do_sys_open,
102043+
102044+ TP_PROTO(const char *filename, int flags, int mode),
102045+
102046+ TP_ARGS(filename, flags, mode),
102047+
102048+ TP_STRUCT__entry(
102049+ __string( filename, filename )
102050+ __field( int, flags )
102051+ __field( int, mode )
102052+ ),
102053+
102054+ TP_fast_assign(
102055+ __assign_str(filename, filename);
102056+ __entry->flags = flags;
102057+ __entry->mode = mode;
102058+ ),
102059+
102060+ TP_printk("\"%s\" %x %o",
102061+ __get_str(filename), __entry->flags, __entry->mode)
102062+);
102063+
102064+TRACE_EVENT(open_exec,
102065+
102066+ TP_PROTO(const char *filename),
102067+
102068+ TP_ARGS(filename),
102069+
102070+ TP_STRUCT__entry(
102071+ __string( filename, filename )
102072+ ),
102073+
102074+ TP_fast_assign(
102075+ __assign_str(filename, filename);
102076+ ),
102077+
102078+ TP_printk("\"%s\"",
102079+ __get_str(filename))
102080+);
102081+
102082+#endif /* _TRACE_FS_H */
102083+
102084+/* This part must be outside protection */
102085+#include <trace/define_trace.h>
102086diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
102087index ff8f6c0..6b6bae3 100644
102088--- a/include/trace/events/irq.h
102089+++ b/include/trace/events/irq.h
102090@@ -51,7 +51,7 @@ SOFTIRQ_NAME_LIST
102091 */
102092 TRACE_EVENT(irq_handler_entry,
102093
102094- TP_PROTO(int irq, struct irqaction *action),
102095+ TP_PROTO(int irq, const struct irqaction *action),
102096
102097 TP_ARGS(irq, action),
102098
102099@@ -81,7 +81,7 @@ TRACE_EVENT(irq_handler_entry,
102100 */
102101 TRACE_EVENT(irq_handler_exit,
102102
102103- TP_PROTO(int irq, struct irqaction *action, int ret),
102104+ TP_PROTO(int irq, const struct irqaction *action, int ret),
102105
102106 TP_ARGS(irq, action, ret),
102107
102108diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
102109index 551b673..9c680df 100644
102110--- a/include/uapi/drm/i915_drm.h
102111+++ b/include/uapi/drm/i915_drm.h
102112@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {
102113 #define I915_PARAM_REVISION 32
102114 #define I915_PARAM_SUBSLICE_TOTAL 33
102115 #define I915_PARAM_EU_TOTAL 34
102116+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
102117
102118 typedef struct drm_i915_getparam {
102119 int param;
102120diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
102121index 7caf44c..23c6f27 100644
102122--- a/include/uapi/linux/a.out.h
102123+++ b/include/uapi/linux/a.out.h
102124@@ -39,6 +39,14 @@ enum machine_type {
102125 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
102126 };
102127
102128+/* Constants for the N_FLAGS field */
102129+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102130+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
102131+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
102132+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
102133+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102134+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102135+
102136 #if !defined (N_MAGIC)
102137 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
102138 #endif
102139diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
102140index 22b6ad3..aeba37e 100644
102141--- a/include/uapi/linux/bcache.h
102142+++ b/include/uapi/linux/bcache.h
102143@@ -5,6 +5,7 @@
102144 * Bcache on disk data structures
102145 */
102146
102147+#include <linux/compiler.h>
102148 #include <asm/types.h>
102149
102150 #define BITMASK(name, type, field, offset, size) \
102151@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
102152 /* Btree keys - all units are in sectors */
102153
102154 struct bkey {
102155- __u64 high;
102156- __u64 low;
102157+ __u64 high __intentional_overflow(-1);
102158+ __u64 low __intentional_overflow(-1);
102159 __u64 ptr[];
102160 };
102161
102162diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
102163index d876736..ccce5c0 100644
102164--- a/include/uapi/linux/byteorder/little_endian.h
102165+++ b/include/uapi/linux/byteorder/little_endian.h
102166@@ -42,51 +42,51 @@
102167
102168 static inline __le64 __cpu_to_le64p(const __u64 *p)
102169 {
102170- return (__force __le64)*p;
102171+ return (__force const __le64)*p;
102172 }
102173-static inline __u64 __le64_to_cpup(const __le64 *p)
102174+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
102175 {
102176- return (__force __u64)*p;
102177+ return (__force const __u64)*p;
102178 }
102179 static inline __le32 __cpu_to_le32p(const __u32 *p)
102180 {
102181- return (__force __le32)*p;
102182+ return (__force const __le32)*p;
102183 }
102184 static inline __u32 __le32_to_cpup(const __le32 *p)
102185 {
102186- return (__force __u32)*p;
102187+ return (__force const __u32)*p;
102188 }
102189 static inline __le16 __cpu_to_le16p(const __u16 *p)
102190 {
102191- return (__force __le16)*p;
102192+ return (__force const __le16)*p;
102193 }
102194 static inline __u16 __le16_to_cpup(const __le16 *p)
102195 {
102196- return (__force __u16)*p;
102197+ return (__force const __u16)*p;
102198 }
102199 static inline __be64 __cpu_to_be64p(const __u64 *p)
102200 {
102201- return (__force __be64)__swab64p(p);
102202+ return (__force const __be64)__swab64p(p);
102203 }
102204 static inline __u64 __be64_to_cpup(const __be64 *p)
102205 {
102206- return __swab64p((__u64 *)p);
102207+ return __swab64p((const __u64 *)p);
102208 }
102209 static inline __be32 __cpu_to_be32p(const __u32 *p)
102210 {
102211- return (__force __be32)__swab32p(p);
102212+ return (__force const __be32)__swab32p(p);
102213 }
102214-static inline __u32 __be32_to_cpup(const __be32 *p)
102215+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
102216 {
102217- return __swab32p((__u32 *)p);
102218+ return __swab32p((const __u32 *)p);
102219 }
102220 static inline __be16 __cpu_to_be16p(const __u16 *p)
102221 {
102222- return (__force __be16)__swab16p(p);
102223+ return (__force const __be16)__swab16p(p);
102224 }
102225 static inline __u16 __be16_to_cpup(const __be16 *p)
102226 {
102227- return __swab16p((__u16 *)p);
102228+ return __swab16p((const __u16 *)p);
102229 }
102230 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
102231 #define __le64_to_cpus(x) do { (void)(x); } while (0)
102232diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
102233index 71e1d0e..6cc9caf 100644
102234--- a/include/uapi/linux/elf.h
102235+++ b/include/uapi/linux/elf.h
102236@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
102237 #define PT_GNU_EH_FRAME 0x6474e550
102238
102239 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
102240+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
102241+
102242+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
102243+
102244+/* Constants for the e_flags field */
102245+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102246+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
102247+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
102248+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
102249+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102250+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102251
102252 /*
102253 * Extended Numbering
102254@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
102255 #define DT_DEBUG 21
102256 #define DT_TEXTREL 22
102257 #define DT_JMPREL 23
102258+#define DT_FLAGS 30
102259+ #define DF_TEXTREL 0x00000004
102260 #define DT_ENCODING 32
102261 #define OLD_DT_LOOS 0x60000000
102262 #define DT_LOOS 0x6000000d
102263@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
102264 #define PF_W 0x2
102265 #define PF_X 0x1
102266
102267+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
102268+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
102269+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
102270+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
102271+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
102272+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
102273+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
102274+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
102275+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
102276+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
102277+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
102278+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
102279+
102280 typedef struct elf32_phdr{
102281 Elf32_Word p_type;
102282 Elf32_Off p_offset;
102283@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
102284 #define EI_OSABI 7
102285 #define EI_PAD 8
102286
102287+#define EI_PAX 14
102288+
102289 #define ELFMAG0 0x7f /* EI_MAG */
102290 #define ELFMAG1 'E'
102291 #define ELFMAG2 'L'
102292diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
102293index aa169c4..6a2771d 100644
102294--- a/include/uapi/linux/personality.h
102295+++ b/include/uapi/linux/personality.h
102296@@ -30,6 +30,7 @@ enum {
102297 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
102298 ADDR_NO_RANDOMIZE | \
102299 ADDR_COMPAT_LAYOUT | \
102300+ ADDR_LIMIT_3GB | \
102301 MMAP_PAGE_ZERO)
102302
102303 /*
102304diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
102305index 7530e74..e714828 100644
102306--- a/include/uapi/linux/screen_info.h
102307+++ b/include/uapi/linux/screen_info.h
102308@@ -43,7 +43,8 @@ struct screen_info {
102309 __u16 pages; /* 0x32 */
102310 __u16 vesa_attributes; /* 0x34 */
102311 __u32 capabilities; /* 0x36 */
102312- __u8 _reserved[6]; /* 0x3a */
102313+ __u16 vesapm_size; /* 0x3a */
102314+ __u8 _reserved[4]; /* 0x3c */
102315 } __attribute__((packed));
102316
102317 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
102318diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
102319index 0e011eb..82681b1 100644
102320--- a/include/uapi/linux/swab.h
102321+++ b/include/uapi/linux/swab.h
102322@@ -43,7 +43,7 @@
102323 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
102324 */
102325
102326-static inline __attribute_const__ __u16 __fswab16(__u16 val)
102327+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
102328 {
102329 #ifdef __HAVE_BUILTIN_BSWAP16__
102330 return __builtin_bswap16(val);
102331@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
102332 #endif
102333 }
102334
102335-static inline __attribute_const__ __u32 __fswab32(__u32 val)
102336+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
102337 {
102338 #ifdef __HAVE_BUILTIN_BSWAP32__
102339 return __builtin_bswap32(val);
102340@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
102341 #endif
102342 }
102343
102344-static inline __attribute_const__ __u64 __fswab64(__u64 val)
102345+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
102346 {
102347 #ifdef __HAVE_BUILTIN_BSWAP64__
102348 return __builtin_bswap64(val);
102349diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
102350index 1590c49..5eab462 100644
102351--- a/include/uapi/linux/xattr.h
102352+++ b/include/uapi/linux/xattr.h
102353@@ -73,5 +73,9 @@
102354 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
102355 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
102356
102357+/* User namespace */
102358+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
102359+#define XATTR_PAX_FLAGS_SUFFIX "flags"
102360+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
102361
102362 #endif /* _UAPI_LINUX_XATTR_H */
102363diff --git a/include/video/udlfb.h b/include/video/udlfb.h
102364index f9466fa..f4e2b81 100644
102365--- a/include/video/udlfb.h
102366+++ b/include/video/udlfb.h
102367@@ -53,10 +53,10 @@ struct dlfb_data {
102368 u32 pseudo_palette[256];
102369 int blank_mode; /*one of FB_BLANK_ */
102370 /* blit-only rendering path metrics, exposed through sysfs */
102371- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102372- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
102373- atomic_t bytes_sent; /* to usb, after compression including overhead */
102374- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
102375+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102376+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
102377+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
102378+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
102379 };
102380
102381 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
102382diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
102383index 30f5362..8ed8ac9 100644
102384--- a/include/video/uvesafb.h
102385+++ b/include/video/uvesafb.h
102386@@ -122,6 +122,7 @@ struct uvesafb_par {
102387 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
102388 u8 pmi_setpal; /* PMI for palette changes */
102389 u16 *pmi_base; /* protected mode interface location */
102390+ u8 *pmi_code; /* protected mode code location */
102391 void *pmi_start;
102392 void *pmi_pal;
102393 u8 *vbe_state_orig; /*
102394diff --git a/init/Kconfig b/init/Kconfig
102395index dc24dec..b77638f 100644
102396--- a/init/Kconfig
102397+++ b/init/Kconfig
102398@@ -1145,6 +1145,7 @@ endif # CGROUPS
102399
102400 config CHECKPOINT_RESTORE
102401 bool "Checkpoint/restore support" if EXPERT
102402+ depends on !GRKERNSEC
102403 default n
102404 help
102405 Enables additional kernel features in a sake of checkpoint/restore.
102406@@ -1670,7 +1671,7 @@ config SLUB_DEBUG
102407
102408 config COMPAT_BRK
102409 bool "Disable heap randomization"
102410- default y
102411+ default n
102412 help
102413 Randomizing heap placement makes heap exploits harder, but it
102414 also breaks ancient binaries (including anything libc5 based).
102415@@ -2001,7 +2002,7 @@ config INIT_ALL_POSSIBLE
102416 config STOP_MACHINE
102417 bool
102418 default y
102419- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
102420+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
102421 help
102422 Need stop_machine() primitive.
102423
102424diff --git a/init/Makefile b/init/Makefile
102425index 7bc47ee..6da2dc7 100644
102426--- a/init/Makefile
102427+++ b/init/Makefile
102428@@ -2,6 +2,9 @@
102429 # Makefile for the linux kernel.
102430 #
102431
102432+ccflags-y := $(GCC_PLUGINS_CFLAGS)
102433+asflags-y := $(GCC_PLUGINS_AFLAGS)
102434+
102435 obj-y := main.o version.o mounts.o
102436 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
102437 obj-y += noinitramfs.o
102438diff --git a/init/do_mounts.c b/init/do_mounts.c
102439index a95bbdb..82c48fd 100644
102440--- a/init/do_mounts.c
102441+++ b/init/do_mounts.c
102442@@ -363,11 +363,11 @@ static void __init get_fs_names(char *page)
102443 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
102444 {
102445 struct super_block *s;
102446- int err = sys_mount(name, "/root", fs, flags, data);
102447+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
102448 if (err)
102449 return err;
102450
102451- sys_chdir("/root");
102452+ sys_chdir((const char __force_user *)"/root");
102453 s = current->fs->pwd.dentry->d_sb;
102454 ROOT_DEV = s->s_dev;
102455 printk(KERN_INFO
102456@@ -490,18 +490,18 @@ void __init change_floppy(char *fmt, ...)
102457 va_start(args, fmt);
102458 vsprintf(buf, fmt, args);
102459 va_end(args);
102460- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
102461+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
102462 if (fd >= 0) {
102463 sys_ioctl(fd, FDEJECT, 0);
102464 sys_close(fd);
102465 }
102466 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
102467- fd = sys_open("/dev/console", O_RDWR, 0);
102468+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
102469 if (fd >= 0) {
102470 sys_ioctl(fd, TCGETS, (long)&termios);
102471 termios.c_lflag &= ~ICANON;
102472 sys_ioctl(fd, TCSETSF, (long)&termios);
102473- sys_read(fd, &c, 1);
102474+ sys_read(fd, (char __user *)&c, 1);
102475 termios.c_lflag |= ICANON;
102476 sys_ioctl(fd, TCSETSF, (long)&termios);
102477 sys_close(fd);
102478@@ -595,8 +595,8 @@ void __init prepare_namespace(void)
102479 mount_root();
102480 out:
102481 devtmpfs_mount("dev");
102482- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102483- sys_chroot(".");
102484+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102485+ sys_chroot((const char __force_user *)".");
102486 }
102487
102488 static bool is_tmpfs;
102489diff --git a/init/do_mounts.h b/init/do_mounts.h
102490index f5b978a..69dbfe8 100644
102491--- a/init/do_mounts.h
102492+++ b/init/do_mounts.h
102493@@ -15,15 +15,15 @@ extern int root_mountflags;
102494
102495 static inline int create_dev(char *name, dev_t dev)
102496 {
102497- sys_unlink(name);
102498- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
102499+ sys_unlink((char __force_user *)name);
102500+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
102501 }
102502
102503 #if BITS_PER_LONG == 32
102504 static inline u32 bstat(char *name)
102505 {
102506 struct stat64 stat;
102507- if (sys_stat64(name, &stat) != 0)
102508+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
102509 return 0;
102510 if (!S_ISBLK(stat.st_mode))
102511 return 0;
102512@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
102513 static inline u32 bstat(char *name)
102514 {
102515 struct stat stat;
102516- if (sys_newstat(name, &stat) != 0)
102517+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
102518 return 0;
102519 if (!S_ISBLK(stat.st_mode))
102520 return 0;
102521diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
102522index 3e0878e..8a9d7a0 100644
102523--- a/init/do_mounts_initrd.c
102524+++ b/init/do_mounts_initrd.c
102525@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
102526 {
102527 sys_unshare(CLONE_FS | CLONE_FILES);
102528 /* stdin/stdout/stderr for /linuxrc */
102529- sys_open("/dev/console", O_RDWR, 0);
102530+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
102531 sys_dup(0);
102532 sys_dup(0);
102533 /* move initrd over / and chdir/chroot in initrd root */
102534- sys_chdir("/root");
102535- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102536- sys_chroot(".");
102537+ sys_chdir((const char __force_user *)"/root");
102538+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102539+ sys_chroot((const char __force_user *)".");
102540 sys_setsid();
102541 return 0;
102542 }
102543@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
102544 create_dev("/dev/root.old", Root_RAM0);
102545 /* mount initrd on rootfs' /root */
102546 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
102547- sys_mkdir("/old", 0700);
102548- sys_chdir("/old");
102549+ sys_mkdir((const char __force_user *)"/old", 0700);
102550+ sys_chdir((const char __force_user *)"/old");
102551
102552 /* try loading default modules from initrd */
102553 load_default_modules();
102554@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
102555 current->flags &= ~PF_FREEZER_SKIP;
102556
102557 /* move initrd to rootfs' /old */
102558- sys_mount("..", ".", NULL, MS_MOVE, NULL);
102559+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
102560 /* switch root and cwd back to / of rootfs */
102561- sys_chroot("..");
102562+ sys_chroot((const char __force_user *)"..");
102563
102564 if (new_decode_dev(real_root_dev) == Root_RAM0) {
102565- sys_chdir("/old");
102566+ sys_chdir((const char __force_user *)"/old");
102567 return;
102568 }
102569
102570- sys_chdir("/");
102571+ sys_chdir((const char __force_user *)"/");
102572 ROOT_DEV = new_decode_dev(real_root_dev);
102573 mount_root();
102574
102575 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
102576- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
102577+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
102578 if (!error)
102579 printk("okay\n");
102580 else {
102581- int fd = sys_open("/dev/root.old", O_RDWR, 0);
102582+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
102583 if (error == -ENOENT)
102584 printk("/initrd does not exist. Ignored.\n");
102585 else
102586 printk("failed\n");
102587 printk(KERN_NOTICE "Unmounting old root\n");
102588- sys_umount("/old", MNT_DETACH);
102589+ sys_umount((char __force_user *)"/old", MNT_DETACH);
102590 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
102591 if (fd < 0) {
102592 error = fd;
102593@@ -127,11 +127,11 @@ int __init initrd_load(void)
102594 * mounted in the normal path.
102595 */
102596 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
102597- sys_unlink("/initrd.image");
102598+ sys_unlink((const char __force_user *)"/initrd.image");
102599 handle_initrd();
102600 return 1;
102601 }
102602 }
102603- sys_unlink("/initrd.image");
102604+ sys_unlink((const char __force_user *)"/initrd.image");
102605 return 0;
102606 }
102607diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
102608index 8cb6db5..d729f50 100644
102609--- a/init/do_mounts_md.c
102610+++ b/init/do_mounts_md.c
102611@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
102612 partitioned ? "_d" : "", minor,
102613 md_setup_args[ent].device_names);
102614
102615- fd = sys_open(name, 0, 0);
102616+ fd = sys_open((char __force_user *)name, 0, 0);
102617 if (fd < 0) {
102618 printk(KERN_ERR "md: open failed - cannot start "
102619 "array %s\n", name);
102620@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
102621 * array without it
102622 */
102623 sys_close(fd);
102624- fd = sys_open(name, 0, 0);
102625+ fd = sys_open((char __force_user *)name, 0, 0);
102626 sys_ioctl(fd, BLKRRPART, 0);
102627 }
102628 sys_close(fd);
102629@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
102630
102631 wait_for_device_probe();
102632
102633- fd = sys_open("/dev/md0", 0, 0);
102634+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
102635 if (fd >= 0) {
102636 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
102637 sys_close(fd);
102638diff --git a/init/init_task.c b/init/init_task.c
102639index ba0a7f36..2bcf1d5 100644
102640--- a/init/init_task.c
102641+++ b/init/init_task.c
102642@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
102643 * Initial thread structure. Alignment of this is handled by a special
102644 * linker map entry.
102645 */
102646+#ifdef CONFIG_X86
102647+union thread_union init_thread_union __init_task_data;
102648+#else
102649 union thread_union init_thread_union __init_task_data =
102650 { INIT_THREAD_INFO(init_task) };
102651+#endif
102652diff --git a/init/initramfs.c b/init/initramfs.c
102653index ad1bd77..dca2c1b 100644
102654--- a/init/initramfs.c
102655+++ b/init/initramfs.c
102656@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
102657
102658 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
102659 while (count) {
102660- ssize_t rv = sys_write(fd, p, count);
102661+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
102662
102663 if (rv < 0) {
102664 if (rv == -EINTR || rv == -EAGAIN)
102665@@ -107,7 +107,7 @@ static void __init free_hash(void)
102666 }
102667 }
102668
102669-static long __init do_utime(char *filename, time_t mtime)
102670+static long __init do_utime(char __force_user *filename, time_t mtime)
102671 {
102672 struct timespec t[2];
102673
102674@@ -142,7 +142,7 @@ static void __init dir_utime(void)
102675 struct dir_entry *de, *tmp;
102676 list_for_each_entry_safe(de, tmp, &dir_list, list) {
102677 list_del(&de->list);
102678- do_utime(de->name, de->mtime);
102679+ do_utime((char __force_user *)de->name, de->mtime);
102680 kfree(de->name);
102681 kfree(de);
102682 }
102683@@ -304,7 +304,7 @@ static int __init maybe_link(void)
102684 if (nlink >= 2) {
102685 char *old = find_link(major, minor, ino, mode, collected);
102686 if (old)
102687- return (sys_link(old, collected) < 0) ? -1 : 1;
102688+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
102689 }
102690 return 0;
102691 }
102692@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
102693 {
102694 struct stat st;
102695
102696- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
102697+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
102698 if (S_ISDIR(st.st_mode))
102699- sys_rmdir(path);
102700+ sys_rmdir((char __force_user *)path);
102701 else
102702- sys_unlink(path);
102703+ sys_unlink((char __force_user *)path);
102704 }
102705 }
102706
102707@@ -338,7 +338,7 @@ static int __init do_name(void)
102708 int openflags = O_WRONLY|O_CREAT;
102709 if (ml != 1)
102710 openflags |= O_TRUNC;
102711- wfd = sys_open(collected, openflags, mode);
102712+ wfd = sys_open((char __force_user *)collected, openflags, mode);
102713
102714 if (wfd >= 0) {
102715 sys_fchown(wfd, uid, gid);
102716@@ -350,17 +350,17 @@ static int __init do_name(void)
102717 }
102718 }
102719 } else if (S_ISDIR(mode)) {
102720- sys_mkdir(collected, mode);
102721- sys_chown(collected, uid, gid);
102722- sys_chmod(collected, mode);
102723+ sys_mkdir((char __force_user *)collected, mode);
102724+ sys_chown((char __force_user *)collected, uid, gid);
102725+ sys_chmod((char __force_user *)collected, mode);
102726 dir_add(collected, mtime);
102727 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
102728 S_ISFIFO(mode) || S_ISSOCK(mode)) {
102729 if (maybe_link() == 0) {
102730- sys_mknod(collected, mode, rdev);
102731- sys_chown(collected, uid, gid);
102732- sys_chmod(collected, mode);
102733- do_utime(collected, mtime);
102734+ sys_mknod((char __force_user *)collected, mode, rdev);
102735+ sys_chown((char __force_user *)collected, uid, gid);
102736+ sys_chmod((char __force_user *)collected, mode);
102737+ do_utime((char __force_user *)collected, mtime);
102738 }
102739 }
102740 return 0;
102741@@ -372,7 +372,7 @@ static int __init do_copy(void)
102742 if (xwrite(wfd, victim, body_len) != body_len)
102743 error("write error");
102744 sys_close(wfd);
102745- do_utime(vcollected, mtime);
102746+ do_utime((char __force_user *)vcollected, mtime);
102747 kfree(vcollected);
102748 eat(body_len);
102749 state = SkipIt;
102750@@ -390,9 +390,9 @@ static int __init do_symlink(void)
102751 {
102752 collected[N_ALIGN(name_len) + body_len] = '\0';
102753 clean_path(collected, 0);
102754- sys_symlink(collected + N_ALIGN(name_len), collected);
102755- sys_lchown(collected, uid, gid);
102756- do_utime(collected, mtime);
102757+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
102758+ sys_lchown((char __force_user *)collected, uid, gid);
102759+ do_utime((char __force_user *)collected, mtime);
102760 state = SkipIt;
102761 next_state = Reset;
102762 return 0;
102763diff --git a/init/main.c b/init/main.c
102764index 2a89545..eb9203f 100644
102765--- a/init/main.c
102766+++ b/init/main.c
102767@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
102768 static inline void mark_rodata_ro(void) { }
102769 #endif
102770
102771+extern void grsecurity_init(void);
102772+
102773 /*
102774 * Debug helper: via this flag we know that we are in 'early bootup code'
102775 * where only the boot processor is running with IRQ disabled. This means
102776@@ -158,6 +160,84 @@ static int __init set_reset_devices(char *str)
102777
102778 __setup("reset_devices", set_reset_devices);
102779
102780+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
102781+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
102782+static int __init setup_grsec_proc_gid(char *str)
102783+{
102784+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
102785+ return 1;
102786+}
102787+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
102788+#endif
102789+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
102790+int grsec_enable_sysfs_restrict = 1;
102791+static int __init setup_grsec_sysfs_restrict(char *str)
102792+{
102793+ if (!simple_strtol(str, NULL, 0))
102794+ grsec_enable_sysfs_restrict = 0;
102795+ return 1;
102796+}
102797+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
102798+#endif
102799+
102800+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
102801+unsigned long pax_user_shadow_base __read_only;
102802+EXPORT_SYMBOL(pax_user_shadow_base);
102803+extern char pax_enter_kernel_user[];
102804+extern char pax_exit_kernel_user[];
102805+#endif
102806+
102807+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
102808+static int __init setup_pax_nouderef(char *str)
102809+{
102810+#ifdef CONFIG_X86_32
102811+ unsigned int cpu;
102812+ struct desc_struct *gdt;
102813+
102814+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
102815+ gdt = get_cpu_gdt_table(cpu);
102816+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
102817+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
102818+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
102819+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
102820+ }
102821+ loadsegment(ds, __KERNEL_DS);
102822+ loadsegment(es, __KERNEL_DS);
102823+ loadsegment(ss, __KERNEL_DS);
102824+#else
102825+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
102826+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
102827+ clone_pgd_mask = ~(pgdval_t)0UL;
102828+ pax_user_shadow_base = 0UL;
102829+ setup_clear_cpu_cap(X86_FEATURE_PCIDUDEREF);
102830+#endif
102831+
102832+ return 0;
102833+}
102834+early_param("pax_nouderef", setup_pax_nouderef);
102835+
102836+#ifdef CONFIG_X86_64
102837+static int __init setup_pax_weakuderef(char *str)
102838+{
102839+ if (clone_pgd_mask != ~(pgdval_t)0UL)
102840+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
102841+ return 1;
102842+}
102843+__setup("pax_weakuderef", setup_pax_weakuderef);
102844+#endif
102845+#endif
102846+
102847+#ifdef CONFIG_PAX_SOFTMODE
102848+int pax_softmode;
102849+
102850+static int __init setup_pax_softmode(char *str)
102851+{
102852+ get_option(&str, &pax_softmode);
102853+ return 1;
102854+}
102855+__setup("pax_softmode=", setup_pax_softmode);
102856+#endif
102857+
102858 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
102859 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
102860 static const char *panic_later, *panic_param;
102861@@ -726,7 +806,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
102862 struct blacklist_entry *entry;
102863 char *fn_name;
102864
102865- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
102866+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
102867 if (!fn_name)
102868 return false;
102869
102870@@ -778,7 +858,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
102871 {
102872 int count = preempt_count();
102873 int ret;
102874- char msgbuf[64];
102875+ const char *msg1 = "", *msg2 = "";
102876
102877 if (initcall_blacklisted(fn))
102878 return -EPERM;
102879@@ -788,18 +868,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
102880 else
102881 ret = fn();
102882
102883- msgbuf[0] = 0;
102884-
102885 if (preempt_count() != count) {
102886- sprintf(msgbuf, "preemption imbalance ");
102887+ msg1 = " preemption imbalance";
102888 preempt_count_set(count);
102889 }
102890 if (irqs_disabled()) {
102891- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
102892+ msg2 = " disabled interrupts";
102893 local_irq_enable();
102894 }
102895- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
102896+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
102897
102898+ add_latent_entropy();
102899 return ret;
102900 }
102901
102902@@ -905,8 +984,8 @@ static int run_init_process(const char *init_filename)
102903 {
102904 argv_init[0] = init_filename;
102905 return do_execve(getname_kernel(init_filename),
102906- (const char __user *const __user *)argv_init,
102907- (const char __user *const __user *)envp_init);
102908+ (const char __user *const __force_user *)argv_init,
102909+ (const char __user *const __force_user *)envp_init);
102910 }
102911
102912 static int try_to_run_init_process(const char *init_filename)
102913@@ -923,6 +1002,10 @@ static int try_to_run_init_process(const char *init_filename)
102914 return ret;
102915 }
102916
102917+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102918+extern int gr_init_ran;
102919+#endif
102920+
102921 static noinline void __init kernel_init_freeable(void);
102922
102923 static int __ref kernel_init(void *unused)
102924@@ -947,6 +1030,11 @@ static int __ref kernel_init(void *unused)
102925 ramdisk_execute_command, ret);
102926 }
102927
102928+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102929+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
102930+ gr_init_ran = 1;
102931+#endif
102932+
102933 /*
102934 * We try each of these until one succeeds.
102935 *
102936@@ -1002,7 +1090,7 @@ static noinline void __init kernel_init_freeable(void)
102937 do_basic_setup();
102938
102939 /* Open the /dev/console on the rootfs, this should never fail */
102940- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
102941+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
102942 pr_err("Warning: unable to open an initial console.\n");
102943
102944 (void) sys_dup(0);
102945@@ -1015,11 +1103,13 @@ static noinline void __init kernel_init_freeable(void)
102946 if (!ramdisk_execute_command)
102947 ramdisk_execute_command = "/init";
102948
102949- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
102950+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
102951 ramdisk_execute_command = NULL;
102952 prepare_namespace();
102953 }
102954
102955+ grsecurity_init();
102956+
102957 /*
102958 * Ok, we have completed the initial bootup, and
102959 * we're essentially up and running. Get rid of the
102960diff --git a/ipc/compat.c b/ipc/compat.c
102961index 9b3c85f..5266b0f 100644
102962--- a/ipc/compat.c
102963+++ b/ipc/compat.c
102964@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
102965 COMPAT_SHMLBA);
102966 if (err < 0)
102967 return err;
102968- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
102969+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
102970 }
102971 case SHMDT:
102972 return sys_shmdt(compat_ptr(ptr));
102973@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
102974 }
102975
102976 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
102977- unsigned, nsops,
102978+ compat_long_t, nsops,
102979 const struct compat_timespec __user *, timeout)
102980 {
102981 struct timespec __user *ts64;
102982diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
102983index 8ad93c2..efd80f8 100644
102984--- a/ipc/ipc_sysctl.c
102985+++ b/ipc/ipc_sysctl.c
102986@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
102987 static int proc_ipc_dointvec(struct ctl_table *table, int write,
102988 void __user *buffer, size_t *lenp, loff_t *ppos)
102989 {
102990- struct ctl_table ipc_table;
102991+ ctl_table_no_const ipc_table;
102992
102993 memcpy(&ipc_table, table, sizeof(ipc_table));
102994 ipc_table.data = get_ipc(table);
102995@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
102996 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
102997 void __user *buffer, size_t *lenp, loff_t *ppos)
102998 {
102999- struct ctl_table ipc_table;
103000+ ctl_table_no_const ipc_table;
103001
103002 memcpy(&ipc_table, table, sizeof(ipc_table));
103003 ipc_table.data = get_ipc(table);
103004@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
103005 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
103006 void __user *buffer, size_t *lenp, loff_t *ppos)
103007 {
103008- struct ctl_table ipc_table;
103009+ ctl_table_no_const ipc_table;
103010 memcpy(&ipc_table, table, sizeof(ipc_table));
103011 ipc_table.data = get_ipc(table);
103012
103013@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
103014 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
103015 void __user *buffer, size_t *lenp, loff_t *ppos)
103016 {
103017- struct ctl_table ipc_table;
103018+ ctl_table_no_const ipc_table;
103019 int dummy = 0;
103020
103021 memcpy(&ipc_table, table, sizeof(ipc_table));
103022diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
103023index 68d4e95..1477ded 100644
103024--- a/ipc/mq_sysctl.c
103025+++ b/ipc/mq_sysctl.c
103026@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
103027 static int proc_mq_dointvec(struct ctl_table *table, int write,
103028 void __user *buffer, size_t *lenp, loff_t *ppos)
103029 {
103030- struct ctl_table mq_table;
103031+ ctl_table_no_const mq_table;
103032 memcpy(&mq_table, table, sizeof(mq_table));
103033 mq_table.data = get_mq(table);
103034
103035@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
103036 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
103037 void __user *buffer, size_t *lenp, loff_t *ppos)
103038 {
103039- struct ctl_table mq_table;
103040+ ctl_table_no_const mq_table;
103041 memcpy(&mq_table, table, sizeof(mq_table));
103042 mq_table.data = get_mq(table);
103043
103044diff --git a/ipc/mqueue.c b/ipc/mqueue.c
103045index 3aaea7f..e8a13d6 100644
103046--- a/ipc/mqueue.c
103047+++ b/ipc/mqueue.c
103048@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
103049 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
103050 info->attr.mq_msgsize);
103051
103052+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
103053 spin_lock(&mq_lock);
103054 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
103055 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
103056diff --git a/ipc/sem.c b/ipc/sem.c
103057index d1a6edd..ef08b40 100644
103058--- a/ipc/sem.c
103059+++ b/ipc/sem.c
103060@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
103061 }
103062
103063 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
103064- unsigned, nsops, const struct timespec __user *, timeout)
103065+ long, nsops, const struct timespec __user *, timeout)
103066 {
103067 int error = -EINVAL;
103068 struct sem_array *sma;
103069@@ -2015,7 +2015,7 @@ out_free:
103070 }
103071
103072 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
103073- unsigned, nsops)
103074+ long, nsops)
103075 {
103076 return sys_semtimedop(semid, tsops, nsops, NULL);
103077 }
103078diff --git a/ipc/shm.c b/ipc/shm.c
103079index 6d76707..b646bbe 100644
103080--- a/ipc/shm.c
103081+++ b/ipc/shm.c
103082@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
103083 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
103084 #endif
103085
103086+#ifdef CONFIG_GRKERNSEC
103087+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
103088+ const u64 shm_createtime, const kuid_t cuid,
103089+ const int shmid);
103090+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
103091+ const u64 shm_createtime);
103092+#endif
103093+
103094 void shm_init_ns(struct ipc_namespace *ns)
103095 {
103096 ns->shm_ctlmax = SHMMAX;
103097@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
103098 shp->shm_lprid = 0;
103099 shp->shm_atim = shp->shm_dtim = 0;
103100 shp->shm_ctim = get_seconds();
103101+#ifdef CONFIG_GRKERNSEC
103102+ shp->shm_createtime = ktime_get_ns();
103103+#endif
103104 shp->shm_segsz = size;
103105 shp->shm_nattch = 0;
103106 shp->shm_file = file;
103107@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103108 f_mode = FMODE_READ | FMODE_WRITE;
103109 }
103110 if (shmflg & SHM_EXEC) {
103111+
103112+#ifdef CONFIG_PAX_MPROTECT
103113+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
103114+ goto out;
103115+#endif
103116+
103117 prot |= PROT_EXEC;
103118 acc_mode |= S_IXUGO;
103119 }
103120@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103121 if (err)
103122 goto out_unlock;
103123
103124+#ifdef CONFIG_GRKERNSEC
103125+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
103126+ shp->shm_perm.cuid, shmid) ||
103127+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
103128+ err = -EACCES;
103129+ goto out_unlock;
103130+ }
103131+#endif
103132+
103133 ipc_lock_object(&shp->shm_perm);
103134
103135 /* check if shm_destroy() is tearing down shp */
103136@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103137 path = shp->shm_file->f_path;
103138 path_get(&path);
103139 shp->shm_nattch++;
103140+#ifdef CONFIG_GRKERNSEC
103141+ shp->shm_lapid = current->pid;
103142+#endif
103143 size = i_size_read(d_inode(path.dentry));
103144 ipc_unlock_object(&shp->shm_perm);
103145 rcu_read_unlock();
103146diff --git a/ipc/util.c b/ipc/util.c
103147index ff3323e..d6d63d1 100644
103148--- a/ipc/util.c
103149+++ b/ipc/util.c
103150@@ -71,6 +71,8 @@ struct ipc_proc_iface {
103151 int (*show)(struct seq_file *, void *);
103152 };
103153
103154+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
103155+
103156 /**
103157 * ipc_init - initialise ipc subsystem
103158 *
103159@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
103160 granted_mode >>= 6;
103161 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
103162 granted_mode >>= 3;
103163+
103164+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
103165+ return -1;
103166+
103167 /* is there some bit set in requested_mode but not in granted_mode? */
103168 if ((requested_mode & ~granted_mode & 0007) &&
103169 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
103170diff --git a/kernel/audit.c b/kernel/audit.c
103171index 1c13e42..6c171ab 100644
103172--- a/kernel/audit.c
103173+++ b/kernel/audit.c
103174@@ -124,7 +124,7 @@ u32 audit_sig_sid = 0;
103175 3) suppressed due to audit_rate_limit
103176 4) suppressed due to audit_backlog_limit
103177 */
103178-static atomic_t audit_lost = ATOMIC_INIT(0);
103179+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
103180
103181 /* The netlink socket. */
103182 static struct sock *audit_sock;
103183@@ -258,7 +258,7 @@ void audit_log_lost(const char *message)
103184 unsigned long now;
103185 int print;
103186
103187- atomic_inc(&audit_lost);
103188+ atomic_inc_unchecked(&audit_lost);
103189
103190 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
103191
103192@@ -275,7 +275,7 @@ void audit_log_lost(const char *message)
103193 if (print) {
103194 if (printk_ratelimit())
103195 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
103196- atomic_read(&audit_lost),
103197+ atomic_read_unchecked(&audit_lost),
103198 audit_rate_limit,
103199 audit_backlog_limit);
103200 audit_panic(message);
103201@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
103202 s.pid = audit_pid;
103203 s.rate_limit = audit_rate_limit;
103204 s.backlog_limit = audit_backlog_limit;
103205- s.lost = atomic_read(&audit_lost);
103206+ s.lost = atomic_read_unchecked(&audit_lost);
103207 s.backlog = skb_queue_len(&audit_skb_queue);
103208 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
103209 s.backlog_wait_time = audit_backlog_wait_time_master;
103210diff --git a/kernel/auditsc.c b/kernel/auditsc.c
103211index 9fb9d1c..afb1610 100644
103212--- a/kernel/auditsc.c
103213+++ b/kernel/auditsc.c
103214@@ -1023,7 +1023,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
103215 * for strings that are too long, we should not have created
103216 * any.
103217 */
103218- if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) {
103219+ if (unlikely(len > MAX_ARG_STRLEN - 1)) {
103220 WARN_ON(1);
103221 send_sig(SIGKILL, current, 0);
103222 return -1;
103223@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
103224 }
103225
103226 /* global counter which is incremented every time something logs in */
103227-static atomic_t session_id = ATOMIC_INIT(0);
103228+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
103229
103230 static int audit_set_loginuid_perm(kuid_t loginuid)
103231 {
103232@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
103233
103234 /* are we setting or clearing? */
103235 if (uid_valid(loginuid))
103236- sessionid = (unsigned int)atomic_inc_return(&session_id);
103237+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
103238
103239 task->sessionid = sessionid;
103240 task->loginuid = loginuid;
103241diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
103242index 54f0e7f..fed997b 100644
103243--- a/kernel/bpf/core.c
103244+++ b/kernel/bpf/core.c
103245@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103246 * random section of illegal instructions.
103247 */
103248 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
103249- hdr = module_alloc(size);
103250+ hdr = module_alloc_exec(size);
103251 if (hdr == NULL)
103252 return NULL;
103253
103254 /* Fill space with illegal/arch-dep instructions. */
103255 bpf_fill_ill_insns(hdr, size);
103256
103257+ pax_open_kernel();
103258 hdr->pages = size / PAGE_SIZE;
103259+ pax_close_kernel();
103260+
103261 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
103262 PAGE_SIZE - sizeof(*hdr));
103263 start = (prandom_u32() % hole) & ~(alignment - 1);
103264@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103265
103266 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
103267 {
103268- module_memfree(hdr);
103269+ module_memfree_exec(hdr);
103270 }
103271 #endif /* CONFIG_BPF_JIT */
103272
103273diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
103274index 3bae6c5..59ea175 100644
103275--- a/kernel/bpf/syscall.c
103276+++ b/kernel/bpf/syscall.c
103277@@ -554,11 +554,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
103278 int err;
103279
103280 /* the syscall is limited to root temporarily. This restriction will be
103281- * lifted when security audit is clean. Note that eBPF+tracing must have
103282- * this restriction, since it may pass kernel data to user space
103283+ * lifted by upstream when a half-assed security audit is clean. Note
103284+ * that eBPF+tracing must have this restriction, since it may pass
103285+ * kernel data to user space
103286 */
103287 if (!capable(CAP_SYS_ADMIN))
103288 return -EPERM;
103289+#ifdef CONFIG_GRKERNSEC
103290+ return -EPERM;
103291+#endif
103292
103293 if (!access_ok(VERIFY_READ, uattr, 1))
103294 return -EFAULT;
103295diff --git a/kernel/capability.c b/kernel/capability.c
103296index 45432b5..988f1e4 100644
103297--- a/kernel/capability.c
103298+++ b/kernel/capability.c
103299@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
103300 * before modification is attempted and the application
103301 * fails.
103302 */
103303+ if (tocopy > ARRAY_SIZE(kdata))
103304+ return -EFAULT;
103305+
103306 if (copy_to_user(dataptr, kdata, tocopy
103307 * sizeof(struct __user_cap_data_struct))) {
103308 return -EFAULT;
103309@@ -298,10 +301,11 @@ bool has_ns_capability(struct task_struct *t,
103310 int ret;
103311
103312 rcu_read_lock();
103313- ret = security_capable(__task_cred(t), ns, cap);
103314+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
103315+ gr_task_is_capable(t, __task_cred(t), cap);
103316 rcu_read_unlock();
103317
103318- return (ret == 0);
103319+ return ret;
103320 }
103321
103322 /**
103323@@ -338,10 +342,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
103324 int ret;
103325
103326 rcu_read_lock();
103327- ret = security_capable_noaudit(__task_cred(t), ns, cap);
103328+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
103329 rcu_read_unlock();
103330
103331- return (ret == 0);
103332+ return ret;
103333 }
103334
103335 /**
103336@@ -379,7 +383,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
103337 BUG();
103338 }
103339
103340- if (security_capable(current_cred(), ns, cap) == 0) {
103341+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
103342 current->flags |= PF_SUPERPRIV;
103343 return true;
103344 }
103345@@ -387,6 +391,20 @@ bool ns_capable(struct user_namespace *ns, int cap)
103346 }
103347 EXPORT_SYMBOL(ns_capable);
103348
103349+bool ns_capable_nolog(struct user_namespace *ns, int cap)
103350+{
103351+ if (unlikely(!cap_valid(cap))) {
103352+ pr_crit("capable_nolog() called with invalid cap=%u\n", cap);
103353+ BUG();
103354+ }
103355+
103356+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
103357+ current->flags |= PF_SUPERPRIV;
103358+ return true;
103359+ }
103360+ return false;
103361+}
103362+EXPORT_SYMBOL(ns_capable_nolog);
103363
103364 /**
103365 * capable - Determine if the current task has a superior capability in effect
103366@@ -403,6 +421,13 @@ bool capable(int cap)
103367 return ns_capable(&init_user_ns, cap);
103368 }
103369 EXPORT_SYMBOL(capable);
103370+
103371+bool capable_nolog(int cap)
103372+{
103373+ return ns_capable_nolog(&init_user_ns, cap);
103374+}
103375+EXPORT_SYMBOL(capable_nolog);
103376+
103377 #endif /* CONFIG_MULTIUSER */
103378
103379 /**
103380@@ -447,3 +472,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
103381 kgid_has_mapping(ns, inode->i_gid);
103382 }
103383 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
103384+
103385+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
103386+{
103387+ struct user_namespace *ns = current_user_ns();
103388+
103389+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
103390+ kgid_has_mapping(ns, inode->i_gid);
103391+}
103392+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
103393diff --git a/kernel/cgroup.c b/kernel/cgroup.c
103394index e8a5491..ab4bfa3 100644
103395--- a/kernel/cgroup.c
103396+++ b/kernel/cgroup.c
103397@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
103398 if (!pathbuf || !agentbuf)
103399 goto out;
103400
103401+ if (agentbuf[0] == '\0')
103402+ goto out;
103403+
103404 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
103405 if (!path)
103406 goto out;
103407@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
103408 struct task_struct *task;
103409 int count = 0;
103410
103411- seq_printf(seq, "css_set %p\n", cset);
103412+ seq_printf(seq, "css_set %pK\n", cset);
103413
103414 list_for_each_entry(task, &cset->tasks, cg_list) {
103415 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
103416diff --git a/kernel/compat.c b/kernel/compat.c
103417index 333d364..762ec00 100644
103418--- a/kernel/compat.c
103419+++ b/kernel/compat.c
103420@@ -13,6 +13,7 @@
103421
103422 #include <linux/linkage.h>
103423 #include <linux/compat.h>
103424+#include <linux/module.h>
103425 #include <linux/errno.h>
103426 #include <linux/time.h>
103427 #include <linux/signal.h>
103428@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
103429 mm_segment_t oldfs;
103430 long ret;
103431
103432- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
103433+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
103434 oldfs = get_fs();
103435 set_fs(KERNEL_DS);
103436 ret = hrtimer_nanosleep_restart(restart);
103437@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
103438 oldfs = get_fs();
103439 set_fs(KERNEL_DS);
103440 ret = hrtimer_nanosleep(&tu,
103441- rmtp ? (struct timespec __user *)&rmt : NULL,
103442+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
103443 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
103444 set_fs(oldfs);
103445
103446@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
103447 mm_segment_t old_fs = get_fs();
103448
103449 set_fs(KERNEL_DS);
103450- ret = sys_sigpending((old_sigset_t __user *) &s);
103451+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
103452 set_fs(old_fs);
103453 if (ret == 0)
103454 ret = put_user(s, set);
103455@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
103456 mm_segment_t old_fs = get_fs();
103457
103458 set_fs(KERNEL_DS);
103459- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
103460+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
103461 set_fs(old_fs);
103462
103463 if (!ret) {
103464@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
103465 set_fs (KERNEL_DS);
103466 ret = sys_wait4(pid,
103467 (stat_addr ?
103468- (unsigned int __user *) &status : NULL),
103469- options, (struct rusage __user *) &r);
103470+ (unsigned int __force_user *) &status : NULL),
103471+ options, (struct rusage __force_user *) &r);
103472 set_fs (old_fs);
103473
103474 if (ret > 0) {
103475@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
103476 memset(&info, 0, sizeof(info));
103477
103478 set_fs(KERNEL_DS);
103479- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
103480- uru ? (struct rusage __user *)&ru : NULL);
103481+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
103482+ uru ? (struct rusage __force_user *)&ru : NULL);
103483 set_fs(old_fs);
103484
103485 if ((ret < 0) || (info.si_signo == 0))
103486@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
103487 oldfs = get_fs();
103488 set_fs(KERNEL_DS);
103489 err = sys_timer_settime(timer_id, flags,
103490- (struct itimerspec __user *) &newts,
103491- (struct itimerspec __user *) &oldts);
103492+ (struct itimerspec __force_user *) &newts,
103493+ (struct itimerspec __force_user *) &oldts);
103494 set_fs(oldfs);
103495 if (!err && old && put_compat_itimerspec(old, &oldts))
103496 return -EFAULT;
103497@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
103498 oldfs = get_fs();
103499 set_fs(KERNEL_DS);
103500 err = sys_timer_gettime(timer_id,
103501- (struct itimerspec __user *) &ts);
103502+ (struct itimerspec __force_user *) &ts);
103503 set_fs(oldfs);
103504 if (!err && put_compat_itimerspec(setting, &ts))
103505 return -EFAULT;
103506@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
103507 oldfs = get_fs();
103508 set_fs(KERNEL_DS);
103509 err = sys_clock_settime(which_clock,
103510- (struct timespec __user *) &ts);
103511+ (struct timespec __force_user *) &ts);
103512 set_fs(oldfs);
103513 return err;
103514 }
103515@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
103516 oldfs = get_fs();
103517 set_fs(KERNEL_DS);
103518 err = sys_clock_gettime(which_clock,
103519- (struct timespec __user *) &ts);
103520+ (struct timespec __force_user *) &ts);
103521 set_fs(oldfs);
103522 if (!err && compat_put_timespec(&ts, tp))
103523 return -EFAULT;
103524@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
103525
103526 oldfs = get_fs();
103527 set_fs(KERNEL_DS);
103528- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
103529+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
103530 set_fs(oldfs);
103531
103532 err = compat_put_timex(utp, &txc);
103533@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
103534 oldfs = get_fs();
103535 set_fs(KERNEL_DS);
103536 err = sys_clock_getres(which_clock,
103537- (struct timespec __user *) &ts);
103538+ (struct timespec __force_user *) &ts);
103539 set_fs(oldfs);
103540 if (!err && tp && compat_put_timespec(&ts, tp))
103541 return -EFAULT;
103542@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
103543 struct timespec tu;
103544 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
103545
103546- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
103547+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
103548 oldfs = get_fs();
103549 set_fs(KERNEL_DS);
103550 err = clock_nanosleep_restart(restart);
103551@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
103552 oldfs = get_fs();
103553 set_fs(KERNEL_DS);
103554 err = sys_clock_nanosleep(which_clock, flags,
103555- (struct timespec __user *) &in,
103556- (struct timespec __user *) &out);
103557+ (struct timespec __force_user *) &in,
103558+ (struct timespec __force_user *) &out);
103559 set_fs(oldfs);
103560
103561 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
103562@@ -1147,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
103563 mm_segment_t old_fs = get_fs();
103564
103565 set_fs(KERNEL_DS);
103566- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
103567+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
103568 set_fs(old_fs);
103569 if (compat_put_timespec(&t, interval))
103570 return -EFAULT;
103571diff --git a/kernel/configs.c b/kernel/configs.c
103572index c18b1f1..b9a0132 100644
103573--- a/kernel/configs.c
103574+++ b/kernel/configs.c
103575@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
103576 struct proc_dir_entry *entry;
103577
103578 /* create the current config file */
103579+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
103580+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
103581+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
103582+ &ikconfig_file_ops);
103583+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
103584+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
103585+ &ikconfig_file_ops);
103586+#endif
103587+#else
103588 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
103589 &ikconfig_file_ops);
103590+#endif
103591+
103592 if (!entry)
103593 return -ENOMEM;
103594
103595diff --git a/kernel/cred.c b/kernel/cred.c
103596index ec1c076..7da8a0e 100644
103597--- a/kernel/cred.c
103598+++ b/kernel/cred.c
103599@@ -167,6 +167,15 @@ void exit_creds(struct task_struct *tsk)
103600 validate_creds(cred);
103601 alter_cred_subscribers(cred, -1);
103602 put_cred(cred);
103603+
103604+#ifdef CONFIG_GRKERNSEC_SETXID
103605+ cred = (struct cred *) tsk->delayed_cred;
103606+ if (cred != NULL) {
103607+ tsk->delayed_cred = NULL;
103608+ validate_creds(cred);
103609+ put_cred(cred);
103610+ }
103611+#endif
103612 }
103613
103614 /**
103615@@ -414,7 +423,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
103616 * Always returns 0 thus allowing this function to be tail-called at the end
103617 * of, say, sys_setgid().
103618 */
103619-int commit_creds(struct cred *new)
103620+static int __commit_creds(struct cred *new)
103621 {
103622 struct task_struct *task = current;
103623 const struct cred *old = task->real_cred;
103624@@ -433,6 +442,8 @@ int commit_creds(struct cred *new)
103625
103626 get_cred(new); /* we will require a ref for the subj creds too */
103627
103628+ gr_set_role_label(task, new->uid, new->gid);
103629+
103630 /* dumpability changes */
103631 if (!uid_eq(old->euid, new->euid) ||
103632 !gid_eq(old->egid, new->egid) ||
103633@@ -482,6 +493,105 @@ int commit_creds(struct cred *new)
103634 put_cred(old);
103635 return 0;
103636 }
103637+#ifdef CONFIG_GRKERNSEC_SETXID
103638+extern int set_user(struct cred *new);
103639+
103640+void gr_delayed_cred_worker(void)
103641+{
103642+ const struct cred *new = current->delayed_cred;
103643+ struct cred *ncred;
103644+
103645+ current->delayed_cred = NULL;
103646+
103647+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
103648+ // from doing get_cred on it when queueing this
103649+ put_cred(new);
103650+ return;
103651+ } else if (new == NULL)
103652+ return;
103653+
103654+ ncred = prepare_creds();
103655+ if (!ncred)
103656+ goto die;
103657+ // uids
103658+ ncred->uid = new->uid;
103659+ ncred->euid = new->euid;
103660+ ncred->suid = new->suid;
103661+ ncred->fsuid = new->fsuid;
103662+ // gids
103663+ ncred->gid = new->gid;
103664+ ncred->egid = new->egid;
103665+ ncred->sgid = new->sgid;
103666+ ncred->fsgid = new->fsgid;
103667+ // groups
103668+ set_groups(ncred, new->group_info);
103669+ // caps
103670+ ncred->securebits = new->securebits;
103671+ ncred->cap_inheritable = new->cap_inheritable;
103672+ ncred->cap_permitted = new->cap_permitted;
103673+ ncred->cap_effective = new->cap_effective;
103674+ ncred->cap_bset = new->cap_bset;
103675+
103676+ if (set_user(ncred)) {
103677+ abort_creds(ncred);
103678+ goto die;
103679+ }
103680+
103681+ // from doing get_cred on it when queueing this
103682+ put_cred(new);
103683+
103684+ __commit_creds(ncred);
103685+ return;
103686+die:
103687+ // from doing get_cred on it when queueing this
103688+ put_cred(new);
103689+ do_group_exit(SIGKILL);
103690+}
103691+#endif
103692+
103693+int commit_creds(struct cred *new)
103694+{
103695+#ifdef CONFIG_GRKERNSEC_SETXID
103696+ int ret;
103697+ int schedule_it = 0;
103698+ struct task_struct *t;
103699+ unsigned oldsecurebits = current_cred()->securebits;
103700+
103701+ /* we won't get called with tasklist_lock held for writing
103702+ and interrupts disabled as the cred struct in that case is
103703+ init_cred
103704+ */
103705+ if (grsec_enable_setxid && !current_is_single_threaded() &&
103706+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
103707+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
103708+ schedule_it = 1;
103709+ }
103710+ ret = __commit_creds(new);
103711+ if (schedule_it) {
103712+ rcu_read_lock();
103713+ read_lock(&tasklist_lock);
103714+ for (t = next_thread(current); t != current;
103715+ t = next_thread(t)) {
103716+ /* we'll check if the thread has uid 0 in
103717+ * the delayed worker routine
103718+ */
103719+ if (task_securebits(t) == oldsecurebits &&
103720+ t->delayed_cred == NULL) {
103721+ t->delayed_cred = get_cred(new);
103722+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
103723+ set_tsk_need_resched(t);
103724+ }
103725+ }
103726+ read_unlock(&tasklist_lock);
103727+ rcu_read_unlock();
103728+ }
103729+
103730+ return ret;
103731+#else
103732+ return __commit_creds(new);
103733+#endif
103734+}
103735+
103736 EXPORT_SYMBOL(commit_creds);
103737
103738 /**
103739diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
103740index 0874e2e..5b32cc9 100644
103741--- a/kernel/debug/debug_core.c
103742+++ b/kernel/debug/debug_core.c
103743@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
103744 */
103745 static atomic_t masters_in_kgdb;
103746 static atomic_t slaves_in_kgdb;
103747-static atomic_t kgdb_break_tasklet_var;
103748+static atomic_unchecked_t kgdb_break_tasklet_var;
103749 atomic_t kgdb_setting_breakpoint;
103750
103751 struct task_struct *kgdb_usethread;
103752@@ -137,7 +137,7 @@ int kgdb_single_step;
103753 static pid_t kgdb_sstep_pid;
103754
103755 /* to keep track of the CPU which is doing the single stepping*/
103756-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103757+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103758
103759 /*
103760 * If you are debugging a problem where roundup (the collection of
103761@@ -552,7 +552,7 @@ return_normal:
103762 * kernel will only try for the value of sstep_tries before
103763 * giving up and continuing on.
103764 */
103765- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
103766+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
103767 (kgdb_info[cpu].task &&
103768 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
103769 atomic_set(&kgdb_active, -1);
103770@@ -654,8 +654,8 @@ cpu_master_loop:
103771 }
103772
103773 kgdb_restore:
103774- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
103775- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
103776+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
103777+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
103778 if (kgdb_info[sstep_cpu].task)
103779 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
103780 else
103781@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
103782 static void kgdb_tasklet_bpt(unsigned long ing)
103783 {
103784 kgdb_breakpoint();
103785- atomic_set(&kgdb_break_tasklet_var, 0);
103786+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
103787 }
103788
103789 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
103790
103791 void kgdb_schedule_breakpoint(void)
103792 {
103793- if (atomic_read(&kgdb_break_tasklet_var) ||
103794+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
103795 atomic_read(&kgdb_active) != -1 ||
103796 atomic_read(&kgdb_setting_breakpoint))
103797 return;
103798- atomic_inc(&kgdb_break_tasklet_var);
103799+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
103800 tasklet_schedule(&kgdb_tasklet_breakpoint);
103801 }
103802 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
103803diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
103804index 41213454..861e178 100644
103805--- a/kernel/debug/kdb/kdb_main.c
103806+++ b/kernel/debug/kdb/kdb_main.c
103807@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
103808 continue;
103809
103810 kdb_printf("%-20s%8u 0x%p ", mod->name,
103811- mod->core_size, (void *)mod);
103812+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
103813 #ifdef CONFIG_MODULE_UNLOAD
103814 kdb_printf("%4d ", module_refcount(mod));
103815 #endif
103816@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
103817 kdb_printf(" (Loading)");
103818 else
103819 kdb_printf(" (Live)");
103820- kdb_printf(" 0x%p", mod->module_core);
103821+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
103822
103823 #ifdef CONFIG_MODULE_UNLOAD
103824 {
103825diff --git a/kernel/events/core.c b/kernel/events/core.c
103826index 0ceb386..ddaf008 100644
103827--- a/kernel/events/core.c
103828+++ b/kernel/events/core.c
103829@@ -172,8 +172,15 @@ static struct srcu_struct pmus_srcu;
103830 * 0 - disallow raw tracepoint access for unpriv
103831 * 1 - disallow cpu events for unpriv
103832 * 2 - disallow kernel profiling for unpriv
103833+ * 3 - disallow all unpriv perf event use
103834 */
103835-int sysctl_perf_event_paranoid __read_mostly = 1;
103836+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103837+int sysctl_perf_event_legitimately_concerned __read_only = 3;
103838+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
103839+int sysctl_perf_event_legitimately_concerned __read_only = 2;
103840+#else
103841+int sysctl_perf_event_legitimately_concerned __read_only = 1;
103842+#endif
103843
103844 /* Minimum for 512 kiB + 1 user control page */
103845 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
103846@@ -199,7 +206,7 @@ void update_perf_cpu_limits(void)
103847
103848 tmp *= sysctl_perf_cpu_time_max_percent;
103849 do_div(tmp, 100);
103850- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
103851+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
103852 }
103853
103854 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
103855@@ -305,7 +312,7 @@ void perf_sample_event_took(u64 sample_len_ns)
103856 }
103857 }
103858
103859-static atomic64_t perf_event_id;
103860+static atomic64_unchecked_t perf_event_id;
103861
103862 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
103863 enum event_type_t event_type);
103864@@ -3771,9 +3778,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
103865 mutex_lock(&event->child_mutex);
103866 total += perf_event_read(event);
103867 *enabled += event->total_time_enabled +
103868- atomic64_read(&event->child_total_time_enabled);
103869+ atomic64_read_unchecked(&event->child_total_time_enabled);
103870 *running += event->total_time_running +
103871- atomic64_read(&event->child_total_time_running);
103872+ atomic64_read_unchecked(&event->child_total_time_running);
103873
103874 list_for_each_entry(child, &event->child_list, child_list) {
103875 total += perf_event_read(child);
103876@@ -4268,10 +4275,10 @@ void perf_event_update_userpage(struct perf_event *event)
103877 userpg->offset -= local64_read(&event->hw.prev_count);
103878
103879 userpg->time_enabled = enabled +
103880- atomic64_read(&event->child_total_time_enabled);
103881+ atomic64_read_unchecked(&event->child_total_time_enabled);
103882
103883 userpg->time_running = running +
103884- atomic64_read(&event->child_total_time_running);
103885+ atomic64_read_unchecked(&event->child_total_time_running);
103886
103887 arch_perf_update_userpage(event, userpg, now);
103888
103889@@ -4946,7 +4953,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
103890
103891 /* Data. */
103892 sp = perf_user_stack_pointer(regs);
103893- rem = __output_copy_user(handle, (void *) sp, dump_size);
103894+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
103895 dyn_size = dump_size - rem;
103896
103897 perf_output_skip(handle, rem);
103898@@ -5037,11 +5044,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
103899 values[n++] = perf_event_count(event);
103900 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
103901 values[n++] = enabled +
103902- atomic64_read(&event->child_total_time_enabled);
103903+ atomic64_read_unchecked(&event->child_total_time_enabled);
103904 }
103905 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
103906 values[n++] = running +
103907- atomic64_read(&event->child_total_time_running);
103908+ atomic64_read_unchecked(&event->child_total_time_running);
103909 }
103910 if (read_format & PERF_FORMAT_ID)
103911 values[n++] = primary_event_id(event);
103912@@ -7533,7 +7540,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
103913 event->parent = parent_event;
103914
103915 event->ns = get_pid_ns(task_active_pid_ns(current));
103916- event->id = atomic64_inc_return(&perf_event_id);
103917+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
103918
103919 event->state = PERF_EVENT_STATE_INACTIVE;
103920
103921@@ -7892,6 +7899,11 @@ SYSCALL_DEFINE5(perf_event_open,
103922 if (flags & ~PERF_FLAG_ALL)
103923 return -EINVAL;
103924
103925+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103926+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
103927+ return -EACCES;
103928+#endif
103929+
103930 err = perf_copy_attr(attr_uptr, &attr);
103931 if (err)
103932 return err;
103933@@ -8340,10 +8352,10 @@ static void sync_child_event(struct perf_event *child_event,
103934 /*
103935 * Add back the child's count to the parent's count:
103936 */
103937- atomic64_add(child_val, &parent_event->child_count);
103938- atomic64_add(child_event->total_time_enabled,
103939+ atomic64_add_unchecked(child_val, &parent_event->child_count);
103940+ atomic64_add_unchecked(child_event->total_time_enabled,
103941 &parent_event->child_total_time_enabled);
103942- atomic64_add(child_event->total_time_running,
103943+ atomic64_add_unchecked(child_event->total_time_running,
103944 &parent_event->child_total_time_running);
103945
103946 /*
103947diff --git a/kernel/events/internal.h b/kernel/events/internal.h
103948index 9f6ce9b..e4f2cbb 100644
103949--- a/kernel/events/internal.h
103950+++ b/kernel/events/internal.h
103951@@ -114,10 +114,10 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
103952 return rb->aux_nr_pages << PAGE_SHIFT;
103953 }
103954
103955-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
103956+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
103957 static inline unsigned long \
103958 func_name(struct perf_output_handle *handle, \
103959- const void *buf, unsigned long len) \
103960+ const void user *buf, unsigned long len) \
103961 { \
103962 unsigned long size, written; \
103963 \
103964@@ -150,7 +150,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
103965 return 0;
103966 }
103967
103968-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
103969+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
103970
103971 static inline unsigned long
103972 memcpy_skip(void *dst, const void *src, unsigned long n)
103973@@ -158,7 +158,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
103974 return 0;
103975 }
103976
103977-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
103978+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
103979
103980 #ifndef arch_perf_out_copy_user
103981 #define arch_perf_out_copy_user arch_perf_out_copy_user
103982@@ -176,7 +176,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
103983 }
103984 #endif
103985
103986-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
103987+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
103988
103989 /* Callchain handling */
103990 extern struct perf_callchain_entry *
103991diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
103992index cb346f2..e4dc317 100644
103993--- a/kernel/events/uprobes.c
103994+++ b/kernel/events/uprobes.c
103995@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
103996 {
103997 struct page *page;
103998 uprobe_opcode_t opcode;
103999- int result;
104000+ long result;
104001
104002 pagefault_disable();
104003 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
104004diff --git a/kernel/exit.c b/kernel/exit.c
104005index 22fcc05..5f07dbc 100644
104006--- a/kernel/exit.c
104007+++ b/kernel/exit.c
104008@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
104009 struct task_struct *leader;
104010 int zap_leader;
104011 repeat:
104012+#ifdef CONFIG_NET
104013+ gr_del_task_from_ip_table(p);
104014+#endif
104015+
104016 /* don't need to get the RCU readlock here - the process is dead and
104017 * can't be modifying its own credentials. But shut RCU-lockdep up */
104018 rcu_read_lock();
104019@@ -656,6 +660,8 @@ void do_exit(long code)
104020 int group_dead;
104021 TASKS_RCU(int tasks_rcu_i);
104022
104023+ set_fs(USER_DS);
104024+
104025 profile_task_exit(tsk);
104026
104027 WARN_ON(blk_needs_flush_plug(tsk));
104028@@ -672,7 +678,6 @@ void do_exit(long code)
104029 * mm_release()->clear_child_tid() from writing to a user-controlled
104030 * kernel address.
104031 */
104032- set_fs(USER_DS);
104033
104034 ptrace_event(PTRACE_EVENT_EXIT, code);
104035
104036@@ -730,6 +735,9 @@ void do_exit(long code)
104037 tsk->exit_code = code;
104038 taskstats_exit(tsk, group_dead);
104039
104040+ gr_acl_handle_psacct(tsk, code);
104041+ gr_acl_handle_exit();
104042+
104043 exit_mm(tsk);
104044
104045 if (group_dead)
104046@@ -847,7 +855,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
104047 * Take down every thread in the group. This is called by fatal signals
104048 * as well as by sys_exit_group (below).
104049 */
104050-void
104051+__noreturn void
104052 do_group_exit(int exit_code)
104053 {
104054 struct signal_struct *sig = current->signal;
104055diff --git a/kernel/fork.c b/kernel/fork.c
104056index 03c1eaa..461be4c 100644
104057--- a/kernel/fork.c
104058+++ b/kernel/fork.c
104059@@ -188,12 +188,54 @@ static void free_thread_info(struct thread_info *ti)
104060 void thread_info_cache_init(void)
104061 {
104062 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
104063- THREAD_SIZE, 0, NULL);
104064+ THREAD_SIZE, SLAB_USERCOPY, NULL);
104065 BUG_ON(thread_info_cache == NULL);
104066 }
104067 # endif
104068 #endif
104069
104070+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104071+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
104072+ int node, void **lowmem_stack)
104073+{
104074+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
104075+ void *ret = NULL;
104076+ unsigned int i;
104077+
104078+ *lowmem_stack = alloc_thread_info_node(tsk, node);
104079+ if (*lowmem_stack == NULL)
104080+ goto out;
104081+
104082+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
104083+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
104084+
104085+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
104086+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
104087+ if (ret == NULL) {
104088+ free_thread_info(*lowmem_stack);
104089+ *lowmem_stack = NULL;
104090+ }
104091+
104092+out:
104093+ return ret;
104094+}
104095+
104096+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
104097+{
104098+ unmap_process_stacks(tsk);
104099+}
104100+#else
104101+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
104102+ int node, void **lowmem_stack)
104103+{
104104+ return alloc_thread_info_node(tsk, node);
104105+}
104106+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
104107+{
104108+ free_thread_info(ti);
104109+}
104110+#endif
104111+
104112 /* SLAB cache for signal_struct structures (tsk->signal) */
104113 static struct kmem_cache *signal_cachep;
104114
104115@@ -212,18 +254,22 @@ struct kmem_cache *vm_area_cachep;
104116 /* SLAB cache for mm_struct structures (tsk->mm) */
104117 static struct kmem_cache *mm_cachep;
104118
104119-static void account_kernel_stack(struct thread_info *ti, int account)
104120+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
104121 {
104122+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104123+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
104124+#else
104125 struct zone *zone = page_zone(virt_to_page(ti));
104126+#endif
104127
104128 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
104129 }
104130
104131 void free_task(struct task_struct *tsk)
104132 {
104133- account_kernel_stack(tsk->stack, -1);
104134+ account_kernel_stack(tsk, tsk->stack, -1);
104135 arch_release_thread_info(tsk->stack);
104136- free_thread_info(tsk->stack);
104137+ gr_free_thread_info(tsk, tsk->stack);
104138 rt_mutex_debug_task_free(tsk);
104139 ftrace_graph_exit_task(tsk);
104140 put_seccomp_filter(tsk);
104141@@ -329,6 +375,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104142 {
104143 struct task_struct *tsk;
104144 struct thread_info *ti;
104145+ void *lowmem_stack;
104146 int node = tsk_fork_get_node(orig);
104147 int err;
104148
104149@@ -336,7 +383,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104150 if (!tsk)
104151 return NULL;
104152
104153- ti = alloc_thread_info_node(tsk, node);
104154+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
104155 if (!ti)
104156 goto free_tsk;
104157
104158@@ -345,6 +392,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104159 goto free_ti;
104160
104161 tsk->stack = ti;
104162+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104163+ tsk->lowmem_stack = lowmem_stack;
104164+#endif
104165 #ifdef CONFIG_SECCOMP
104166 /*
104167 * We must handle setting up seccomp filters once we're under
104168@@ -361,7 +411,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104169 set_task_stack_end_magic(tsk);
104170
104171 #ifdef CONFIG_CC_STACKPROTECTOR
104172- tsk->stack_canary = get_random_int();
104173+ tsk->stack_canary = pax_get_random_long();
104174 #endif
104175
104176 /*
104177@@ -375,24 +425,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104178 tsk->splice_pipe = NULL;
104179 tsk->task_frag.page = NULL;
104180
104181- account_kernel_stack(ti, 1);
104182+ account_kernel_stack(tsk, ti, 1);
104183
104184 return tsk;
104185
104186 free_ti:
104187- free_thread_info(ti);
104188+ gr_free_thread_info(tsk, ti);
104189 free_tsk:
104190 free_task_struct(tsk);
104191 return NULL;
104192 }
104193
104194 #ifdef CONFIG_MMU
104195-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104196+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
104197+{
104198+ struct vm_area_struct *tmp;
104199+ unsigned long charge;
104200+ struct file *file;
104201+ int retval;
104202+
104203+ charge = 0;
104204+ if (mpnt->vm_flags & VM_ACCOUNT) {
104205+ unsigned long len = vma_pages(mpnt);
104206+
104207+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104208+ goto fail_nomem;
104209+ charge = len;
104210+ }
104211+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104212+ if (!tmp)
104213+ goto fail_nomem;
104214+ *tmp = *mpnt;
104215+ tmp->vm_mm = mm;
104216+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
104217+ retval = vma_dup_policy(mpnt, tmp);
104218+ if (retval)
104219+ goto fail_nomem_policy;
104220+ if (anon_vma_fork(tmp, mpnt))
104221+ goto fail_nomem_anon_vma_fork;
104222+ tmp->vm_flags &= ~VM_LOCKED;
104223+ tmp->vm_next = tmp->vm_prev = NULL;
104224+ tmp->vm_mirror = NULL;
104225+ file = tmp->vm_file;
104226+ if (file) {
104227+ struct inode *inode = file_inode(file);
104228+ struct address_space *mapping = file->f_mapping;
104229+
104230+ get_file(file);
104231+ if (tmp->vm_flags & VM_DENYWRITE)
104232+ atomic_dec(&inode->i_writecount);
104233+ i_mmap_lock_write(mapping);
104234+ if (tmp->vm_flags & VM_SHARED)
104235+ atomic_inc(&mapping->i_mmap_writable);
104236+ flush_dcache_mmap_lock(mapping);
104237+ /* insert tmp into the share list, just after mpnt */
104238+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
104239+ flush_dcache_mmap_unlock(mapping);
104240+ i_mmap_unlock_write(mapping);
104241+ }
104242+
104243+ /*
104244+ * Clear hugetlb-related page reserves for children. This only
104245+ * affects MAP_PRIVATE mappings. Faults generated by the child
104246+ * are not guaranteed to succeed, even if read-only
104247+ */
104248+ if (is_vm_hugetlb_page(tmp))
104249+ reset_vma_resv_huge_pages(tmp);
104250+
104251+ return tmp;
104252+
104253+fail_nomem_anon_vma_fork:
104254+ mpol_put(vma_policy(tmp));
104255+fail_nomem_policy:
104256+ kmem_cache_free(vm_area_cachep, tmp);
104257+fail_nomem:
104258+ vm_unacct_memory(charge);
104259+ return NULL;
104260+}
104261+
104262+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104263 {
104264 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
104265 struct rb_node **rb_link, *rb_parent;
104266 int retval;
104267- unsigned long charge;
104268
104269 uprobe_start_dup_mmap();
104270 down_write(&oldmm->mmap_sem);
104271@@ -423,51 +538,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104272
104273 prev = NULL;
104274 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
104275- struct file *file;
104276-
104277 if (mpnt->vm_flags & VM_DONTCOPY) {
104278 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
104279 -vma_pages(mpnt));
104280 continue;
104281 }
104282- charge = 0;
104283- if (mpnt->vm_flags & VM_ACCOUNT) {
104284- unsigned long len = vma_pages(mpnt);
104285-
104286- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104287- goto fail_nomem;
104288- charge = len;
104289- }
104290- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104291- if (!tmp)
104292- goto fail_nomem;
104293- *tmp = *mpnt;
104294- INIT_LIST_HEAD(&tmp->anon_vma_chain);
104295- retval = vma_dup_policy(mpnt, tmp);
104296- if (retval)
104297- goto fail_nomem_policy;
104298- tmp->vm_mm = mm;
104299- if (anon_vma_fork(tmp, mpnt))
104300- goto fail_nomem_anon_vma_fork;
104301- tmp->vm_flags &= ~VM_LOCKED;
104302- tmp->vm_next = tmp->vm_prev = NULL;
104303- file = tmp->vm_file;
104304- if (file) {
104305- struct inode *inode = file_inode(file);
104306- struct address_space *mapping = file->f_mapping;
104307-
104308- get_file(file);
104309- if (tmp->vm_flags & VM_DENYWRITE)
104310- atomic_dec(&inode->i_writecount);
104311- i_mmap_lock_write(mapping);
104312- if (tmp->vm_flags & VM_SHARED)
104313- atomic_inc(&mapping->i_mmap_writable);
104314- flush_dcache_mmap_lock(mapping);
104315- /* insert tmp into the share list, just after mpnt */
104316- vma_interval_tree_insert_after(tmp, mpnt,
104317- &mapping->i_mmap);
104318- flush_dcache_mmap_unlock(mapping);
104319- i_mmap_unlock_write(mapping);
104320+ tmp = dup_vma(mm, oldmm, mpnt);
104321+ if (!tmp) {
104322+ retval = -ENOMEM;
104323+ goto out;
104324 }
104325
104326 /*
104327@@ -499,6 +578,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104328 if (retval)
104329 goto out;
104330 }
104331+
104332+#ifdef CONFIG_PAX_SEGMEXEC
104333+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
104334+ struct vm_area_struct *mpnt_m;
104335+
104336+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
104337+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
104338+
104339+ if (!mpnt->vm_mirror)
104340+ continue;
104341+
104342+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
104343+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
104344+ mpnt->vm_mirror = mpnt_m;
104345+ } else {
104346+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
104347+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
104348+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
104349+ mpnt->vm_mirror->vm_mirror = mpnt;
104350+ }
104351+ }
104352+ BUG_ON(mpnt_m);
104353+ }
104354+#endif
104355+
104356 /* a new mm has just been created */
104357 arch_dup_mmap(oldmm, mm);
104358 retval = 0;
104359@@ -508,14 +612,6 @@ out:
104360 up_write(&oldmm->mmap_sem);
104361 uprobe_end_dup_mmap();
104362 return retval;
104363-fail_nomem_anon_vma_fork:
104364- mpol_put(vma_policy(tmp));
104365-fail_nomem_policy:
104366- kmem_cache_free(vm_area_cachep, tmp);
104367-fail_nomem:
104368- retval = -ENOMEM;
104369- vm_unacct_memory(charge);
104370- goto out;
104371 }
104372
104373 static inline int mm_alloc_pgd(struct mm_struct *mm)
104374@@ -790,8 +886,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
104375 return ERR_PTR(err);
104376
104377 mm = get_task_mm(task);
104378- if (mm && mm != current->mm &&
104379- !ptrace_may_access(task, mode)) {
104380+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
104381+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
104382 mmput(mm);
104383 mm = ERR_PTR(-EACCES);
104384 }
104385@@ -992,13 +1088,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
104386 spin_unlock(&fs->lock);
104387 return -EAGAIN;
104388 }
104389- fs->users++;
104390+ atomic_inc(&fs->users);
104391 spin_unlock(&fs->lock);
104392 return 0;
104393 }
104394 tsk->fs = copy_fs_struct(fs);
104395 if (!tsk->fs)
104396 return -ENOMEM;
104397+ /* Carry through gr_chroot_dentry and is_chrooted instead
104398+ of recomputing it here. Already copied when the task struct
104399+ is duplicated. This allows pivot_root to not be treated as
104400+ a chroot
104401+ */
104402+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
104403+
104404 return 0;
104405 }
104406
104407@@ -1236,7 +1339,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
104408 * parts of the process environment (as per the clone
104409 * flags). The actual kick-off is left to the caller.
104410 */
104411-static struct task_struct *copy_process(unsigned long clone_flags,
104412+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
104413 unsigned long stack_start,
104414 unsigned long stack_size,
104415 int __user *child_tidptr,
104416@@ -1307,6 +1410,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104417 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
104418 #endif
104419 retval = -EAGAIN;
104420+
104421+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
104422+
104423 if (atomic_read(&p->real_cred->user->processes) >=
104424 task_rlimit(p, RLIMIT_NPROC)) {
104425 if (p->real_cred->user != INIT_USER &&
104426@@ -1554,6 +1660,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104427 goto bad_fork_free_pid;
104428 }
104429
104430+ /* synchronizes with gr_set_acls()
104431+ we need to call this past the point of no return for fork()
104432+ */
104433+ gr_copy_label(p);
104434+
104435 if (likely(p->pid)) {
104436 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
104437
104438@@ -1643,6 +1754,8 @@ bad_fork_cleanup_count:
104439 bad_fork_free:
104440 free_task(p);
104441 fork_out:
104442+ gr_log_forkfail(retval);
104443+
104444 return ERR_PTR(retval);
104445 }
104446
104447@@ -1704,6 +1817,7 @@ long do_fork(unsigned long clone_flags,
104448
104449 p = copy_process(clone_flags, stack_start, stack_size,
104450 child_tidptr, NULL, trace);
104451+ add_latent_entropy();
104452 /*
104453 * Do this prior waking up the new thread - the thread pointer
104454 * might get invalid after that point, if the thread exits quickly.
104455@@ -1720,6 +1834,8 @@ long do_fork(unsigned long clone_flags,
104456 if (clone_flags & CLONE_PARENT_SETTID)
104457 put_user(nr, parent_tidptr);
104458
104459+ gr_handle_brute_check();
104460+
104461 if (clone_flags & CLONE_VFORK) {
104462 p->vfork_done = &vfork;
104463 init_completion(&vfork);
104464@@ -1838,7 +1954,7 @@ void __init proc_caches_init(void)
104465 mm_cachep = kmem_cache_create("mm_struct",
104466 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
104467 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
104468- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
104469+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
104470 mmap_init();
104471 nsproxy_cache_init();
104472 }
104473@@ -1878,7 +1994,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
104474 return 0;
104475
104476 /* don't need lock here; in the worst case we'll do useless copy */
104477- if (fs->users == 1)
104478+ if (atomic_read(&fs->users) == 1)
104479 return 0;
104480
104481 *new_fsp = copy_fs_struct(fs);
104482@@ -1990,7 +2106,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
104483 fs = current->fs;
104484 spin_lock(&fs->lock);
104485 current->fs = new_fs;
104486- if (--fs->users)
104487+ gr_set_chroot_entries(current, &current->fs->root);
104488+ if (atomic_dec_return(&fs->users))
104489 new_fs = NULL;
104490 else
104491 new_fs = fs;
104492@@ -2054,7 +2171,7 @@ int unshare_files(struct files_struct **displaced)
104493 int sysctl_max_threads(struct ctl_table *table, int write,
104494 void __user *buffer, size_t *lenp, loff_t *ppos)
104495 {
104496- struct ctl_table t;
104497+ ctl_table_no_const t;
104498 int ret;
104499 int threads = max_threads;
104500 int min = MIN_THREADS;
104501diff --git a/kernel/futex.c b/kernel/futex.c
104502index 2579e40..c33f33e 100644
104503--- a/kernel/futex.c
104504+++ b/kernel/futex.c
104505@@ -201,7 +201,7 @@ struct futex_pi_state {
104506 atomic_t refcount;
104507
104508 union futex_key key;
104509-};
104510+} __randomize_layout;
104511
104512 /**
104513 * struct futex_q - The hashed futex queue entry, one per waiting task
104514@@ -235,7 +235,7 @@ struct futex_q {
104515 struct rt_mutex_waiter *rt_waiter;
104516 union futex_key *requeue_pi_key;
104517 u32 bitset;
104518-};
104519+} __randomize_layout;
104520
104521 static const struct futex_q futex_q_init = {
104522 /* list gets initialized in queue_me()*/
104523@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
104524 struct page *page, *page_head;
104525 int err, ro = 0;
104526
104527+#ifdef CONFIG_PAX_SEGMEXEC
104528+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
104529+ return -EFAULT;
104530+#endif
104531+
104532 /*
104533 * The futex address must be "naturally" aligned.
104534 */
104535@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
104536
104537 static int get_futex_value_locked(u32 *dest, u32 __user *from)
104538 {
104539- int ret;
104540+ unsigned long ret;
104541
104542 pagefault_disable();
104543 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
104544@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
104545 {
104546 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
104547 u32 curval;
104548+ mm_segment_t oldfs;
104549
104550 /*
104551 * This will fail and we want it. Some arch implementations do
104552@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
104553 * implementation, the non-functional ones will return
104554 * -ENOSYS.
104555 */
104556+ oldfs = get_fs();
104557+ set_fs(USER_DS);
104558 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
104559 futex_cmpxchg_enabled = 1;
104560+ set_fs(oldfs);
104561 #endif
104562 }
104563
104564diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
104565index 55c8c93..9ba7ad6 100644
104566--- a/kernel/futex_compat.c
104567+++ b/kernel/futex_compat.c
104568@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
104569 return 0;
104570 }
104571
104572-static void __user *futex_uaddr(struct robust_list __user *entry,
104573+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
104574 compat_long_t futex_offset)
104575 {
104576 compat_uptr_t base = ptr_to_compat(entry);
104577diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
104578index a744098..539f7b6 100644
104579--- a/kernel/gcov/base.c
104580+++ b/kernel/gcov/base.c
104581@@ -117,11 +117,6 @@ void gcov_enable_events(void)
104582 }
104583
104584 #ifdef CONFIG_MODULES
104585-static inline int within(void *addr, void *start, unsigned long size)
104586-{
104587- return ((addr >= start) && (addr < start + size));
104588-}
104589-
104590 /* Update list and generate events when modules are unloaded. */
104591 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104592 void *data)
104593@@ -136,7 +131,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104594
104595 /* Remove entries located in module from linked list. */
104596 while ((info = gcov_info_next(info))) {
104597- if (within(info, mod->module_core, mod->core_size)) {
104598+ if (within_module_core_rw((unsigned long)info, mod)) {
104599 gcov_info_unlink(prev, info);
104600 if (gcov_events_enabled)
104601 gcov_event(GCOV_REMOVE, info);
104602diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
104603index e68932b..2247e06 100644
104604--- a/kernel/irq/manage.c
104605+++ b/kernel/irq/manage.c
104606@@ -906,7 +906,7 @@ static int irq_thread(void *data)
104607
104608 action_ret = handler_fn(desc, action);
104609 if (action_ret == IRQ_HANDLED)
104610- atomic_inc(&desc->threads_handled);
104611+ atomic_inc_unchecked(&desc->threads_handled);
104612
104613 wake_threads_waitq(desc);
104614 }
104615diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
104616index e2514b0..de3dfe0 100644
104617--- a/kernel/irq/spurious.c
104618+++ b/kernel/irq/spurious.c
104619@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
104620 * count. We just care about the count being
104621 * different than the one we saw before.
104622 */
104623- handled = atomic_read(&desc->threads_handled);
104624+ handled = atomic_read_unchecked(&desc->threads_handled);
104625 handled |= SPURIOUS_DEFERRED;
104626 if (handled != desc->threads_handled_last) {
104627 action_ret = IRQ_HANDLED;
104628diff --git a/kernel/jump_label.c b/kernel/jump_label.c
104629index 9019f15..9a3c42e 100644
104630--- a/kernel/jump_label.c
104631+++ b/kernel/jump_label.c
104632@@ -14,6 +14,7 @@
104633 #include <linux/err.h>
104634 #include <linux/static_key.h>
104635 #include <linux/jump_label_ratelimit.h>
104636+#include <linux/mm.h>
104637
104638 #ifdef HAVE_JUMP_LABEL
104639
104640@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
104641
104642 size = (((unsigned long)stop - (unsigned long)start)
104643 / sizeof(struct jump_entry));
104644+ pax_open_kernel();
104645 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
104646+ pax_close_kernel();
104647 }
104648
104649 static void jump_label_update(struct static_key *key, int enable);
104650@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
104651 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
104652 struct jump_entry *iter;
104653
104654+ pax_open_kernel();
104655 for (iter = iter_start; iter < iter_stop; iter++) {
104656 if (within_module_init(iter->code, mod))
104657 iter->code = 0;
104658 }
104659+ pax_close_kernel();
104660 }
104661
104662 static int
104663diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
104664index 5c5987f..bc502b0 100644
104665--- a/kernel/kallsyms.c
104666+++ b/kernel/kallsyms.c
104667@@ -11,6 +11,9 @@
104668 * Changed the compression method from stem compression to "table lookup"
104669 * compression (see scripts/kallsyms.c for a more complete description)
104670 */
104671+#ifdef CONFIG_GRKERNSEC_HIDESYM
104672+#define __INCLUDED_BY_HIDESYM 1
104673+#endif
104674 #include <linux/kallsyms.h>
104675 #include <linux/module.h>
104676 #include <linux/init.h>
104677@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
104678
104679 static inline int is_kernel_inittext(unsigned long addr)
104680 {
104681+ if (system_state != SYSTEM_BOOTING)
104682+ return 0;
104683+
104684 if (addr >= (unsigned long)_sinittext
104685 && addr <= (unsigned long)_einittext)
104686 return 1;
104687 return 0;
104688 }
104689
104690+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104691+#ifdef CONFIG_MODULES
104692+static inline int is_module_text(unsigned long addr)
104693+{
104694+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
104695+ return 1;
104696+
104697+ addr = ktla_ktva(addr);
104698+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
104699+}
104700+#else
104701+static inline int is_module_text(unsigned long addr)
104702+{
104703+ return 0;
104704+}
104705+#endif
104706+#endif
104707+
104708 static inline int is_kernel_text(unsigned long addr)
104709 {
104710 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
104711@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
104712
104713 static inline int is_kernel(unsigned long addr)
104714 {
104715+
104716+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104717+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
104718+ return 1;
104719+
104720+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
104721+#else
104722 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
104723+#endif
104724+
104725 return 1;
104726 return in_gate_area_no_mm(addr);
104727 }
104728
104729 static int is_ksym_addr(unsigned long addr)
104730 {
104731+
104732+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104733+ if (is_module_text(addr))
104734+ return 0;
104735+#endif
104736+
104737 if (all_var)
104738 return is_kernel(addr);
104739
104740@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
104741
104742 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
104743 {
104744- iter->name[0] = '\0';
104745 iter->nameoff = get_symbol_offset(new_pos);
104746 iter->pos = new_pos;
104747 }
104748@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
104749 {
104750 struct kallsym_iter *iter = m->private;
104751
104752+#ifdef CONFIG_GRKERNSEC_HIDESYM
104753+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
104754+ return 0;
104755+#endif
104756+
104757 /* Some debugging symbols have no name. Ignore them. */
104758 if (!iter->name[0])
104759 return 0;
104760@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
104761 */
104762 type = iter->exported ? toupper(iter->type) :
104763 tolower(iter->type);
104764+
104765 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
104766 type, iter->name, iter->module_name);
104767 } else
104768diff --git a/kernel/kcmp.c b/kernel/kcmp.c
104769index 0aa69ea..a7fcafb 100644
104770--- a/kernel/kcmp.c
104771+++ b/kernel/kcmp.c
104772@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
104773 struct task_struct *task1, *task2;
104774 int ret;
104775
104776+#ifdef CONFIG_GRKERNSEC
104777+ return -ENOSYS;
104778+#endif
104779+
104780 rcu_read_lock();
104781
104782 /*
104783diff --git a/kernel/kexec.c b/kernel/kexec.c
104784index 7a36fdc..de8c4ed 100644
104785--- a/kernel/kexec.c
104786+++ b/kernel/kexec.c
104787@@ -1232,7 +1232,7 @@ static int kimage_load_segment(struct kimage *image,
104788 */
104789 struct kimage *kexec_image;
104790 struct kimage *kexec_crash_image;
104791-int kexec_load_disabled;
104792+int kexec_load_disabled __read_only;
104793
104794 static DEFINE_MUTEX(kexec_mutex);
104795
104796@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
104797 compat_ulong_t, flags)
104798 {
104799 struct compat_kexec_segment in;
104800- struct kexec_segment out, __user *ksegments;
104801+ struct kexec_segment out;
104802+ struct kexec_segment __user *ksegments;
104803 unsigned long i, result;
104804
104805 /* Don't allow clients that don't understand the native
104806diff --git a/kernel/kmod.c b/kernel/kmod.c
104807index 2777f40..a689506 100644
104808--- a/kernel/kmod.c
104809+++ b/kernel/kmod.c
104810@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
104811 kfree(info->argv);
104812 }
104813
104814-static int call_modprobe(char *module_name, int wait)
104815+static int call_modprobe(char *module_name, char *module_param, int wait)
104816 {
104817 struct subprocess_info *info;
104818 static char *envp[] = {
104819@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
104820 NULL
104821 };
104822
104823- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
104824+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
104825 if (!argv)
104826 goto out;
104827
104828@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
104829 argv[1] = "-q";
104830 argv[2] = "--";
104831 argv[3] = module_name; /* check free_modprobe_argv() */
104832- argv[4] = NULL;
104833+ argv[4] = module_param;
104834+ argv[5] = NULL;
104835
104836 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
104837 NULL, free_modprobe_argv, NULL);
104838@@ -122,9 +123,8 @@ out:
104839 * If module auto-loading support is disabled then this function
104840 * becomes a no-operation.
104841 */
104842-int __request_module(bool wait, const char *fmt, ...)
104843+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
104844 {
104845- va_list args;
104846 char module_name[MODULE_NAME_LEN];
104847 unsigned int max_modprobes;
104848 int ret;
104849@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
104850 if (!modprobe_path[0])
104851 return 0;
104852
104853- va_start(args, fmt);
104854- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
104855- va_end(args);
104856+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
104857 if (ret >= MODULE_NAME_LEN)
104858 return -ENAMETOOLONG;
104859
104860@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
104861 if (ret)
104862 return ret;
104863
104864+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104865+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104866+ /* hack to workaround consolekit/udisks stupidity */
104867+ read_lock(&tasklist_lock);
104868+ if (!strcmp(current->comm, "mount") &&
104869+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
104870+ read_unlock(&tasklist_lock);
104871+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
104872+ return -EPERM;
104873+ }
104874+ read_unlock(&tasklist_lock);
104875+ }
104876+#endif
104877+
104878 /* If modprobe needs a service that is in a module, we get a recursive
104879 * loop. Limit the number of running kmod threads to max_threads/2 or
104880 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
104881@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
104882
104883 trace_module_request(module_name, wait, _RET_IP_);
104884
104885- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104886+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104887
104888 atomic_dec(&kmod_concurrent);
104889 return ret;
104890 }
104891+
104892+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
104893+{
104894+ va_list args;
104895+ int ret;
104896+
104897+ va_start(args, fmt);
104898+ ret = ____request_module(wait, module_param, fmt, args);
104899+ va_end(args);
104900+
104901+ return ret;
104902+}
104903+
104904+int __request_module(bool wait, const char *fmt, ...)
104905+{
104906+ va_list args;
104907+ int ret;
104908+
104909+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104910+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104911+ char module_param[MODULE_NAME_LEN];
104912+
104913+ memset(module_param, 0, sizeof(module_param));
104914+
104915+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
104916+
104917+ va_start(args, fmt);
104918+ ret = ____request_module(wait, module_param, fmt, args);
104919+ va_end(args);
104920+
104921+ return ret;
104922+ }
104923+#endif
104924+
104925+ va_start(args, fmt);
104926+ ret = ____request_module(wait, NULL, fmt, args);
104927+ va_end(args);
104928+
104929+ return ret;
104930+}
104931+
104932 EXPORT_SYMBOL(__request_module);
104933 #endif /* CONFIG_MODULES */
104934
104935 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
104936 {
104937+#ifdef CONFIG_GRKERNSEC
104938+ kfree(info->path);
104939+ info->path = info->origpath;
104940+#endif
104941 if (info->cleanup)
104942 (*info->cleanup)(info);
104943 kfree(info);
104944@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
104945 */
104946 set_user_nice(current, 0);
104947
104948+#ifdef CONFIG_GRKERNSEC
104949+ /* this is race-free as far as userland is concerned as we copied
104950+ out the path to be used prior to this point and are now operating
104951+ on that copy
104952+ */
104953+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
104954+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
104955+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
104956+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
104957+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
104958+ retval = -EPERM;
104959+ goto out;
104960+ }
104961+#endif
104962+
104963 retval = -ENOMEM;
104964 new = prepare_kernel_cred(current);
104965 if (!new)
104966@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
104967 commit_creds(new);
104968
104969 retval = do_execve(getname_kernel(sub_info->path),
104970- (const char __user *const __user *)sub_info->argv,
104971- (const char __user *const __user *)sub_info->envp);
104972+ (const char __user *const __force_user *)sub_info->argv,
104973+ (const char __user *const __force_user *)sub_info->envp);
104974 out:
104975 sub_info->retval = retval;
104976 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
104977@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
104978 *
104979 * Thus the __user pointer cast is valid here.
104980 */
104981- sys_wait4(pid, (int __user *)&ret, 0, NULL);
104982+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
104983
104984 /*
104985 * If ret is 0, either ____call_usermodehelper failed and the
104986@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
104987 goto out;
104988
104989 INIT_WORK(&sub_info->work, __call_usermodehelper);
104990+#ifdef CONFIG_GRKERNSEC
104991+ sub_info->origpath = path;
104992+ sub_info->path = kstrdup(path, gfp_mask);
104993+#else
104994 sub_info->path = path;
104995+#endif
104996 sub_info->argv = argv;
104997 sub_info->envp = envp;
104998
104999@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
105000 static int proc_cap_handler(struct ctl_table *table, int write,
105001 void __user *buffer, size_t *lenp, loff_t *ppos)
105002 {
105003- struct ctl_table t;
105004+ ctl_table_no_const t;
105005 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
105006 kernel_cap_t new_cap;
105007 int err, i;
105008diff --git a/kernel/kprobes.c b/kernel/kprobes.c
105009index c90e417..e6c515d 100644
105010--- a/kernel/kprobes.c
105011+++ b/kernel/kprobes.c
105012@@ -31,6 +31,9 @@
105013 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
105014 * <prasanna@in.ibm.com> added function-return probes.
105015 */
105016+#ifdef CONFIG_GRKERNSEC_HIDESYM
105017+#define __INCLUDED_BY_HIDESYM 1
105018+#endif
105019 #include <linux/kprobes.h>
105020 #include <linux/hash.h>
105021 #include <linux/init.h>
105022@@ -122,12 +125,12 @@ enum kprobe_slot_state {
105023
105024 static void *alloc_insn_page(void)
105025 {
105026- return module_alloc(PAGE_SIZE);
105027+ return module_alloc_exec(PAGE_SIZE);
105028 }
105029
105030 static void free_insn_page(void *page)
105031 {
105032- module_memfree(page);
105033+ module_memfree_exec(page);
105034 }
105035
105036 struct kprobe_insn_cache kprobe_insn_slots = {
105037@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
105038 kprobe_type = "k";
105039
105040 if (sym)
105041- seq_printf(pi, "%p %s %s+0x%x %s ",
105042+ seq_printf(pi, "%pK %s %s+0x%x %s ",
105043 p->addr, kprobe_type, sym, offset,
105044 (modname ? modname : " "));
105045 else
105046- seq_printf(pi, "%p %s %p ",
105047+ seq_printf(pi, "%pK %s %pK ",
105048 p->addr, kprobe_type, p->addr);
105049
105050 if (!pp)
105051diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
105052index 6683cce..daf8999 100644
105053--- a/kernel/ksysfs.c
105054+++ b/kernel/ksysfs.c
105055@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
105056 {
105057 if (count+1 > UEVENT_HELPER_PATH_LEN)
105058 return -ENOENT;
105059+ if (!capable(CAP_SYS_ADMIN))
105060+ return -EPERM;
105061 memcpy(uevent_helper, buf, count);
105062 uevent_helper[count] = '\0';
105063 if (count && uevent_helper[count-1] == '\n')
105064@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
105065 return count;
105066 }
105067
105068-static struct bin_attribute notes_attr = {
105069+static bin_attribute_no_const notes_attr __read_only = {
105070 .attr = {
105071 .name = "notes",
105072 .mode = S_IRUGO,
105073diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
105074index aaeae88..10f3663 100644
105075--- a/kernel/locking/lockdep.c
105076+++ b/kernel/locking/lockdep.c
105077@@ -613,6 +613,10 @@ static int static_obj(void *obj)
105078 end = (unsigned long) &_end,
105079 addr = (unsigned long) obj;
105080
105081+#ifdef CONFIG_PAX_KERNEXEC
105082+ start = ktla_ktva(start);
105083+#endif
105084+
105085 /*
105086 * static variable?
105087 */
105088@@ -757,6 +761,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
105089 if (!static_obj(lock->key)) {
105090 debug_locks_off();
105091 printk("INFO: trying to register non-static key.\n");
105092+ printk("lock:%pS key:%pS.\n", lock, lock->key);
105093 printk("the code is fine but needs lockdep annotation.\n");
105094 printk("turning off the locking correctness validator.\n");
105095 dump_stack();
105096@@ -3102,7 +3107,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
105097 if (!class)
105098 return 0;
105099 }
105100- atomic_inc((atomic_t *)&class->ops);
105101+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
105102 if (very_verbose(class)) {
105103 printk("\nacquire class [%p] %s", class->key, class->name);
105104 if (class->name_version > 1)
105105diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
105106index d83d798..ea3120d 100644
105107--- a/kernel/locking/lockdep_proc.c
105108+++ b/kernel/locking/lockdep_proc.c
105109@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
105110 return 0;
105111 }
105112
105113- seq_printf(m, "%p", class->key);
105114+ seq_printf(m, "%pK", class->key);
105115 #ifdef CONFIG_DEBUG_LOCKDEP
105116 seq_printf(m, " OPS:%8ld", class->ops);
105117 #endif
105118@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
105119
105120 list_for_each_entry(entry, &class->locks_after, entry) {
105121 if (entry->distance == 1) {
105122- seq_printf(m, " -> [%p] ", entry->class->key);
105123+ seq_printf(m, " -> [%pK] ", entry->class->key);
105124 print_name(m, entry->class);
105125 seq_puts(m, "\n");
105126 }
105127@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
105128 if (!class->key)
105129 continue;
105130
105131- seq_printf(m, "[%p] ", class->key);
105132+ seq_printf(m, "[%pK] ", class->key);
105133 print_name(m, class);
105134 seq_puts(m, "\n");
105135 }
105136@@ -508,7 +508,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105137 if (!i)
105138 seq_line(m, '-', 40-namelen, namelen);
105139
105140- snprintf(ip, sizeof(ip), "[<%p>]",
105141+ snprintf(ip, sizeof(ip), "[<%pK>]",
105142 (void *)class->contention_point[i]);
105143 seq_printf(m, "%40s %14lu %29s %pS\n",
105144 name, stats->contention_point[i],
105145@@ -523,7 +523,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105146 if (!i)
105147 seq_line(m, '-', 40-namelen, namelen);
105148
105149- snprintf(ip, sizeof(ip), "[<%p>]",
105150+ snprintf(ip, sizeof(ip), "[<%pK>]",
105151 (void *)class->contending_point[i]);
105152 seq_printf(m, "%40s %14lu %29s %pS\n",
105153 name, stats->contending_point[i],
105154diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
105155index 3ef3736..9c951fa 100644
105156--- a/kernel/locking/mutex-debug.c
105157+++ b/kernel/locking/mutex-debug.c
105158@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
105159 }
105160
105161 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105162- struct thread_info *ti)
105163+ struct task_struct *task)
105164 {
105165 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
105166
105167 /* Mark the current thread as blocked on the lock: */
105168- ti->task->blocked_on = waiter;
105169+ task->blocked_on = waiter;
105170 }
105171
105172 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105173- struct thread_info *ti)
105174+ struct task_struct *task)
105175 {
105176 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
105177- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
105178- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
105179- ti->task->blocked_on = NULL;
105180+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
105181+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
105182+ task->blocked_on = NULL;
105183
105184 list_del_init(&waiter->list);
105185 waiter->task = NULL;
105186diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
105187index 0799fd3..d06ae3b 100644
105188--- a/kernel/locking/mutex-debug.h
105189+++ b/kernel/locking/mutex-debug.h
105190@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
105191 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
105192 extern void debug_mutex_add_waiter(struct mutex *lock,
105193 struct mutex_waiter *waiter,
105194- struct thread_info *ti);
105195+ struct task_struct *task);
105196 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105197- struct thread_info *ti);
105198+ struct task_struct *task);
105199 extern void debug_mutex_unlock(struct mutex *lock);
105200 extern void debug_mutex_init(struct mutex *lock, const char *name,
105201 struct lock_class_key *key);
105202diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
105203index 4cccea6..4382db9 100644
105204--- a/kernel/locking/mutex.c
105205+++ b/kernel/locking/mutex.c
105206@@ -533,7 +533,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105207 goto skip_wait;
105208
105209 debug_mutex_lock_common(lock, &waiter);
105210- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
105211+ debug_mutex_add_waiter(lock, &waiter, task);
105212
105213 /* add waiting tasks to the end of the waitqueue (FIFO): */
105214 list_add_tail(&waiter.list, &lock->wait_list);
105215@@ -580,7 +580,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105216 }
105217 __set_task_state(task, TASK_RUNNING);
105218
105219- mutex_remove_waiter(lock, &waiter, current_thread_info());
105220+ mutex_remove_waiter(lock, &waiter, task);
105221 /* set it to 0 if there are no waiters left: */
105222 if (likely(list_empty(&lock->wait_list)))
105223 atomic_set(&lock->count, 0);
105224@@ -601,7 +601,7 @@ skip_wait:
105225 return 0;
105226
105227 err:
105228- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
105229+ mutex_remove_waiter(lock, &waiter, task);
105230 spin_unlock_mutex(&lock->wait_lock, flags);
105231 debug_mutex_free_waiter(&waiter);
105232 mutex_release(&lock->dep_map, 1, ip);
105233diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
105234index 1d96dd0..994ff19 100644
105235--- a/kernel/locking/rtmutex-tester.c
105236+++ b/kernel/locking/rtmutex-tester.c
105237@@ -22,7 +22,7 @@
105238 #define MAX_RT_TEST_MUTEXES 8
105239
105240 static spinlock_t rttest_lock;
105241-static atomic_t rttest_event;
105242+static atomic_unchecked_t rttest_event;
105243
105244 struct test_thread_data {
105245 int opcode;
105246@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105247
105248 case RTTEST_LOCKCONT:
105249 td->mutexes[td->opdata] = 1;
105250- td->event = atomic_add_return(1, &rttest_event);
105251+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105252 return 0;
105253
105254 case RTTEST_RESET:
105255@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105256 return 0;
105257
105258 case RTTEST_RESETEVENT:
105259- atomic_set(&rttest_event, 0);
105260+ atomic_set_unchecked(&rttest_event, 0);
105261 return 0;
105262
105263 default:
105264@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105265 return ret;
105266
105267 td->mutexes[id] = 1;
105268- td->event = atomic_add_return(1, &rttest_event);
105269+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105270 rt_mutex_lock(&mutexes[id]);
105271- td->event = atomic_add_return(1, &rttest_event);
105272+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105273 td->mutexes[id] = 4;
105274 return 0;
105275
105276@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105277 return ret;
105278
105279 td->mutexes[id] = 1;
105280- td->event = atomic_add_return(1, &rttest_event);
105281+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105282 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
105283- td->event = atomic_add_return(1, &rttest_event);
105284+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105285 td->mutexes[id] = ret ? 0 : 4;
105286 return ret ? -EINTR : 0;
105287
105288@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105289 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
105290 return ret;
105291
105292- td->event = atomic_add_return(1, &rttest_event);
105293+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105294 rt_mutex_unlock(&mutexes[id]);
105295- td->event = atomic_add_return(1, &rttest_event);
105296+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105297 td->mutexes[id] = 0;
105298 return 0;
105299
105300@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105301 break;
105302
105303 td->mutexes[dat] = 2;
105304- td->event = atomic_add_return(1, &rttest_event);
105305+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105306 break;
105307
105308 default:
105309@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105310 return;
105311
105312 td->mutexes[dat] = 3;
105313- td->event = atomic_add_return(1, &rttest_event);
105314+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105315 break;
105316
105317 case RTTEST_LOCKNOWAIT:
105318@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105319 return;
105320
105321 td->mutexes[dat] = 1;
105322- td->event = atomic_add_return(1, &rttest_event);
105323+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105324 return;
105325
105326 default:
105327diff --git a/kernel/module.c b/kernel/module.c
105328index cfc9e84..a058697 100644
105329--- a/kernel/module.c
105330+++ b/kernel/module.c
105331@@ -59,6 +59,7 @@
105332 #include <linux/jump_label.h>
105333 #include <linux/pfn.h>
105334 #include <linux/bsearch.h>
105335+#include <linux/grsecurity.h>
105336 #include <uapi/linux/module.h>
105337 #include "module-internal.h"
105338
105339@@ -145,7 +146,7 @@ module_param(sig_enforce, bool_enable_only, 0644);
105340 #endif /* CONFIG_MODULE_SIG */
105341
105342 /* Block module loading/unloading? */
105343-int modules_disabled = 0;
105344+int modules_disabled __read_only = 0;
105345 core_param(nomodule, modules_disabled, bint, 0);
105346
105347 /* Waiting for a module to finish initializing? */
105348@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
105349
105350 /* Bounds of module allocation, for speeding __module_address.
105351 * Protected by module_mutex. */
105352-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
105353+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
105354+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
105355
105356 int register_module_notifier(struct notifier_block *nb)
105357 {
105358@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105359 return true;
105360
105361 list_for_each_entry_rcu(mod, &modules, list) {
105362- struct symsearch arr[] = {
105363+ struct symsearch modarr[] = {
105364 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
105365 NOT_GPL_ONLY, false },
105366 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
105367@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105368 if (mod->state == MODULE_STATE_UNFORMED)
105369 continue;
105370
105371- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
105372+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
105373 return true;
105374 }
105375 return false;
105376@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
105377 if (!pcpusec->sh_size)
105378 return 0;
105379
105380- if (align > PAGE_SIZE) {
105381+ if (align-1 >= PAGE_SIZE) {
105382 pr_warn("%s: per-cpu alignment %li > %li\n",
105383 mod->name, align, PAGE_SIZE);
105384 align = PAGE_SIZE;
105385@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
105386 static ssize_t show_coresize(struct module_attribute *mattr,
105387 struct module_kobject *mk, char *buffer)
105388 {
105389- return sprintf(buffer, "%u\n", mk->mod->core_size);
105390+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
105391 }
105392
105393 static struct module_attribute modinfo_coresize =
105394@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
105395 static ssize_t show_initsize(struct module_attribute *mattr,
105396 struct module_kobject *mk, char *buffer)
105397 {
105398- return sprintf(buffer, "%u\n", mk->mod->init_size);
105399+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
105400 }
105401
105402 static struct module_attribute modinfo_initsize =
105403@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
105404 goto bad_version;
105405 }
105406
105407+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105408+ /*
105409+ * avoid potentially printing jibberish on attempted load
105410+ * of a module randomized with a different seed
105411+ */
105412+ pr_warn("no symbol version for %s\n", symname);
105413+#else
105414 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
105415+#endif
105416 return 0;
105417
105418 bad_version:
105419+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105420+ /*
105421+ * avoid potentially printing jibberish on attempted load
105422+ * of a module randomized with a different seed
105423+ */
105424+ pr_warn("attempted module disagrees about version of symbol %s\n",
105425+ symname);
105426+#else
105427 pr_warn("%s: disagrees about version of symbol %s\n",
105428 mod->name, symname);
105429+#endif
105430 return 0;
105431 }
105432
105433@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
105434 */
105435 #ifdef CONFIG_SYSFS
105436
105437-#ifdef CONFIG_KALLSYMS
105438+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
105439 static inline bool sect_empty(const Elf_Shdr *sect)
105440 {
105441 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
105442@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
105443 {
105444 unsigned int notes, loaded, i;
105445 struct module_notes_attrs *notes_attrs;
105446- struct bin_attribute *nattr;
105447+ bin_attribute_no_const *nattr;
105448
105449 /* failed to create section attributes, so can't create notes */
105450 if (!mod->sect_attrs)
105451@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
105452 static int module_add_modinfo_attrs(struct module *mod)
105453 {
105454 struct module_attribute *attr;
105455- struct module_attribute *temp_attr;
105456+ module_attribute_no_const *temp_attr;
105457 int error = 0;
105458 int i;
105459
105460@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
105461
105462 static void unset_module_core_ro_nx(struct module *mod)
105463 {
105464- set_page_attributes(mod->module_core + mod->core_text_size,
105465- mod->module_core + mod->core_size,
105466+ set_page_attributes(mod->module_core_rw,
105467+ mod->module_core_rw + mod->core_size_rw,
105468 set_memory_x);
105469- set_page_attributes(mod->module_core,
105470- mod->module_core + mod->core_ro_size,
105471+ set_page_attributes(mod->module_core_rx,
105472+ mod->module_core_rx + mod->core_size_rx,
105473 set_memory_rw);
105474 }
105475
105476 static void unset_module_init_ro_nx(struct module *mod)
105477 {
105478- set_page_attributes(mod->module_init + mod->init_text_size,
105479- mod->module_init + mod->init_size,
105480+ set_page_attributes(mod->module_init_rw,
105481+ mod->module_init_rw + mod->init_size_rw,
105482 set_memory_x);
105483- set_page_attributes(mod->module_init,
105484- mod->module_init + mod->init_ro_size,
105485+ set_page_attributes(mod->module_init_rx,
105486+ mod->module_init_rx + mod->init_size_rx,
105487 set_memory_rw);
105488 }
105489
105490@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
105491 list_for_each_entry_rcu(mod, &modules, list) {
105492 if (mod->state == MODULE_STATE_UNFORMED)
105493 continue;
105494- if ((mod->module_core) && (mod->core_text_size)) {
105495- set_page_attributes(mod->module_core,
105496- mod->module_core + mod->core_text_size,
105497+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105498+ set_page_attributes(mod->module_core_rx,
105499+ mod->module_core_rx + mod->core_size_rx,
105500 set_memory_rw);
105501 }
105502- if ((mod->module_init) && (mod->init_text_size)) {
105503- set_page_attributes(mod->module_init,
105504- mod->module_init + mod->init_text_size,
105505+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105506+ set_page_attributes(mod->module_init_rx,
105507+ mod->module_init_rx + mod->init_size_rx,
105508 set_memory_rw);
105509 }
105510 }
105511@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
105512 list_for_each_entry_rcu(mod, &modules, list) {
105513 if (mod->state == MODULE_STATE_UNFORMED)
105514 continue;
105515- if ((mod->module_core) && (mod->core_text_size)) {
105516- set_page_attributes(mod->module_core,
105517- mod->module_core + mod->core_text_size,
105518+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105519+ set_page_attributes(mod->module_core_rx,
105520+ mod->module_core_rx + mod->core_size_rx,
105521 set_memory_ro);
105522 }
105523- if ((mod->module_init) && (mod->init_text_size)) {
105524- set_page_attributes(mod->module_init,
105525- mod->module_init + mod->init_text_size,
105526+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105527+ set_page_attributes(mod->module_init_rx,
105528+ mod->module_init_rx + mod->init_size_rx,
105529 set_memory_ro);
105530 }
105531 }
105532@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
105533 #else
105534 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
105535 static void unset_module_core_ro_nx(struct module *mod) { }
105536-static void unset_module_init_ro_nx(struct module *mod) { }
105537+static void unset_module_init_ro_nx(struct module *mod)
105538+{
105539+
105540+#ifdef CONFIG_PAX_KERNEXEC
105541+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105542+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105543+#endif
105544+
105545+}
105546 #endif
105547
105548 void __weak module_memfree(void *module_region)
105549@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
105550 /* This may be NULL, but that's OK */
105551 unset_module_init_ro_nx(mod);
105552 module_arch_freeing_init(mod);
105553- module_memfree(mod->module_init);
105554+ module_memfree(mod->module_init_rw);
105555+ module_memfree_exec(mod->module_init_rx);
105556 kfree(mod->args);
105557 percpu_modfree(mod);
105558
105559 /* Free lock-classes; relies on the preceding sync_rcu(). */
105560- lockdep_free_key_range(mod->module_core, mod->core_size);
105561+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105562+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105563
105564 /* Finally, free the core (containing the module structure) */
105565 unset_module_core_ro_nx(mod);
105566- module_memfree(mod->module_core);
105567+ module_memfree_exec(mod->module_core_rx);
105568+ module_memfree(mod->module_core_rw);
105569
105570 #ifdef CONFIG_MPU
105571 update_protections(current->mm);
105572@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105573 int ret = 0;
105574 const struct kernel_symbol *ksym;
105575
105576+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105577+ int is_fs_load = 0;
105578+ int register_filesystem_found = 0;
105579+ char *p;
105580+
105581+ p = strstr(mod->args, "grsec_modharden_fs");
105582+ if (p) {
105583+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
105584+ /* copy \0 as well */
105585+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
105586+ is_fs_load = 1;
105587+ }
105588+#endif
105589+
105590 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
105591 const char *name = info->strtab + sym[i].st_name;
105592
105593+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105594+ /* it's a real shame this will never get ripped and copied
105595+ upstream! ;(
105596+ */
105597+ if (is_fs_load && !strcmp(name, "register_filesystem"))
105598+ register_filesystem_found = 1;
105599+#endif
105600+
105601 switch (sym[i].st_shndx) {
105602 case SHN_COMMON:
105603 /* Ignore common symbols */
105604@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105605 ksym = resolve_symbol_wait(mod, info, name);
105606 /* Ok if resolved. */
105607 if (ksym && !IS_ERR(ksym)) {
105608+ pax_open_kernel();
105609 sym[i].st_value = ksym->value;
105610+ pax_close_kernel();
105611 break;
105612 }
105613
105614@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105615 secbase = (unsigned long)mod_percpu(mod);
105616 else
105617 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
105618+ pax_open_kernel();
105619 sym[i].st_value += secbase;
105620+ pax_close_kernel();
105621 break;
105622 }
105623 }
105624
105625+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105626+ if (is_fs_load && !register_filesystem_found) {
105627+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
105628+ ret = -EPERM;
105629+ }
105630+#endif
105631+
105632 return ret;
105633 }
105634
105635@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
105636 || s->sh_entsize != ~0UL
105637 || strstarts(sname, ".init"))
105638 continue;
105639- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
105640+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105641+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
105642+ else
105643+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
105644 pr_debug("\t%s\n", sname);
105645 }
105646- switch (m) {
105647- case 0: /* executable */
105648- mod->core_size = debug_align(mod->core_size);
105649- mod->core_text_size = mod->core_size;
105650- break;
105651- case 1: /* RO: text and ro-data */
105652- mod->core_size = debug_align(mod->core_size);
105653- mod->core_ro_size = mod->core_size;
105654- break;
105655- case 3: /* whole core */
105656- mod->core_size = debug_align(mod->core_size);
105657- break;
105658- }
105659 }
105660
105661 pr_debug("Init section allocation order:\n");
105662@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
105663 || s->sh_entsize != ~0UL
105664 || !strstarts(sname, ".init"))
105665 continue;
105666- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
105667- | INIT_OFFSET_MASK);
105668+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105669+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
105670+ else
105671+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
105672+ s->sh_entsize |= INIT_OFFSET_MASK;
105673 pr_debug("\t%s\n", sname);
105674 }
105675- switch (m) {
105676- case 0: /* executable */
105677- mod->init_size = debug_align(mod->init_size);
105678- mod->init_text_size = mod->init_size;
105679- break;
105680- case 1: /* RO: text and ro-data */
105681- mod->init_size = debug_align(mod->init_size);
105682- mod->init_ro_size = mod->init_size;
105683- break;
105684- case 3: /* whole init */
105685- mod->init_size = debug_align(mod->init_size);
105686- break;
105687- }
105688 }
105689 }
105690
105691@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105692
105693 /* Put symbol section at end of init part of module. */
105694 symsect->sh_flags |= SHF_ALLOC;
105695- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
105696+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
105697 info->index.sym) | INIT_OFFSET_MASK;
105698 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
105699
105700@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105701 }
105702
105703 /* Append room for core symbols at end of core part. */
105704- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
105705- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
105706- mod->core_size += strtab_size;
105707- mod->core_size = debug_align(mod->core_size);
105708+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
105709+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
105710+ mod->core_size_rx += strtab_size;
105711+ mod->core_size_rx = debug_align(mod->core_size_rx);
105712
105713 /* Put string table section at end of init part of module. */
105714 strsect->sh_flags |= SHF_ALLOC;
105715- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
105716+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
105717 info->index.str) | INIT_OFFSET_MASK;
105718- mod->init_size = debug_align(mod->init_size);
105719+ mod->init_size_rx = debug_align(mod->init_size_rx);
105720 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
105721 }
105722
105723@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105724 /* Make sure we get permanent strtab: don't use info->strtab. */
105725 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
105726
105727+ pax_open_kernel();
105728+
105729 /* Set types up while we still have access to sections. */
105730 for (i = 0; i < mod->num_symtab; i++)
105731 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
105732
105733- mod->core_symtab = dst = mod->module_core + info->symoffs;
105734- mod->core_strtab = s = mod->module_core + info->stroffs;
105735+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
105736+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
105737 src = mod->symtab;
105738 for (ndst = i = 0; i < mod->num_symtab; i++) {
105739 if (i == 0 ||
105740@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105741 }
105742 }
105743 mod->core_num_syms = ndst;
105744+
105745+ pax_close_kernel();
105746 }
105747 #else
105748 static inline void layout_symtab(struct module *mod, struct load_info *info)
105749@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
105750 return vmalloc_exec(size);
105751 }
105752
105753-static void *module_alloc_update_bounds(unsigned long size)
105754+static void *module_alloc_update_bounds_rw(unsigned long size)
105755 {
105756 void *ret = module_alloc(size);
105757
105758 if (ret) {
105759 mutex_lock(&module_mutex);
105760 /* Update module bounds. */
105761- if ((unsigned long)ret < module_addr_min)
105762- module_addr_min = (unsigned long)ret;
105763- if ((unsigned long)ret + size > module_addr_max)
105764- module_addr_max = (unsigned long)ret + size;
105765+ if ((unsigned long)ret < module_addr_min_rw)
105766+ module_addr_min_rw = (unsigned long)ret;
105767+ if ((unsigned long)ret + size > module_addr_max_rw)
105768+ module_addr_max_rw = (unsigned long)ret + size;
105769+ mutex_unlock(&module_mutex);
105770+ }
105771+ return ret;
105772+}
105773+
105774+static void *module_alloc_update_bounds_rx(unsigned long size)
105775+{
105776+ void *ret = module_alloc_exec(size);
105777+
105778+ if (ret) {
105779+ mutex_lock(&module_mutex);
105780+ /* Update module bounds. */
105781+ if ((unsigned long)ret < module_addr_min_rx)
105782+ module_addr_min_rx = (unsigned long)ret;
105783+ if ((unsigned long)ret + size > module_addr_max_rx)
105784+ module_addr_max_rx = (unsigned long)ret + size;
105785 mutex_unlock(&module_mutex);
105786 }
105787 return ret;
105788@@ -2666,7 +2729,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105789 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
105790
105791 if (info->index.sym == 0) {
105792+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105793+ /*
105794+ * avoid potentially printing jibberish on attempted load
105795+ * of a module randomized with a different seed
105796+ */
105797+ pr_warn("module has no symbols (stripped?)\n");
105798+#else
105799 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
105800+#endif
105801 return ERR_PTR(-ENOEXEC);
105802 }
105803
105804@@ -2682,8 +2753,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105805 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105806 {
105807 const char *modmagic = get_modinfo(info, "vermagic");
105808+ const char *license = get_modinfo(info, "license");
105809 int err;
105810
105811+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
105812+ if (!license || !license_is_gpl_compatible(license))
105813+ return -ENOEXEC;
105814+#endif
105815+
105816 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
105817 modmagic = NULL;
105818
105819@@ -2708,7 +2785,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105820 }
105821
105822 /* Set up license info based on the info section */
105823- set_license(mod, get_modinfo(info, "license"));
105824+ set_license(mod, license);
105825
105826 return 0;
105827 }
105828@@ -2805,7 +2882,7 @@ static int move_module(struct module *mod, struct load_info *info)
105829 void *ptr;
105830
105831 /* Do the allocs. */
105832- ptr = module_alloc_update_bounds(mod->core_size);
105833+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
105834 /*
105835 * The pointer to this block is stored in the module structure
105836 * which is inside the block. Just mark it as not being a
105837@@ -2815,11 +2892,11 @@ static int move_module(struct module *mod, struct load_info *info)
105838 if (!ptr)
105839 return -ENOMEM;
105840
105841- memset(ptr, 0, mod->core_size);
105842- mod->module_core = ptr;
105843+ memset(ptr, 0, mod->core_size_rw);
105844+ mod->module_core_rw = ptr;
105845
105846- if (mod->init_size) {
105847- ptr = module_alloc_update_bounds(mod->init_size);
105848+ if (mod->init_size_rw) {
105849+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
105850 /*
105851 * The pointer to this block is stored in the module structure
105852 * which is inside the block. This block doesn't need to be
105853@@ -2828,13 +2905,45 @@ static int move_module(struct module *mod, struct load_info *info)
105854 */
105855 kmemleak_ignore(ptr);
105856 if (!ptr) {
105857- module_memfree(mod->module_core);
105858+ module_memfree(mod->module_core_rw);
105859 return -ENOMEM;
105860 }
105861- memset(ptr, 0, mod->init_size);
105862- mod->module_init = ptr;
105863+ memset(ptr, 0, mod->init_size_rw);
105864+ mod->module_init_rw = ptr;
105865 } else
105866- mod->module_init = NULL;
105867+ mod->module_init_rw = NULL;
105868+
105869+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
105870+ kmemleak_not_leak(ptr);
105871+ if (!ptr) {
105872+ if (mod->module_init_rw)
105873+ module_memfree(mod->module_init_rw);
105874+ module_memfree(mod->module_core_rw);
105875+ return -ENOMEM;
105876+ }
105877+
105878+ pax_open_kernel();
105879+ memset(ptr, 0, mod->core_size_rx);
105880+ pax_close_kernel();
105881+ mod->module_core_rx = ptr;
105882+
105883+ if (mod->init_size_rx) {
105884+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
105885+ kmemleak_ignore(ptr);
105886+ if (!ptr && mod->init_size_rx) {
105887+ module_memfree_exec(mod->module_core_rx);
105888+ if (mod->module_init_rw)
105889+ module_memfree(mod->module_init_rw);
105890+ module_memfree(mod->module_core_rw);
105891+ return -ENOMEM;
105892+ }
105893+
105894+ pax_open_kernel();
105895+ memset(ptr, 0, mod->init_size_rx);
105896+ pax_close_kernel();
105897+ mod->module_init_rx = ptr;
105898+ } else
105899+ mod->module_init_rx = NULL;
105900
105901 /* Transfer each section which specifies SHF_ALLOC */
105902 pr_debug("final section addresses:\n");
105903@@ -2845,16 +2954,45 @@ static int move_module(struct module *mod, struct load_info *info)
105904 if (!(shdr->sh_flags & SHF_ALLOC))
105905 continue;
105906
105907- if (shdr->sh_entsize & INIT_OFFSET_MASK)
105908- dest = mod->module_init
105909- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105910- else
105911- dest = mod->module_core + shdr->sh_entsize;
105912+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
105913+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105914+ dest = mod->module_init_rw
105915+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105916+ else
105917+ dest = mod->module_init_rx
105918+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105919+ } else {
105920+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105921+ dest = mod->module_core_rw + shdr->sh_entsize;
105922+ else
105923+ dest = mod->module_core_rx + shdr->sh_entsize;
105924+ }
105925+
105926+ if (shdr->sh_type != SHT_NOBITS) {
105927+
105928+#ifdef CONFIG_PAX_KERNEXEC
105929+#ifdef CONFIG_X86_64
105930+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
105931+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
105932+#endif
105933+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
105934+ pax_open_kernel();
105935+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105936+ pax_close_kernel();
105937+ } else
105938+#endif
105939
105940- if (shdr->sh_type != SHT_NOBITS)
105941 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105942+ }
105943 /* Update sh_addr to point to copy in image. */
105944- shdr->sh_addr = (unsigned long)dest;
105945+
105946+#ifdef CONFIG_PAX_KERNEXEC
105947+ if (shdr->sh_flags & SHF_EXECINSTR)
105948+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
105949+ else
105950+#endif
105951+
105952+ shdr->sh_addr = (unsigned long)dest;
105953 pr_debug("\t0x%lx %s\n",
105954 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
105955 }
105956@@ -2911,12 +3049,12 @@ static void flush_module_icache(const struct module *mod)
105957 * Do it before processing of module parameters, so the module
105958 * can provide parameter accessor functions of its own.
105959 */
105960- if (mod->module_init)
105961- flush_icache_range((unsigned long)mod->module_init,
105962- (unsigned long)mod->module_init
105963- + mod->init_size);
105964- flush_icache_range((unsigned long)mod->module_core,
105965- (unsigned long)mod->module_core + mod->core_size);
105966+ if (mod->module_init_rx)
105967+ flush_icache_range((unsigned long)mod->module_init_rx,
105968+ (unsigned long)mod->module_init_rx
105969+ + mod->init_size_rx);
105970+ flush_icache_range((unsigned long)mod->module_core_rx,
105971+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
105972
105973 set_fs(old_fs);
105974 }
105975@@ -2974,8 +3112,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
105976 {
105977 percpu_modfree(mod);
105978 module_arch_freeing_init(mod);
105979- module_memfree(mod->module_init);
105980- module_memfree(mod->module_core);
105981+ module_memfree_exec(mod->module_init_rx);
105982+ module_memfree_exec(mod->module_core_rx);
105983+ module_memfree(mod->module_init_rw);
105984+ module_memfree(mod->module_core_rw);
105985 }
105986
105987 int __weak module_finalize(const Elf_Ehdr *hdr,
105988@@ -2988,7 +3128,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
105989 static int post_relocation(struct module *mod, const struct load_info *info)
105990 {
105991 /* Sort exception table now relocations are done. */
105992+ pax_open_kernel();
105993 sort_extable(mod->extable, mod->extable + mod->num_exentries);
105994+ pax_close_kernel();
105995
105996 /* Copy relocated percpu area over. */
105997 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
105998@@ -3036,13 +3178,15 @@ static void do_mod_ctors(struct module *mod)
105999 /* For freeing module_init on success, in case kallsyms traversing */
106000 struct mod_initfree {
106001 struct rcu_head rcu;
106002- void *module_init;
106003+ void *module_init_rw;
106004+ void *module_init_rx;
106005 };
106006
106007 static void do_free_init(struct rcu_head *head)
106008 {
106009 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
106010- module_memfree(m->module_init);
106011+ module_memfree(m->module_init_rw);
106012+ module_memfree_exec(m->module_init_rx);
106013 kfree(m);
106014 }
106015
106016@@ -3062,7 +3206,8 @@ static noinline int do_init_module(struct module *mod)
106017 ret = -ENOMEM;
106018 goto fail;
106019 }
106020- freeinit->module_init = mod->module_init;
106021+ freeinit->module_init_rw = mod->module_init_rw;
106022+ freeinit->module_init_rx = mod->module_init_rx;
106023
106024 /*
106025 * We want to find out whether @mod uses async during init. Clear
106026@@ -3121,10 +3266,10 @@ static noinline int do_init_module(struct module *mod)
106027 #endif
106028 unset_module_init_ro_nx(mod);
106029 module_arch_freeing_init(mod);
106030- mod->module_init = NULL;
106031- mod->init_size = 0;
106032- mod->init_ro_size = 0;
106033- mod->init_text_size = 0;
106034+ mod->module_init_rw = NULL;
106035+ mod->module_init_rx = NULL;
106036+ mod->init_size_rw = 0;
106037+ mod->init_size_rx = 0;
106038 /*
106039 * We want to free module_init, but be aware that kallsyms may be
106040 * walking this with preempt disabled. In all the failure paths,
106041@@ -3212,16 +3357,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
106042 module_bug_finalize(info->hdr, info->sechdrs, mod);
106043
106044 /* Set RO and NX regions for core */
106045- set_section_ro_nx(mod->module_core,
106046- mod->core_text_size,
106047- mod->core_ro_size,
106048- mod->core_size);
106049+ set_section_ro_nx(mod->module_core_rx,
106050+ mod->core_size_rx,
106051+ mod->core_size_rx,
106052+ mod->core_size_rx);
106053
106054 /* Set RO and NX regions for init */
106055- set_section_ro_nx(mod->module_init,
106056- mod->init_text_size,
106057- mod->init_ro_size,
106058- mod->init_size);
106059+ set_section_ro_nx(mod->module_init_rx,
106060+ mod->init_size_rx,
106061+ mod->init_size_rx,
106062+ mod->init_size_rx);
106063
106064 /* Mark state as coming so strong_try_module_get() ignores us,
106065 * but kallsyms etc. can see us. */
106066@@ -3305,9 +3450,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
106067 if (err)
106068 goto free_unload;
106069
106070+ /* Now copy in args */
106071+ mod->args = strndup_user(uargs, ~0UL >> 1);
106072+ if (IS_ERR(mod->args)) {
106073+ err = PTR_ERR(mod->args);
106074+ goto free_unload;
106075+ }
106076+
106077 /* Set up MODINFO_ATTR fields */
106078 setup_modinfo(mod, info);
106079
106080+#ifdef CONFIG_GRKERNSEC_MODHARDEN
106081+ {
106082+ char *p, *p2;
106083+
106084+ if (strstr(mod->args, "grsec_modharden_netdev")) {
106085+ 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);
106086+ err = -EPERM;
106087+ goto free_modinfo;
106088+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
106089+ p += sizeof("grsec_modharden_normal") - 1;
106090+ p2 = strstr(p, "_");
106091+ if (p2) {
106092+ *p2 = '\0';
106093+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
106094+ *p2 = '_';
106095+ }
106096+ err = -EPERM;
106097+ goto free_modinfo;
106098+ }
106099+ }
106100+#endif
106101+
106102 /* Fix up syms, so that st_value is a pointer to location. */
106103 err = simplify_symbols(mod, info);
106104 if (err < 0)
106105@@ -3323,13 +3497,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
106106
106107 flush_module_icache(mod);
106108
106109- /* Now copy in args */
106110- mod->args = strndup_user(uargs, ~0UL >> 1);
106111- if (IS_ERR(mod->args)) {
106112- err = PTR_ERR(mod->args);
106113- goto free_arch_cleanup;
106114- }
106115-
106116 dynamic_debug_setup(info->debug, info->num_debug);
106117
106118 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
106119@@ -3380,11 +3547,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
106120 ddebug_cleanup:
106121 dynamic_debug_remove(info->debug);
106122 synchronize_sched();
106123- kfree(mod->args);
106124- free_arch_cleanup:
106125 module_arch_cleanup(mod);
106126 free_modinfo:
106127 free_modinfo(mod);
106128+ kfree(mod->args);
106129 free_unload:
106130 module_unload_free(mod);
106131 unlink_mod:
106132@@ -3397,7 +3563,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
106133 mutex_unlock(&module_mutex);
106134 free_module:
106135 /* Free lock-classes; relies on the preceding sync_rcu() */
106136- lockdep_free_key_range(mod->module_core, mod->core_size);
106137+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
106138+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
106139
106140 module_deallocate(mod, info);
106141 free_copy:
106142@@ -3474,10 +3641,16 @@ static const char *get_ksymbol(struct module *mod,
106143 unsigned long nextval;
106144
106145 /* At worse, next value is at end of module */
106146- if (within_module_init(addr, mod))
106147- nextval = (unsigned long)mod->module_init+mod->init_text_size;
106148+ if (within_module_init_rx(addr, mod))
106149+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
106150+ else if (within_module_init_rw(addr, mod))
106151+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
106152+ else if (within_module_core_rx(addr, mod))
106153+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
106154+ else if (within_module_core_rw(addr, mod))
106155+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
106156 else
106157- nextval = (unsigned long)mod->module_core+mod->core_text_size;
106158+ return NULL;
106159
106160 /* Scan for closest preceding symbol, and next symbol. (ELF
106161 starts real symbols at 1). */
106162@@ -3725,7 +3898,7 @@ static int m_show(struct seq_file *m, void *p)
106163 return 0;
106164
106165 seq_printf(m, "%s %u",
106166- mod->name, mod->init_size + mod->core_size);
106167+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
106168 print_unload_info(m, mod);
106169
106170 /* Informative for users. */
106171@@ -3734,7 +3907,7 @@ static int m_show(struct seq_file *m, void *p)
106172 mod->state == MODULE_STATE_COMING ? "Loading" :
106173 "Live");
106174 /* Used by oprofile and other similar tools. */
106175- seq_printf(m, " 0x%pK", mod->module_core);
106176+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
106177
106178 /* Taints info */
106179 if (mod->taints)
106180@@ -3770,7 +3943,17 @@ static const struct file_operations proc_modules_operations = {
106181
106182 static int __init proc_modules_init(void)
106183 {
106184+#ifndef CONFIG_GRKERNSEC_HIDESYM
106185+#ifdef CONFIG_GRKERNSEC_PROC_USER
106186+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106187+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
106188+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
106189+#else
106190 proc_create("modules", 0, NULL, &proc_modules_operations);
106191+#endif
106192+#else
106193+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106194+#endif
106195 return 0;
106196 }
106197 module_init(proc_modules_init);
106198@@ -3831,7 +4014,8 @@ struct module *__module_address(unsigned long addr)
106199 {
106200 struct module *mod;
106201
106202- if (addr < module_addr_min || addr > module_addr_max)
106203+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
106204+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
106205 return NULL;
106206
106207 list_for_each_entry_rcu(mod, &modules, list) {
106208@@ -3872,11 +4056,20 @@ bool is_module_text_address(unsigned long addr)
106209 */
106210 struct module *__module_text_address(unsigned long addr)
106211 {
106212- struct module *mod = __module_address(addr);
106213+ struct module *mod;
106214+
106215+#ifdef CONFIG_X86_32
106216+ addr = ktla_ktva(addr);
106217+#endif
106218+
106219+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
106220+ return NULL;
106221+
106222+ mod = __module_address(addr);
106223+
106224 if (mod) {
106225 /* Make sure it's within the text section. */
106226- if (!within(addr, mod->module_init, mod->init_text_size)
106227- && !within(addr, mod->module_core, mod->core_text_size))
106228+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
106229 mod = NULL;
106230 }
106231 return mod;
106232diff --git a/kernel/notifier.c b/kernel/notifier.c
106233index ae9fc7c..5085fbf 100644
106234--- a/kernel/notifier.c
106235+++ b/kernel/notifier.c
106236@@ -5,6 +5,7 @@
106237 #include <linux/rcupdate.h>
106238 #include <linux/vmalloc.h>
106239 #include <linux/reboot.h>
106240+#include <linux/mm.h>
106241
106242 /*
106243 * Notifier list for kernel code which wants to be called
106244@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
106245 while ((*nl) != NULL) {
106246 if (n->priority > (*nl)->priority)
106247 break;
106248- nl = &((*nl)->next);
106249+ nl = (struct notifier_block **)&((*nl)->next);
106250 }
106251- n->next = *nl;
106252+ pax_open_kernel();
106253+ *(const void **)&n->next = *nl;
106254 rcu_assign_pointer(*nl, n);
106255+ pax_close_kernel();
106256 return 0;
106257 }
106258
106259@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
106260 return 0;
106261 if (n->priority > (*nl)->priority)
106262 break;
106263- nl = &((*nl)->next);
106264+ nl = (struct notifier_block **)&((*nl)->next);
106265 }
106266- n->next = *nl;
106267+ pax_open_kernel();
106268+ *(const void **)&n->next = *nl;
106269 rcu_assign_pointer(*nl, n);
106270+ pax_close_kernel();
106271 return 0;
106272 }
106273
106274@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
106275 {
106276 while ((*nl) != NULL) {
106277 if ((*nl) == n) {
106278+ pax_open_kernel();
106279 rcu_assign_pointer(*nl, n->next);
106280+ pax_close_kernel();
106281 return 0;
106282 }
106283- nl = &((*nl)->next);
106284+ nl = (struct notifier_block **)&((*nl)->next);
106285 }
106286 return -ENOENT;
106287 }
106288diff --git a/kernel/padata.c b/kernel/padata.c
106289index b38bea9..91acfbe 100644
106290--- a/kernel/padata.c
106291+++ b/kernel/padata.c
106292@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
106293 * seq_nr mod. number of cpus in use.
106294 */
106295
106296- seq_nr = atomic_inc_return(&pd->seq_nr);
106297+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
106298 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
106299
106300 return padata_index_to_cpu(pd, cpu_index);
106301@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
106302 padata_init_pqueues(pd);
106303 padata_init_squeues(pd);
106304 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
106305- atomic_set(&pd->seq_nr, -1);
106306+ atomic_set_unchecked(&pd->seq_nr, -1);
106307 atomic_set(&pd->reorder_objects, 0);
106308 atomic_set(&pd->refcnt, 0);
106309 pd->pinst = pinst;
106310diff --git a/kernel/panic.c b/kernel/panic.c
106311index 8136ad7..15c857b 100644
106312--- a/kernel/panic.c
106313+++ b/kernel/panic.c
106314@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
106315 /*
106316 * Stop ourself in panic -- architecture code may override this
106317 */
106318-void __weak panic_smp_self_stop(void)
106319+void __weak __noreturn panic_smp_self_stop(void)
106320 {
106321 while (1)
106322 cpu_relax();
106323@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
106324 disable_trace_on_warning();
106325
106326 pr_warn("------------[ cut here ]------------\n");
106327- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
106328+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
106329 raw_smp_processor_id(), current->pid, file, line, caller);
106330
106331 if (args)
106332@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
106333 */
106334 __visible void __stack_chk_fail(void)
106335 {
106336- panic("stack-protector: Kernel stack is corrupted in: %p\n",
106337+ dump_stack();
106338+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
106339 __builtin_return_address(0));
106340 }
106341 EXPORT_SYMBOL(__stack_chk_fail);
106342diff --git a/kernel/pid.c b/kernel/pid.c
106343index 4fd07d5..02bce4f 100644
106344--- a/kernel/pid.c
106345+++ b/kernel/pid.c
106346@@ -33,6 +33,7 @@
106347 #include <linux/rculist.h>
106348 #include <linux/bootmem.h>
106349 #include <linux/hash.h>
106350+#include <linux/security.h>
106351 #include <linux/pid_namespace.h>
106352 #include <linux/init_task.h>
106353 #include <linux/syscalls.h>
106354@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
106355
106356 int pid_max = PID_MAX_DEFAULT;
106357
106358-#define RESERVED_PIDS 300
106359+#define RESERVED_PIDS 500
106360
106361 int pid_max_min = RESERVED_PIDS + 1;
106362 int pid_max_max = PID_MAX_LIMIT;
106363@@ -451,10 +452,18 @@ EXPORT_SYMBOL(pid_task);
106364 */
106365 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
106366 {
106367+ struct task_struct *task;
106368+
106369 rcu_lockdep_assert(rcu_read_lock_held(),
106370 "find_task_by_pid_ns() needs rcu_read_lock()"
106371 " protection");
106372- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106373+
106374+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106375+
106376+ if (gr_pid_is_chrooted(task))
106377+ return NULL;
106378+
106379+ return task;
106380 }
106381
106382 struct task_struct *find_task_by_vpid(pid_t vnr)
106383@@ -462,6 +471,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
106384 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
106385 }
106386
106387+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
106388+{
106389+ rcu_lockdep_assert(rcu_read_lock_held(),
106390+ "find_task_by_pid_ns() needs rcu_read_lock()"
106391+ " protection");
106392+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
106393+}
106394+
106395 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
106396 {
106397 struct pid *pid;
106398diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
106399index a65ba13..f600dbb 100644
106400--- a/kernel/pid_namespace.c
106401+++ b/kernel/pid_namespace.c
106402@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
106403 void __user *buffer, size_t *lenp, loff_t *ppos)
106404 {
106405 struct pid_namespace *pid_ns = task_active_pid_ns(current);
106406- struct ctl_table tmp = *table;
106407+ ctl_table_no_const tmp = *table;
106408
106409 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
106410 return -EPERM;
106411diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
106412index 7e01f78..f5da19d 100644
106413--- a/kernel/power/Kconfig
106414+++ b/kernel/power/Kconfig
106415@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
106416 config HIBERNATION
106417 bool "Hibernation (aka 'suspend to disk')"
106418 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
106419+ depends on !GRKERNSEC_KMEM
106420+ depends on !PAX_MEMORY_SANITIZE
106421 select HIBERNATE_CALLBACKS
106422 select LZO_COMPRESS
106423 select LZO_DECOMPRESS
106424diff --git a/kernel/power/process.c b/kernel/power/process.c
106425index 564f786..361a18e 100644
106426--- a/kernel/power/process.c
106427+++ b/kernel/power/process.c
106428@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
106429 unsigned int elapsed_msecs;
106430 bool wakeup = false;
106431 int sleep_usecs = USEC_PER_MSEC;
106432+ bool timedout = false;
106433
106434 do_gettimeofday(&start);
106435
106436@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
106437
106438 while (true) {
106439 todo = 0;
106440+ if (time_after(jiffies, end_time))
106441+ timedout = true;
106442 read_lock(&tasklist_lock);
106443 for_each_process_thread(g, p) {
106444 if (p == current || !freeze_task(p))
106445 continue;
106446
106447- if (!freezer_should_skip(p))
106448+ if (!freezer_should_skip(p)) {
106449 todo++;
106450+ if (timedout) {
106451+ printk(KERN_ERR "Task refusing to freeze:\n");
106452+ sched_show_task(p);
106453+ }
106454+ }
106455 }
106456 read_unlock(&tasklist_lock);
106457
106458@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
106459 todo += wq_busy;
106460 }
106461
106462- if (!todo || time_after(jiffies, end_time))
106463+ if (!todo || timedout)
106464 break;
106465
106466 if (pm_wakeup_pending()) {
106467diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
106468index c099b08..54bcfe8 100644
106469--- a/kernel/printk/printk.c
106470+++ b/kernel/printk/printk.c
106471@@ -463,7 +463,7 @@ static int log_store(int facility, int level,
106472 return msg->text_len;
106473 }
106474
106475-int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106476+int dmesg_restrict __read_only = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106477
106478 static int syslog_action_restricted(int type)
106479 {
106480@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
106481 if (from_file && type != SYSLOG_ACTION_OPEN)
106482 return 0;
106483
106484+#ifdef CONFIG_GRKERNSEC_DMESG
106485+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
106486+ return -EPERM;
106487+#endif
106488+
106489 if (syslog_action_restricted(type)) {
106490 if (capable(CAP_SYSLOG))
106491 return 0;
106492diff --git a/kernel/profile.c b/kernel/profile.c
106493index a7bcd28..5b368fa 100644
106494--- a/kernel/profile.c
106495+++ b/kernel/profile.c
106496@@ -37,7 +37,7 @@ struct profile_hit {
106497 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
106498 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
106499
106500-static atomic_t *prof_buffer;
106501+static atomic_unchecked_t *prof_buffer;
106502 static unsigned long prof_len, prof_shift;
106503
106504 int prof_on __read_mostly;
106505@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
106506 hits[i].pc = 0;
106507 continue;
106508 }
106509- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106510+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106511 hits[i].hits = hits[i].pc = 0;
106512 }
106513 }
106514@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106515 * Add the current hit(s) and flush the write-queue out
106516 * to the global buffer:
106517 */
106518- atomic_add(nr_hits, &prof_buffer[pc]);
106519+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
106520 for (i = 0; i < NR_PROFILE_HIT; ++i) {
106521- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106522+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106523 hits[i].pc = hits[i].hits = 0;
106524 }
106525 out:
106526@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106527 {
106528 unsigned long pc;
106529 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
106530- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106531+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106532 }
106533 #endif /* !CONFIG_SMP */
106534
106535@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
106536 return -EFAULT;
106537 buf++; p++; count--; read++;
106538 }
106539- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
106540+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
106541 if (copy_to_user(buf, (void *)pnt, count))
106542 return -EFAULT;
106543 read += count;
106544@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
106545 }
106546 #endif
106547 profile_discard_flip_buffers();
106548- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
106549+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
106550 return count;
106551 }
106552
106553diff --git a/kernel/ptrace.c b/kernel/ptrace.c
106554index c8e0e05..2be5614 100644
106555--- a/kernel/ptrace.c
106556+++ b/kernel/ptrace.c
106557@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
106558 if (seize)
106559 flags |= PT_SEIZED;
106560 rcu_read_lock();
106561- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106562+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106563 flags |= PT_PTRACE_CAP;
106564 rcu_read_unlock();
106565 task->ptrace = flags;
106566@@ -514,7 +514,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
106567 break;
106568 return -EIO;
106569 }
106570- if (copy_to_user(dst, buf, retval))
106571+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
106572 return -EFAULT;
106573 copied += retval;
106574 src += retval;
106575@@ -802,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request,
106576 bool seized = child->ptrace & PT_SEIZED;
106577 int ret = -EIO;
106578 siginfo_t siginfo, *si;
106579- void __user *datavp = (void __user *) data;
106580+ void __user *datavp = (__force void __user *) data;
106581 unsigned long __user *datalp = datavp;
106582 unsigned long flags;
106583
106584@@ -1048,14 +1048,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
106585 goto out;
106586 }
106587
106588+ if (gr_handle_ptrace(child, request)) {
106589+ ret = -EPERM;
106590+ goto out_put_task_struct;
106591+ }
106592+
106593 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106594 ret = ptrace_attach(child, request, addr, data);
106595 /*
106596 * Some architectures need to do book-keeping after
106597 * a ptrace attach.
106598 */
106599- if (!ret)
106600+ if (!ret) {
106601 arch_ptrace_attach(child);
106602+ gr_audit_ptrace(child);
106603+ }
106604 goto out_put_task_struct;
106605 }
106606
106607@@ -1083,7 +1090,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
106608 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
106609 if (copied != sizeof(tmp))
106610 return -EIO;
106611- return put_user(tmp, (unsigned long __user *)data);
106612+ return put_user(tmp, (__force unsigned long __user *)data);
106613 }
106614
106615 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
106616@@ -1176,7 +1183,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
106617 }
106618
106619 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106620- compat_long_t, addr, compat_long_t, data)
106621+ compat_ulong_t, addr, compat_ulong_t, data)
106622 {
106623 struct task_struct *child;
106624 long ret;
106625@@ -1192,14 +1199,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106626 goto out;
106627 }
106628
106629+ if (gr_handle_ptrace(child, request)) {
106630+ ret = -EPERM;
106631+ goto out_put_task_struct;
106632+ }
106633+
106634 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106635 ret = ptrace_attach(child, request, addr, data);
106636 /*
106637 * Some architectures need to do book-keeping after
106638 * a ptrace attach.
106639 */
106640- if (!ret)
106641+ if (!ret) {
106642 arch_ptrace_attach(child);
106643+ gr_audit_ptrace(child);
106644+ }
106645 goto out_put_task_struct;
106646 }
106647
106648diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
106649index 8dbe276..8e87dbd 100644
106650--- a/kernel/rcu/rcutorture.c
106651+++ b/kernel/rcu/rcutorture.c
106652@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106653 rcu_torture_count) = { 0 };
106654 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106655 rcu_torture_batch) = { 0 };
106656-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106657-static atomic_t n_rcu_torture_alloc;
106658-static atomic_t n_rcu_torture_alloc_fail;
106659-static atomic_t n_rcu_torture_free;
106660-static atomic_t n_rcu_torture_mberror;
106661-static atomic_t n_rcu_torture_error;
106662+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106663+static atomic_unchecked_t n_rcu_torture_alloc;
106664+static atomic_unchecked_t n_rcu_torture_alloc_fail;
106665+static atomic_unchecked_t n_rcu_torture_free;
106666+static atomic_unchecked_t n_rcu_torture_mberror;
106667+static atomic_unchecked_t n_rcu_torture_error;
106668 static long n_rcu_torture_barrier_error;
106669 static long n_rcu_torture_boost_ktrerror;
106670 static long n_rcu_torture_boost_rterror;
106671@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
106672 static long n_rcu_torture_timers;
106673 static long n_barrier_attempts;
106674 static long n_barrier_successes;
106675-static atomic_long_t n_cbfloods;
106676+static atomic_long_unchecked_t n_cbfloods;
106677 static struct list_head rcu_torture_removed;
106678
106679 static int rcu_torture_writer_state;
106680@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
106681
106682 spin_lock_bh(&rcu_torture_lock);
106683 if (list_empty(&rcu_torture_freelist)) {
106684- atomic_inc(&n_rcu_torture_alloc_fail);
106685+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
106686 spin_unlock_bh(&rcu_torture_lock);
106687 return NULL;
106688 }
106689- atomic_inc(&n_rcu_torture_alloc);
106690+ atomic_inc_unchecked(&n_rcu_torture_alloc);
106691 p = rcu_torture_freelist.next;
106692 list_del_init(p);
106693 spin_unlock_bh(&rcu_torture_lock);
106694@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
106695 static void
106696 rcu_torture_free(struct rcu_torture *p)
106697 {
106698- atomic_inc(&n_rcu_torture_free);
106699+ atomic_inc_unchecked(&n_rcu_torture_free);
106700 spin_lock_bh(&rcu_torture_lock);
106701 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
106702 spin_unlock_bh(&rcu_torture_lock);
106703@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
106704 i = rp->rtort_pipe_count;
106705 if (i > RCU_TORTURE_PIPE_LEN)
106706 i = RCU_TORTURE_PIPE_LEN;
106707- atomic_inc(&rcu_torture_wcount[i]);
106708+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106709 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
106710 rp->rtort_mbtest = 0;
106711 return true;
106712@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
106713 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
106714 do {
106715 schedule_timeout_interruptible(cbflood_inter_holdoff);
106716- atomic_long_inc(&n_cbfloods);
106717+ atomic_long_inc_unchecked(&n_cbfloods);
106718 WARN_ON(signal_pending(current));
106719 for (i = 0; i < cbflood_n_burst; i++) {
106720 for (j = 0; j < cbflood_n_per_burst; j++) {
106721@@ -923,7 +923,7 @@ rcu_torture_writer(void *arg)
106722 i = old_rp->rtort_pipe_count;
106723 if (i > RCU_TORTURE_PIPE_LEN)
106724 i = RCU_TORTURE_PIPE_LEN;
106725- atomic_inc(&rcu_torture_wcount[i]);
106726+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106727 old_rp->rtort_pipe_count++;
106728 switch (synctype[torture_random(&rand) % nsynctypes]) {
106729 case RTWS_DEF_FREE:
106730@@ -1061,7 +1061,7 @@ static void rcu_torture_timer(unsigned long unused)
106731 return;
106732 }
106733 if (p->rtort_mbtest == 0)
106734- atomic_inc(&n_rcu_torture_mberror);
106735+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106736 spin_lock(&rand_lock);
106737 cur_ops->read_delay(&rand);
106738 n_rcu_torture_timers++;
106739@@ -1136,7 +1136,7 @@ rcu_torture_reader(void *arg)
106740 continue;
106741 }
106742 if (p->rtort_mbtest == 0)
106743- atomic_inc(&n_rcu_torture_mberror);
106744+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106745 cur_ops->read_delay(&rand);
106746 preempt_disable();
106747 pipe_count = p->rtort_pipe_count;
106748@@ -1205,11 +1205,11 @@ rcu_torture_stats_print(void)
106749 rcu_torture_current,
106750 rcu_torture_current_version,
106751 list_empty(&rcu_torture_freelist),
106752- atomic_read(&n_rcu_torture_alloc),
106753- atomic_read(&n_rcu_torture_alloc_fail),
106754- atomic_read(&n_rcu_torture_free));
106755+ atomic_read_unchecked(&n_rcu_torture_alloc),
106756+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
106757+ atomic_read_unchecked(&n_rcu_torture_free));
106758 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
106759- atomic_read(&n_rcu_torture_mberror),
106760+ atomic_read_unchecked(&n_rcu_torture_mberror),
106761 n_rcu_torture_boost_ktrerror,
106762 n_rcu_torture_boost_rterror);
106763 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
106764@@ -1221,17 +1221,17 @@ rcu_torture_stats_print(void)
106765 n_barrier_successes,
106766 n_barrier_attempts,
106767 n_rcu_torture_barrier_error);
106768- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
106769+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
106770
106771 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106772- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
106773+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
106774 n_rcu_torture_barrier_error != 0 ||
106775 n_rcu_torture_boost_ktrerror != 0 ||
106776 n_rcu_torture_boost_rterror != 0 ||
106777 n_rcu_torture_boost_failure != 0 ||
106778 i > 1) {
106779 pr_cont("%s", "!!! ");
106780- atomic_inc(&n_rcu_torture_error);
106781+ atomic_inc_unchecked(&n_rcu_torture_error);
106782 WARN_ON_ONCE(1);
106783 }
106784 pr_cont("Reader Pipe: ");
106785@@ -1248,7 +1248,7 @@ rcu_torture_stats_print(void)
106786 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106787 pr_cont("Free-Block Circulation: ");
106788 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106789- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
106790+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
106791 }
106792 pr_cont("\n");
106793
106794@@ -1595,7 +1595,7 @@ rcu_torture_cleanup(void)
106795
106796 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
106797
106798- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106799+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106800 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
106801 else if (torture_onoff_failures())
106802 rcu_torture_print_module_parms(cur_ops,
106803@@ -1720,18 +1720,18 @@ rcu_torture_init(void)
106804
106805 rcu_torture_current = NULL;
106806 rcu_torture_current_version = 0;
106807- atomic_set(&n_rcu_torture_alloc, 0);
106808- atomic_set(&n_rcu_torture_alloc_fail, 0);
106809- atomic_set(&n_rcu_torture_free, 0);
106810- atomic_set(&n_rcu_torture_mberror, 0);
106811- atomic_set(&n_rcu_torture_error, 0);
106812+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
106813+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
106814+ atomic_set_unchecked(&n_rcu_torture_free, 0);
106815+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
106816+ atomic_set_unchecked(&n_rcu_torture_error, 0);
106817 n_rcu_torture_barrier_error = 0;
106818 n_rcu_torture_boost_ktrerror = 0;
106819 n_rcu_torture_boost_rterror = 0;
106820 n_rcu_torture_boost_failure = 0;
106821 n_rcu_torture_boosts = 0;
106822 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
106823- atomic_set(&rcu_torture_wcount[i], 0);
106824+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
106825 for_each_possible_cpu(cpu) {
106826 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106827 per_cpu(rcu_torture_count, cpu)[i] = 0;
106828diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
106829index ec30868..89752ff 100644
106830--- a/kernel/rcu/tiny.c
106831+++ b/kernel/rcu/tiny.c
106832@@ -42,7 +42,7 @@
106833 /* Forward declarations for tiny_plugin.h. */
106834 struct rcu_ctrlblk;
106835 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
106836-static void rcu_process_callbacks(struct softirq_action *unused);
106837+static void rcu_process_callbacks(void);
106838 static void __call_rcu(struct rcu_head *head,
106839 void (*func)(struct rcu_head *rcu),
106840 struct rcu_ctrlblk *rcp);
106841@@ -203,7 +203,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
106842 false));
106843 }
106844
106845-static void rcu_process_callbacks(struct softirq_action *unused)
106846+static __latent_entropy void rcu_process_callbacks(void)
106847 {
106848 __rcu_process_callbacks(&rcu_sched_ctrlblk);
106849 __rcu_process_callbacks(&rcu_bh_ctrlblk);
106850diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
106851index f94e209..d2985bd 100644
106852--- a/kernel/rcu/tiny_plugin.h
106853+++ b/kernel/rcu/tiny_plugin.h
106854@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
106855 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
106856 jiffies - rcp->gp_start, rcp->qlen);
106857 dump_stack();
106858- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
106859+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
106860 3 * rcu_jiffies_till_stall_check() + 3;
106861 } else if (ULONG_CMP_GE(j, js)) {
106862- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106863+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106864 }
106865 }
106866
106867@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
106868 {
106869 rcp->ticks_this_gp = 0;
106870 rcp->gp_start = jiffies;
106871- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106872+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106873 }
106874
106875 static void check_cpu_stalls(void)
106876diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
106877index 8cf7304..953f8ad 100644
106878--- a/kernel/rcu/tree.c
106879+++ b/kernel/rcu/tree.c
106880@@ -290,7 +290,7 @@ static void rcu_momentary_dyntick_idle(void)
106881 */
106882 rdtp = this_cpu_ptr(&rcu_dynticks);
106883 smp_mb__before_atomic(); /* Earlier stuff before QS. */
106884- atomic_add(2, &rdtp->dynticks); /* QS. */
106885+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
106886 smp_mb__after_atomic(); /* Later stuff after QS. */
106887 break;
106888 }
106889@@ -602,9 +602,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
106890 rcu_prepare_for_idle();
106891 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106892 smp_mb__before_atomic(); /* See above. */
106893- atomic_inc(&rdtp->dynticks);
106894+ atomic_inc_unchecked(&rdtp->dynticks);
106895 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
106896- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106897+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106898 rcu_dynticks_task_enter();
106899
106900 /*
106901@@ -725,10 +725,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
106902
106903 rcu_dynticks_task_exit();
106904 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
106905- atomic_inc(&rdtp->dynticks);
106906+ atomic_inc_unchecked(&rdtp->dynticks);
106907 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
106908 smp_mb__after_atomic(); /* See above. */
106909- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106910+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106911 rcu_cleanup_after_idle();
106912 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
106913 if (!user && !is_idle_task(current)) {
106914@@ -862,12 +862,12 @@ void rcu_nmi_enter(void)
106915 * to be in the outermost NMI handler that interrupted an RCU-idle
106916 * period (observation due to Andy Lutomirski).
106917 */
106918- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
106919+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
106920 smp_mb__before_atomic(); /* Force delay from prior write. */
106921- atomic_inc(&rdtp->dynticks);
106922+ atomic_inc_unchecked(&rdtp->dynticks);
106923 /* atomic_inc() before later RCU read-side crit sects */
106924 smp_mb__after_atomic(); /* See above. */
106925- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106926+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106927 incby = 1;
106928 }
106929 rdtp->dynticks_nmi_nesting += incby;
106930@@ -892,7 +892,7 @@ void rcu_nmi_exit(void)
106931 * to us!)
106932 */
106933 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
106934- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106935+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106936
106937 /*
106938 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
106939@@ -907,9 +907,9 @@ void rcu_nmi_exit(void)
106940 rdtp->dynticks_nmi_nesting = 0;
106941 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106942 smp_mb__before_atomic(); /* See above. */
106943- atomic_inc(&rdtp->dynticks);
106944+ atomic_inc_unchecked(&rdtp->dynticks);
106945 smp_mb__after_atomic(); /* Force delay to next write. */
106946- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106947+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106948 }
106949
106950 /**
106951@@ -922,7 +922,7 @@ void rcu_nmi_exit(void)
106952 */
106953 bool notrace __rcu_is_watching(void)
106954 {
106955- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106956+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106957 }
106958
106959 /**
106960@@ -1005,7 +1005,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
106961 static int dyntick_save_progress_counter(struct rcu_data *rdp,
106962 bool *isidle, unsigned long *maxj)
106963 {
106964- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
106965+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106966 rcu_sysidle_check_cpu(rdp, isidle, maxj);
106967 if ((rdp->dynticks_snap & 0x1) == 0) {
106968 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
106969@@ -1013,7 +1013,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
106970 } else {
106971 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
106972 rdp->mynode->gpnum))
106973- ACCESS_ONCE(rdp->gpwrap) = true;
106974+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
106975 return 0;
106976 }
106977 }
106978@@ -1031,7 +1031,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106979 int *rcrmp;
106980 unsigned int snap;
106981
106982- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
106983+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106984 snap = (unsigned int)rdp->dynticks_snap;
106985
106986 /*
106987@@ -1094,10 +1094,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106988 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
106989 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
106990 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
106991- ACCESS_ONCE(rdp->cond_resched_completed) =
106992+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
106993 ACCESS_ONCE(rdp->mynode->completed);
106994 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
106995- ACCESS_ONCE(*rcrmp) =
106996+ ACCESS_ONCE_RW(*rcrmp) =
106997 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
106998 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
106999 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
107000@@ -1119,7 +1119,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
107001 rsp->gp_start = j;
107002 smp_wmb(); /* Record start time before stall time. */
107003 j1 = rcu_jiffies_till_stall_check();
107004- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
107005+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
107006 rsp->jiffies_resched = j + j1 / 2;
107007 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
107008 }
107009@@ -1178,7 +1178,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
107010 raw_spin_unlock_irqrestore(&rnp->lock, flags);
107011 return;
107012 }
107013- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
107014+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
107015 raw_spin_unlock_irqrestore(&rnp->lock, flags);
107016
107017 /*
107018@@ -1263,7 +1263,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
107019
107020 raw_spin_lock_irqsave(&rnp->lock, flags);
107021 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
107022- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
107023+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
107024 3 * rcu_jiffies_till_stall_check() + 3;
107025 raw_spin_unlock_irqrestore(&rnp->lock, flags);
107026
107027@@ -1347,7 +1347,7 @@ void rcu_cpu_stall_reset(void)
107028 struct rcu_state *rsp;
107029
107030 for_each_rcu_flavor(rsp)
107031- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
107032+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
107033 }
107034
107035 /*
107036@@ -1704,7 +1704,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
107037 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
107038 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
107039 zero_cpu_stall_ticks(rdp);
107040- ACCESS_ONCE(rdp->gpwrap) = false;
107041+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
107042 }
107043 return ret;
107044 }
107045@@ -1740,7 +1740,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
107046 struct rcu_data *rdp;
107047 struct rcu_node *rnp = rcu_get_root(rsp);
107048
107049- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107050+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107051 raw_spin_lock_irq(&rnp->lock);
107052 smp_mb__after_unlock_lock();
107053 if (!ACCESS_ONCE(rsp->gp_flags)) {
107054@@ -1748,7 +1748,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
107055 raw_spin_unlock_irq(&rnp->lock);
107056 return 0;
107057 }
107058- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
107059+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
107060
107061 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
107062 /*
107063@@ -1834,9 +1834,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
107064 rdp = this_cpu_ptr(rsp->rda);
107065 rcu_preempt_check_blocked_tasks(rnp);
107066 rnp->qsmask = rnp->qsmaskinit;
107067- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
107068+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
107069 if (WARN_ON_ONCE(rnp->completed != rsp->completed))
107070- ACCESS_ONCE(rnp->completed) = rsp->completed;
107071+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
107072 if (rnp == rdp->mynode)
107073 (void)__note_gp_changes(rsp, rnp, rdp);
107074 rcu_preempt_boost_start_gp(rnp);
107075@@ -1845,7 +1845,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
107076 rnp->grphi, rnp->qsmask);
107077 raw_spin_unlock_irq(&rnp->lock);
107078 cond_resched_rcu_qs();
107079- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107080+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107081 if (gp_init_delay > 0 &&
107082 !(rsp->gpnum % (rcu_num_nodes * PER_RCU_NODE_PERIOD)))
107083 schedule_timeout_uninterruptible(gp_init_delay);
107084@@ -1864,7 +1864,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
107085 unsigned long maxj;
107086 struct rcu_node *rnp = rcu_get_root(rsp);
107087
107088- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107089+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107090 rsp->n_force_qs++;
107091 if (fqs_state == RCU_SAVE_DYNTICK) {
107092 /* Collect dyntick-idle snapshots. */
107093@@ -1885,7 +1885,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
107094 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
107095 raw_spin_lock_irq(&rnp->lock);
107096 smp_mb__after_unlock_lock();
107097- ACCESS_ONCE(rsp->gp_flags) =
107098+ ACCESS_ONCE_RW(rsp->gp_flags) =
107099 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
107100 raw_spin_unlock_irq(&rnp->lock);
107101 }
107102@@ -1903,7 +1903,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107103 struct rcu_data *rdp;
107104 struct rcu_node *rnp = rcu_get_root(rsp);
107105
107106- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107107+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107108 raw_spin_lock_irq(&rnp->lock);
107109 smp_mb__after_unlock_lock();
107110 gp_duration = jiffies - rsp->gp_start;
107111@@ -1934,7 +1934,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107112 smp_mb__after_unlock_lock();
107113 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
107114 WARN_ON_ONCE(rnp->qsmask);
107115- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
107116+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
107117 rdp = this_cpu_ptr(rsp->rda);
107118 if (rnp == rdp->mynode)
107119 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
107120@@ -1942,7 +1942,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107121 nocb += rcu_future_gp_cleanup(rsp, rnp);
107122 raw_spin_unlock_irq(&rnp->lock);
107123 cond_resched_rcu_qs();
107124- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107125+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107126 }
107127 rnp = rcu_get_root(rsp);
107128 raw_spin_lock_irq(&rnp->lock);
107129@@ -1950,14 +1950,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107130 rcu_nocb_gp_set(rnp, nocb);
107131
107132 /* Declare grace period done. */
107133- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
107134+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
107135 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
107136 rsp->fqs_state = RCU_GP_IDLE;
107137 rdp = this_cpu_ptr(rsp->rda);
107138 /* Advance CBs to reduce false positives below. */
107139 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
107140 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
107141- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107142+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107143 trace_rcu_grace_period(rsp->name,
107144 ACCESS_ONCE(rsp->gpnum),
107145 TPS("newreq"));
107146@@ -1993,7 +1993,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
107147 if (rcu_gp_init(rsp))
107148 break;
107149 cond_resched_rcu_qs();
107150- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107151+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107152 WARN_ON(signal_pending(current));
107153 trace_rcu_grace_period(rsp->name,
107154 ACCESS_ONCE(rsp->gpnum),
107155@@ -2037,11 +2037,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
107156 ACCESS_ONCE(rsp->gpnum),
107157 TPS("fqsend"));
107158 cond_resched_rcu_qs();
107159- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107160+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107161 } else {
107162 /* Deal with stray signal. */
107163 cond_resched_rcu_qs();
107164- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107165+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107166 WARN_ON(signal_pending(current));
107167 trace_rcu_grace_period(rsp->name,
107168 ACCESS_ONCE(rsp->gpnum),
107169@@ -2086,7 +2086,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
107170 */
107171 return false;
107172 }
107173- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107174+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107175 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
107176 TPS("newreq"));
107177
107178@@ -2359,7 +2359,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
107179 rsp->qlen += rdp->qlen;
107180 rdp->n_cbs_orphaned += rdp->qlen;
107181 rdp->qlen_lazy = 0;
107182- ACCESS_ONCE(rdp->qlen) = 0;
107183+ ACCESS_ONCE_RW(rdp->qlen) = 0;
107184 }
107185
107186 /*
107187@@ -2636,7 +2636,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
107188 }
107189 smp_mb(); /* List handling before counting for rcu_barrier(). */
107190 rdp->qlen_lazy -= count_lazy;
107191- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
107192+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
107193 rdp->n_cbs_invoked += count;
107194
107195 /* Reinstate batch limit if we have worked down the excess. */
107196@@ -2814,7 +2814,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
107197 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107198 return; /* Someone beat us to it. */
107199 }
107200- ACCESS_ONCE(rsp->gp_flags) =
107201+ ACCESS_ONCE_RW(rsp->gp_flags) =
107202 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
107203 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107204 rcu_gp_kthread_wake(rsp);
107205@@ -2860,7 +2860,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
107206 /*
107207 * Do RCU core processing for the current CPU.
107208 */
107209-static void rcu_process_callbacks(struct softirq_action *unused)
107210+static void rcu_process_callbacks(void)
107211 {
107212 struct rcu_state *rsp;
107213
107214@@ -2972,7 +2972,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107215 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
107216 if (debug_rcu_head_queue(head)) {
107217 /* Probable double call_rcu(), so leak the callback. */
107218- ACCESS_ONCE(head->func) = rcu_leak_callback;
107219+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
107220 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
107221 return;
107222 }
107223@@ -3011,7 +3011,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107224 if (!likely(rdp->nxtlist))
107225 init_default_callback_list(rdp);
107226 }
107227- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
107228+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
107229 if (lazy)
107230 rdp->qlen_lazy++;
107231 else
107232@@ -3284,11 +3284,11 @@ void synchronize_sched_expedited(void)
107233 * counter wrap on a 32-bit system. Quite a few more CPUs would of
107234 * course be required on a 64-bit system.
107235 */
107236- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
107237+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
107238 (ulong)atomic_long_read(&rsp->expedited_done) +
107239 ULONG_MAX / 8)) {
107240 synchronize_sched();
107241- atomic_long_inc(&rsp->expedited_wrap);
107242+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
107243 return;
107244 }
107245
107246@@ -3296,12 +3296,12 @@ void synchronize_sched_expedited(void)
107247 * Take a ticket. Note that atomic_inc_return() implies a
107248 * full memory barrier.
107249 */
107250- snap = atomic_long_inc_return(&rsp->expedited_start);
107251+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
107252 firstsnap = snap;
107253 if (!try_get_online_cpus()) {
107254 /* CPU hotplug operation in flight, fall back to normal GP. */
107255 wait_rcu_gp(call_rcu_sched);
107256- atomic_long_inc(&rsp->expedited_normal);
107257+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107258 return;
107259 }
107260 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
107261@@ -3314,7 +3314,7 @@ void synchronize_sched_expedited(void)
107262 for_each_cpu(cpu, cm) {
107263 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
107264
107265- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
107266+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
107267 cpumask_clear_cpu(cpu, cm);
107268 }
107269 if (cpumask_weight(cm) == 0)
107270@@ -3329,14 +3329,14 @@ void synchronize_sched_expedited(void)
107271 synchronize_sched_expedited_cpu_stop,
107272 NULL) == -EAGAIN) {
107273 put_online_cpus();
107274- atomic_long_inc(&rsp->expedited_tryfail);
107275+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
107276
107277 /* Check to see if someone else did our work for us. */
107278 s = atomic_long_read(&rsp->expedited_done);
107279 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107280 /* ensure test happens before caller kfree */
107281 smp_mb__before_atomic(); /* ^^^ */
107282- atomic_long_inc(&rsp->expedited_workdone1);
107283+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
107284 free_cpumask_var(cm);
107285 return;
107286 }
107287@@ -3346,7 +3346,7 @@ void synchronize_sched_expedited(void)
107288 udelay(trycount * num_online_cpus());
107289 } else {
107290 wait_rcu_gp(call_rcu_sched);
107291- atomic_long_inc(&rsp->expedited_normal);
107292+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107293 free_cpumask_var(cm);
107294 return;
107295 }
107296@@ -3356,7 +3356,7 @@ void synchronize_sched_expedited(void)
107297 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107298 /* ensure test happens before caller kfree */
107299 smp_mb__before_atomic(); /* ^^^ */
107300- atomic_long_inc(&rsp->expedited_workdone2);
107301+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
107302 free_cpumask_var(cm);
107303 return;
107304 }
107305@@ -3371,14 +3371,14 @@ void synchronize_sched_expedited(void)
107306 if (!try_get_online_cpus()) {
107307 /* CPU hotplug operation in flight, use normal GP. */
107308 wait_rcu_gp(call_rcu_sched);
107309- atomic_long_inc(&rsp->expedited_normal);
107310+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107311 free_cpumask_var(cm);
107312 return;
107313 }
107314- snap = atomic_long_read(&rsp->expedited_start);
107315+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
107316 smp_mb(); /* ensure read is before try_stop_cpus(). */
107317 }
107318- atomic_long_inc(&rsp->expedited_stoppedcpus);
107319+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
107320
107321 all_cpus_idle:
107322 free_cpumask_var(cm);
107323@@ -3390,16 +3390,16 @@ all_cpus_idle:
107324 * than we did already did their update.
107325 */
107326 do {
107327- atomic_long_inc(&rsp->expedited_done_tries);
107328+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
107329 s = atomic_long_read(&rsp->expedited_done);
107330 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
107331 /* ensure test happens before caller kfree */
107332 smp_mb__before_atomic(); /* ^^^ */
107333- atomic_long_inc(&rsp->expedited_done_lost);
107334+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
107335 break;
107336 }
107337 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
107338- atomic_long_inc(&rsp->expedited_done_exit);
107339+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
107340
107341 put_online_cpus();
107342 }
107343@@ -3609,7 +3609,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107344 * ACCESS_ONCE() to prevent the compiler from speculating
107345 * the increment to precede the early-exit check.
107346 */
107347- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107348+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107349 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
107350 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
107351 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
107352@@ -3665,7 +3665,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107353
107354 /* Increment ->n_barrier_done to prevent duplicate work. */
107355 smp_mb(); /* Keep increment after above mechanism. */
107356- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107357+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107358 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
107359 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
107360 smp_mb(); /* Keep increment before caller's subsequent code. */
107361@@ -3732,7 +3732,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
107362 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
107363 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
107364 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
107365- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
107366+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
107367 rdp->cpu = cpu;
107368 rdp->rsp = rsp;
107369 rcu_boot_init_nocb_percpu_data(rdp);
107370@@ -3763,8 +3763,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
107371 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
107372 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
107373 rcu_sysidle_init_percpu_data(rdp->dynticks);
107374- atomic_set(&rdp->dynticks->dynticks,
107375- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
107376+ atomic_set_unchecked(&rdp->dynticks->dynticks,
107377+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
107378 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
107379
107380 /*
107381diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
107382index a69d3da..51993c4 100644
107383--- a/kernel/rcu/tree.h
107384+++ b/kernel/rcu/tree.h
107385@@ -86,11 +86,11 @@ struct rcu_dynticks {
107386 long long dynticks_nesting; /* Track irq/process nesting level. */
107387 /* Process level is worth LLONG_MAX/2. */
107388 int dynticks_nmi_nesting; /* Track NMI nesting level. */
107389- atomic_t dynticks; /* Even value for idle, else odd. */
107390+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
107391 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
107392 long long dynticks_idle_nesting;
107393 /* irq/process nesting level from idle. */
107394- atomic_t dynticks_idle; /* Even value for idle, else odd. */
107395+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
107396 /* "Idle" excludes userspace execution. */
107397 unsigned long dynticks_idle_jiffies;
107398 /* End of last non-NMI non-idle period. */
107399@@ -463,17 +463,17 @@ struct rcu_state {
107400 /* _rcu_barrier(). */
107401 /* End of fields guarded by barrier_mutex. */
107402
107403- atomic_long_t expedited_start; /* Starting ticket. */
107404- atomic_long_t expedited_done; /* Done ticket. */
107405- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
107406- atomic_long_t expedited_tryfail; /* # acquisition failures. */
107407- atomic_long_t expedited_workdone1; /* # done by others #1. */
107408- atomic_long_t expedited_workdone2; /* # done by others #2. */
107409- atomic_long_t expedited_normal; /* # fallbacks to normal. */
107410- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
107411- atomic_long_t expedited_done_tries; /* # tries to update _done. */
107412- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
107413- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
107414+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
107415+ atomic_long_t expedited_done; /* Done ticket. */
107416+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
107417+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
107418+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
107419+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
107420+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
107421+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
107422+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
107423+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
107424+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
107425
107426 unsigned long jiffies_force_qs; /* Time at which to invoke */
107427 /* force_quiescent_state(). */
107428diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
107429index 8c0ec0f..99d52c5 100644
107430--- a/kernel/rcu/tree_plugin.h
107431+++ b/kernel/rcu/tree_plugin.h
107432@@ -570,7 +570,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
107433 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
107434 {
107435 return !rcu_preempted_readers_exp(rnp) &&
107436- ACCESS_ONCE(rnp->expmask) == 0;
107437+ ACCESS_ONCE_RW(rnp->expmask) == 0;
107438 }
107439
107440 /*
107441@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
107442
107443 /* Clean up and exit. */
107444 smp_mb(); /* ensure expedited GP seen before counter increment. */
107445- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
107446+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
107447 sync_rcu_preempt_exp_count + 1;
107448 unlock_mb_ret:
107449 mutex_unlock(&sync_rcu_preempt_exp_mutex);
107450@@ -1286,7 +1286,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
107451 free_cpumask_var(cm);
107452 }
107453
107454-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
107455+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
107456 .store = &rcu_cpu_kthread_task,
107457 .thread_should_run = rcu_cpu_kthread_should_run,
107458 .thread_fn = rcu_cpu_kthread,
107459@@ -1757,7 +1757,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
107460 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
107461 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
107462 cpu, ticks_value, ticks_title,
107463- atomic_read(&rdtp->dynticks) & 0xfff,
107464+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
107465 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
107466 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
107467 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
107468@@ -1902,7 +1902,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
107469 return;
107470 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
107471 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
107472- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
107473+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
107474 wake_up(&rdp_leader->nocb_wq);
107475 }
107476 }
107477@@ -1975,7 +1975,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
107478 atomic_long_add(rhcount, &rdp->nocb_q_count);
107479 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
107480 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
107481- ACCESS_ONCE(*old_rhpp) = rhp;
107482+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
107483 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
107484 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
107485
107486@@ -2164,7 +2164,7 @@ wait_again:
107487 continue; /* No CBs here, try next follower. */
107488
107489 /* Move callbacks to wait-for-GP list, which is empty. */
107490- ACCESS_ONCE(rdp->nocb_head) = NULL;
107491+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
107492 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
107493 gotcbs = true;
107494 }
107495@@ -2285,7 +2285,7 @@ static int rcu_nocb_kthread(void *arg)
107496 list = ACCESS_ONCE(rdp->nocb_follower_head);
107497 BUG_ON(!list);
107498 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
107499- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
107500+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
107501 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
107502
107503 /* Each pass through the following loop invokes a callback. */
107504@@ -2335,7 +2335,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
107505 if (!rcu_nocb_need_deferred_wakeup(rdp))
107506 return;
107507 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
107508- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107509+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107510 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
107511 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
107512 }
107513@@ -2448,7 +2448,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
107514 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
107515 "rcuo%c/%d", rsp->abbr, cpu);
107516 BUG_ON(IS_ERR(t));
107517- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
107518+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
107519 }
107520
107521 /*
107522@@ -2663,11 +2663,11 @@ static void rcu_sysidle_enter(int irq)
107523
107524 /* Record start of fully idle period. */
107525 j = jiffies;
107526- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
107527+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
107528 smp_mb__before_atomic();
107529- atomic_inc(&rdtp->dynticks_idle);
107530+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107531 smp_mb__after_atomic();
107532- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
107533+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
107534 }
107535
107536 /*
107537@@ -2738,9 +2738,9 @@ static void rcu_sysidle_exit(int irq)
107538
107539 /* Record end of idle period. */
107540 smp_mb__before_atomic();
107541- atomic_inc(&rdtp->dynticks_idle);
107542+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107543 smp_mb__after_atomic();
107544- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
107545+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
107546
107547 /*
107548 * If we are the timekeeping CPU, we are permitted to be non-idle
107549@@ -2786,7 +2786,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
107550 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
107551
107552 /* Pick up current idle and NMI-nesting counter and check. */
107553- cur = atomic_read(&rdtp->dynticks_idle);
107554+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
107555 if (cur & 0x1) {
107556 *isidle = false; /* We are not idle! */
107557 return;
107558@@ -2835,7 +2835,7 @@ static void rcu_sysidle(unsigned long j)
107559 case RCU_SYSIDLE_NOT:
107560
107561 /* First time all are idle, so note a short idle period. */
107562- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107563+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107564 break;
107565
107566 case RCU_SYSIDLE_SHORT:
107567@@ -2873,7 +2873,7 @@ static void rcu_sysidle_cancel(void)
107568 {
107569 smp_mb();
107570 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
107571- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
107572+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
107573 }
107574
107575 /*
107576@@ -2925,7 +2925,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
107577 smp_mb(); /* grace period precedes setting inuse. */
107578
107579 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
107580- ACCESS_ONCE(rshp->inuse) = 0;
107581+ ACCESS_ONCE_RW(rshp->inuse) = 0;
107582 }
107583
107584 /*
107585@@ -3077,7 +3077,7 @@ static void rcu_bind_gp_kthread(void)
107586 static void rcu_dynticks_task_enter(void)
107587 {
107588 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107589- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
107590+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
107591 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107592 }
107593
107594@@ -3085,6 +3085,6 @@ static void rcu_dynticks_task_enter(void)
107595 static void rcu_dynticks_task_exit(void)
107596 {
107597 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107598- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
107599+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
107600 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107601 }
107602diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
107603index f92361e..0052f88 100644
107604--- a/kernel/rcu/tree_trace.c
107605+++ b/kernel/rcu/tree_trace.c
107606@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
107607 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
107608 rdp->qs_pending);
107609 seq_printf(m, " dt=%d/%llx/%d df=%lu",
107610- atomic_read(&rdp->dynticks->dynticks),
107611+ atomic_read_unchecked(&rdp->dynticks->dynticks),
107612 rdp->dynticks->dynticks_nesting,
107613 rdp->dynticks->dynticks_nmi_nesting,
107614 rdp->dynticks_fqs);
107615@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
107616 struct rcu_state *rsp = (struct rcu_state *)m->private;
107617
107618 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",
107619- atomic_long_read(&rsp->expedited_start),
107620+ atomic_long_read_unchecked(&rsp->expedited_start),
107621 atomic_long_read(&rsp->expedited_done),
107622- atomic_long_read(&rsp->expedited_wrap),
107623- atomic_long_read(&rsp->expedited_tryfail),
107624- atomic_long_read(&rsp->expedited_workdone1),
107625- atomic_long_read(&rsp->expedited_workdone2),
107626- atomic_long_read(&rsp->expedited_normal),
107627- atomic_long_read(&rsp->expedited_stoppedcpus),
107628- atomic_long_read(&rsp->expedited_done_tries),
107629- atomic_long_read(&rsp->expedited_done_lost),
107630- atomic_long_read(&rsp->expedited_done_exit));
107631+ atomic_long_read_unchecked(&rsp->expedited_wrap),
107632+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
107633+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
107634+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
107635+ atomic_long_read_unchecked(&rsp->expedited_normal),
107636+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
107637+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
107638+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
107639+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
107640 return 0;
107641 }
107642
107643diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
107644index 1f13335..77ebb7f 100644
107645--- a/kernel/rcu/update.c
107646+++ b/kernel/rcu/update.c
107647@@ -396,10 +396,10 @@ int rcu_jiffies_till_stall_check(void)
107648 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
107649 */
107650 if (till_stall_check < 3) {
107651- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
107652+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
107653 till_stall_check = 3;
107654 } else if (till_stall_check > 300) {
107655- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
107656+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
107657 till_stall_check = 300;
107658 }
107659 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
107660@@ -555,7 +555,7 @@ static void check_holdout_task(struct task_struct *t,
107661 !ACCESS_ONCE(t->on_rq) ||
107662 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
107663 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
107664- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
107665+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
107666 list_del_init(&t->rcu_tasks_holdout_list);
107667 put_task_struct(t);
107668 return;
107669@@ -643,7 +643,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
107670 !is_idle_task(t)) {
107671 get_task_struct(t);
107672 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
107673- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
107674+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
107675 list_add(&t->rcu_tasks_holdout_list,
107676 &rcu_tasks_holdouts);
107677 }
107678@@ -740,7 +740,7 @@ static void rcu_spawn_tasks_kthread(void)
107679 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
107680 BUG_ON(IS_ERR(t));
107681 smp_mb(); /* Ensure others see full kthread. */
107682- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
107683+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
107684 mutex_unlock(&rcu_tasks_kthread_mutex);
107685 }
107686
107687diff --git a/kernel/resource.c b/kernel/resource.c
107688index 90552aa..8c02098 100644
107689--- a/kernel/resource.c
107690+++ b/kernel/resource.c
107691@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
107692
107693 static int __init ioresources_init(void)
107694 {
107695+#ifdef CONFIG_GRKERNSEC_PROC_ADD
107696+#ifdef CONFIG_GRKERNSEC_PROC_USER
107697+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
107698+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
107699+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
107700+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
107701+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
107702+#endif
107703+#else
107704 proc_create("ioports", 0, NULL, &proc_ioports_operations);
107705 proc_create("iomem", 0, NULL, &proc_iomem_operations);
107706+#endif
107707 return 0;
107708 }
107709 __initcall(ioresources_init);
107710diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
107711index eae160d..c9aa22e 100644
107712--- a/kernel/sched/auto_group.c
107713+++ b/kernel/sched/auto_group.c
107714@@ -11,7 +11,7 @@
107715
107716 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
107717 static struct autogroup autogroup_default;
107718-static atomic_t autogroup_seq_nr;
107719+static atomic_unchecked_t autogroup_seq_nr;
107720
107721 void __init autogroup_init(struct task_struct *init_task)
107722 {
107723@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
107724
107725 kref_init(&ag->kref);
107726 init_rwsem(&ag->lock);
107727- ag->id = atomic_inc_return(&autogroup_seq_nr);
107728+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
107729 ag->tg = tg;
107730 #ifdef CONFIG_RT_GROUP_SCHED
107731 /*
107732diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
107733index 8d0f35d..c16360d 100644
107734--- a/kernel/sched/completion.c
107735+++ b/kernel/sched/completion.c
107736@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
107737 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107738 * or number of jiffies left till timeout) if completed.
107739 */
107740-long __sched
107741+long __sched __intentional_overflow(-1)
107742 wait_for_completion_interruptible_timeout(struct completion *x,
107743 unsigned long timeout)
107744 {
107745@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
107746 *
107747 * Return: -ERESTARTSYS if interrupted, 0 if completed.
107748 */
107749-int __sched wait_for_completion_killable(struct completion *x)
107750+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
107751 {
107752 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
107753 if (t == -ERESTARTSYS)
107754@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
107755 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107756 * or number of jiffies left till timeout) if completed.
107757 */
107758-long __sched
107759+long __sched __intentional_overflow(-1)
107760 wait_for_completion_killable_timeout(struct completion *x,
107761 unsigned long timeout)
107762 {
107763diff --git a/kernel/sched/core.c b/kernel/sched/core.c
107764index 1236732..df281d6 100644
107765--- a/kernel/sched/core.c
107766+++ b/kernel/sched/core.c
107767@@ -1867,7 +1867,7 @@ void set_numabalancing_state(bool enabled)
107768 int sysctl_numa_balancing(struct ctl_table *table, int write,
107769 void __user *buffer, size_t *lenp, loff_t *ppos)
107770 {
107771- struct ctl_table t;
107772+ ctl_table_no_const t;
107773 int err;
107774 int state = numabalancing_enabled;
107775
107776@@ -2317,8 +2317,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
107777 next->active_mm = oldmm;
107778 atomic_inc(&oldmm->mm_count);
107779 enter_lazy_tlb(oldmm, next);
107780- } else
107781+ } else {
107782 switch_mm(oldmm, mm, next);
107783+ populate_stack();
107784+ }
107785
107786 if (!prev->mm) {
107787 prev->active_mm = NULL;
107788@@ -3129,6 +3131,8 @@ int can_nice(const struct task_struct *p, const int nice)
107789 /* convert nice value [19,-20] to rlimit style value [1,40] */
107790 int nice_rlim = nice_to_rlimit(nice);
107791
107792+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
107793+
107794 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
107795 capable(CAP_SYS_NICE));
107796 }
107797@@ -3155,7 +3159,8 @@ SYSCALL_DEFINE1(nice, int, increment)
107798 nice = task_nice(current) + increment;
107799
107800 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
107801- if (increment < 0 && !can_nice(current, nice))
107802+ if (increment < 0 && (!can_nice(current, nice) ||
107803+ gr_handle_chroot_nice()))
107804 return -EPERM;
107805
107806 retval = security_task_setnice(current, nice);
107807@@ -3467,6 +3472,7 @@ recheck:
107808 if (policy != p->policy && !rlim_rtprio)
107809 return -EPERM;
107810
107811+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
107812 /* can't increase priority */
107813 if (attr->sched_priority > p->rt_priority &&
107814 attr->sched_priority > rlim_rtprio)
107815@@ -4950,6 +4956,7 @@ void idle_task_exit(void)
107816
107817 if (mm != &init_mm) {
107818 switch_mm(mm, &init_mm, current);
107819+ populate_stack();
107820 finish_arch_post_lock_switch();
107821 }
107822 mmdrop(mm);
107823@@ -5045,7 +5052,7 @@ static void migrate_tasks(unsigned int dead_cpu)
107824
107825 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
107826
107827-static struct ctl_table sd_ctl_dir[] = {
107828+static ctl_table_no_const sd_ctl_dir[] __read_only = {
107829 {
107830 .procname = "sched_domain",
107831 .mode = 0555,
107832@@ -5062,17 +5069,17 @@ static struct ctl_table sd_ctl_root[] = {
107833 {}
107834 };
107835
107836-static struct ctl_table *sd_alloc_ctl_entry(int n)
107837+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
107838 {
107839- struct ctl_table *entry =
107840+ ctl_table_no_const *entry =
107841 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
107842
107843 return entry;
107844 }
107845
107846-static void sd_free_ctl_entry(struct ctl_table **tablep)
107847+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
107848 {
107849- struct ctl_table *entry;
107850+ ctl_table_no_const *entry;
107851
107852 /*
107853 * In the intermediate directories, both the child directory and
107854@@ -5080,22 +5087,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
107855 * will always be set. In the lowest directory the names are
107856 * static strings and all have proc handlers.
107857 */
107858- for (entry = *tablep; entry->mode; entry++) {
107859- if (entry->child)
107860- sd_free_ctl_entry(&entry->child);
107861+ for (entry = tablep; entry->mode; entry++) {
107862+ if (entry->child) {
107863+ sd_free_ctl_entry(entry->child);
107864+ pax_open_kernel();
107865+ entry->child = NULL;
107866+ pax_close_kernel();
107867+ }
107868 if (entry->proc_handler == NULL)
107869 kfree(entry->procname);
107870 }
107871
107872- kfree(*tablep);
107873- *tablep = NULL;
107874+ kfree(tablep);
107875 }
107876
107877 static int min_load_idx = 0;
107878 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
107879
107880 static void
107881-set_table_entry(struct ctl_table *entry,
107882+set_table_entry(ctl_table_no_const *entry,
107883 const char *procname, void *data, int maxlen,
107884 umode_t mode, proc_handler *proc_handler,
107885 bool load_idx)
107886@@ -5115,7 +5125,7 @@ set_table_entry(struct ctl_table *entry,
107887 static struct ctl_table *
107888 sd_alloc_ctl_domain_table(struct sched_domain *sd)
107889 {
107890- struct ctl_table *table = sd_alloc_ctl_entry(14);
107891+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
107892
107893 if (table == NULL)
107894 return NULL;
107895@@ -5153,9 +5163,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
107896 return table;
107897 }
107898
107899-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
107900+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
107901 {
107902- struct ctl_table *entry, *table;
107903+ ctl_table_no_const *entry, *table;
107904 struct sched_domain *sd;
107905 int domain_num = 0, i;
107906 char buf[32];
107907@@ -5182,11 +5192,13 @@ static struct ctl_table_header *sd_sysctl_header;
107908 static void register_sched_domain_sysctl(void)
107909 {
107910 int i, cpu_num = num_possible_cpus();
107911- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
107912+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
107913 char buf[32];
107914
107915 WARN_ON(sd_ctl_dir[0].child);
107916+ pax_open_kernel();
107917 sd_ctl_dir[0].child = entry;
107918+ pax_close_kernel();
107919
107920 if (entry == NULL)
107921 return;
107922@@ -5209,8 +5221,12 @@ static void unregister_sched_domain_sysctl(void)
107923 if (sd_sysctl_header)
107924 unregister_sysctl_table(sd_sysctl_header);
107925 sd_sysctl_header = NULL;
107926- if (sd_ctl_dir[0].child)
107927- sd_free_ctl_entry(&sd_ctl_dir[0].child);
107928+ if (sd_ctl_dir[0].child) {
107929+ sd_free_ctl_entry(sd_ctl_dir[0].child);
107930+ pax_open_kernel();
107931+ sd_ctl_dir[0].child = NULL;
107932+ pax_close_kernel();
107933+ }
107934 }
107935 #else
107936 static void register_sched_domain_sysctl(void)
107937diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
107938index c2980e8..4737a6d 100644
107939--- a/kernel/sched/fair.c
107940+++ b/kernel/sched/fair.c
107941@@ -2107,7 +2107,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
107942
107943 static void reset_ptenuma_scan(struct task_struct *p)
107944 {
107945- ACCESS_ONCE(p->mm->numa_scan_seq)++;
107946+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
107947 p->mm->numa_scan_offset = 0;
107948 }
107949
107950@@ -7753,7 +7753,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
107951 * run_rebalance_domains is triggered when needed from the scheduler tick.
107952 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
107953 */
107954-static void run_rebalance_domains(struct softirq_action *h)
107955+static __latent_entropy void run_rebalance_domains(void)
107956 {
107957 struct rq *this_rq = this_rq();
107958 enum cpu_idle_type idle = this_rq->idle_balance ?
107959diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
107960index e0e1299..e1e896b 100644
107961--- a/kernel/sched/sched.h
107962+++ b/kernel/sched/sched.h
107963@@ -1219,7 +1219,7 @@ struct sched_class {
107964 #ifdef CONFIG_FAIR_GROUP_SCHED
107965 void (*task_move_group) (struct task_struct *p, int on_rq);
107966 #endif
107967-};
107968+} __do_const;
107969
107970 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
107971 {
107972diff --git a/kernel/signal.c b/kernel/signal.c
107973index d51c5dd..065c4c8 100644
107974--- a/kernel/signal.c
107975+++ b/kernel/signal.c
107976@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
107977
107978 int print_fatal_signals __read_mostly;
107979
107980-static void __user *sig_handler(struct task_struct *t, int sig)
107981+static __sighandler_t sig_handler(struct task_struct *t, int sig)
107982 {
107983 return t->sighand->action[sig - 1].sa.sa_handler;
107984 }
107985
107986-static int sig_handler_ignored(void __user *handler, int sig)
107987+static int sig_handler_ignored(__sighandler_t handler, int sig)
107988 {
107989 /* Is it explicitly or implicitly ignored? */
107990 return handler == SIG_IGN ||
107991@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
107992
107993 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
107994 {
107995- void __user *handler;
107996+ __sighandler_t handler;
107997
107998 handler = sig_handler(t, sig);
107999
108000@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
108001 atomic_inc(&user->sigpending);
108002 rcu_read_unlock();
108003
108004+ if (!override_rlimit)
108005+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
108006+
108007 if (override_rlimit ||
108008 atomic_read(&user->sigpending) <=
108009 task_rlimit(t, RLIMIT_SIGPENDING)) {
108010@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
108011
108012 int unhandled_signal(struct task_struct *tsk, int sig)
108013 {
108014- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
108015+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
108016 if (is_global_init(tsk))
108017 return 1;
108018 if (handler != SIG_IGN && handler != SIG_DFL)
108019@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
108020 }
108021 }
108022
108023+ /* allow glibc communication via tgkill to other threads in our
108024+ thread group */
108025+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
108026+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
108027+ && gr_handle_signal(t, sig))
108028+ return -EPERM;
108029+
108030 return security_task_kill(t, info, sig, 0);
108031 }
108032
108033@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
108034 return send_signal(sig, info, p, 1);
108035 }
108036
108037-static int
108038+int
108039 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
108040 {
108041 return send_signal(sig, info, t, 0);
108042@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
108043 unsigned long int flags;
108044 int ret, blocked, ignored;
108045 struct k_sigaction *action;
108046+ int is_unhandled = 0;
108047
108048 spin_lock_irqsave(&t->sighand->siglock, flags);
108049 action = &t->sighand->action[sig-1];
108050@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
108051 }
108052 if (action->sa.sa_handler == SIG_DFL)
108053 t->signal->flags &= ~SIGNAL_UNKILLABLE;
108054+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
108055+ is_unhandled = 1;
108056 ret = specific_send_sig_info(sig, info, t);
108057 spin_unlock_irqrestore(&t->sighand->siglock, flags);
108058
108059+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
108060+ normal operation */
108061+ if (is_unhandled) {
108062+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
108063+ gr_handle_crash(t, sig);
108064+ }
108065+
108066 return ret;
108067 }
108068
108069@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
108070 ret = check_kill_permission(sig, info, p);
108071 rcu_read_unlock();
108072
108073- if (!ret && sig)
108074+ if (!ret && sig) {
108075 ret = do_send_sig_info(sig, info, p, true);
108076+ if (!ret)
108077+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
108078+ }
108079
108080 return ret;
108081 }
108082@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
108083 int error = -ESRCH;
108084
108085 rcu_read_lock();
108086- p = find_task_by_vpid(pid);
108087+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
108088+ /* allow glibc communication via tgkill to other threads in our
108089+ thread group */
108090+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
108091+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
108092+ p = find_task_by_vpid_unrestricted(pid);
108093+ else
108094+#endif
108095+ p = find_task_by_vpid(pid);
108096 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
108097 error = check_kill_permission(sig, info, p);
108098 /*
108099@@ -3244,8 +3275,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
108100 }
108101 seg = get_fs();
108102 set_fs(KERNEL_DS);
108103- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
108104- (stack_t __force __user *) &uoss,
108105+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
108106+ (stack_t __force_user *) &uoss,
108107 compat_user_stack_pointer());
108108 set_fs(seg);
108109 if (ret >= 0 && uoss_ptr) {
108110diff --git a/kernel/smpboot.c b/kernel/smpboot.c
108111index c697f73..4ef1c25 100644
108112--- a/kernel/smpboot.c
108113+++ b/kernel/smpboot.c
108114@@ -291,7 +291,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
108115 }
108116 smpboot_unpark_thread(plug_thread, cpu);
108117 }
108118- list_add(&plug_thread->list, &hotplug_threads);
108119+ pax_list_add(&plug_thread->list, &hotplug_threads);
108120 out:
108121 mutex_unlock(&smpboot_threads_lock);
108122 put_online_cpus();
108123@@ -309,7 +309,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
108124 {
108125 get_online_cpus();
108126 mutex_lock(&smpboot_threads_lock);
108127- list_del(&plug_thread->list);
108128+ pax_list_del(&plug_thread->list);
108129 smpboot_destroy_threads(plug_thread);
108130 mutex_unlock(&smpboot_threads_lock);
108131 put_online_cpus();
108132diff --git a/kernel/softirq.c b/kernel/softirq.c
108133index 479e443..66d845e1 100644
108134--- a/kernel/softirq.c
108135+++ b/kernel/softirq.c
108136@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
108137 EXPORT_SYMBOL(irq_stat);
108138 #endif
108139
108140-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
108141+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
108142
108143 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
108144
108145@@ -270,7 +270,7 @@ restart:
108146 kstat_incr_softirqs_this_cpu(vec_nr);
108147
108148 trace_softirq_entry(vec_nr);
108149- h->action(h);
108150+ h->action();
108151 trace_softirq_exit(vec_nr);
108152 if (unlikely(prev_count != preempt_count())) {
108153 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
108154@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
108155 or_softirq_pending(1UL << nr);
108156 }
108157
108158-void open_softirq(int nr, void (*action)(struct softirq_action *))
108159+void __init open_softirq(int nr, void (*action)(void))
108160 {
108161 softirq_vec[nr].action = action;
108162 }
108163@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
108164 }
108165 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
108166
108167-static void tasklet_action(struct softirq_action *a)
108168+static void tasklet_action(void)
108169 {
108170 struct tasklet_struct *list;
108171
108172@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
108173 }
108174 }
108175
108176-static void tasklet_hi_action(struct softirq_action *a)
108177+static __latent_entropy void tasklet_hi_action(void)
108178 {
108179 struct tasklet_struct *list;
108180
108181@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
108182 .notifier_call = cpu_callback
108183 };
108184
108185-static struct smp_hotplug_thread softirq_threads = {
108186+static struct smp_hotplug_thread softirq_threads __read_only = {
108187 .store = &ksoftirqd,
108188 .thread_should_run = ksoftirqd_should_run,
108189 .thread_fn = run_ksoftirqd,
108190diff --git a/kernel/sys.c b/kernel/sys.c
108191index a4e372b..766810e 100644
108192--- a/kernel/sys.c
108193+++ b/kernel/sys.c
108194@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
108195 error = -EACCES;
108196 goto out;
108197 }
108198+
108199+ if (gr_handle_chroot_setpriority(p, niceval)) {
108200+ error = -EACCES;
108201+ goto out;
108202+ }
108203+
108204 no_nice = security_task_setnice(p, niceval);
108205 if (no_nice) {
108206 error = no_nice;
108207@@ -366,6 +372,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
108208 goto error;
108209 }
108210
108211+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
108212+ goto error;
108213+
108214+ if (!gid_eq(new->gid, old->gid)) {
108215+ /* make sure we generate a learn log for what will
108216+ end up being a role transition after a full-learning
108217+ policy is generated
108218+ CAP_SETGID is required to perform a transition
108219+ we may not log a CAP_SETGID check above, e.g.
108220+ in the case where new rgid = old egid
108221+ */
108222+ gr_learn_cap(current, new, CAP_SETGID);
108223+ }
108224+
108225 if (rgid != (gid_t) -1 ||
108226 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
108227 new->sgid = new->egid;
108228@@ -401,6 +421,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
108229 old = current_cred();
108230
108231 retval = -EPERM;
108232+
108233+ if (gr_check_group_change(kgid, kgid, kgid))
108234+ goto error;
108235+
108236 if (ns_capable(old->user_ns, CAP_SETGID))
108237 new->gid = new->egid = new->sgid = new->fsgid = kgid;
108238 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
108239@@ -418,7 +442,7 @@ error:
108240 /*
108241 * change the user struct in a credentials set to match the new UID
108242 */
108243-static int set_user(struct cred *new)
108244+int set_user(struct cred *new)
108245 {
108246 struct user_struct *new_user;
108247
108248@@ -498,7 +522,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
108249 goto error;
108250 }
108251
108252+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
108253+ goto error;
108254+
108255 if (!uid_eq(new->uid, old->uid)) {
108256+ /* make sure we generate a learn log for what will
108257+ end up being a role transition after a full-learning
108258+ policy is generated
108259+ CAP_SETUID is required to perform a transition
108260+ we may not log a CAP_SETUID check above, e.g.
108261+ in the case where new ruid = old euid
108262+ */
108263+ gr_learn_cap(current, new, CAP_SETUID);
108264 retval = set_user(new);
108265 if (retval < 0)
108266 goto error;
108267@@ -548,6 +583,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
108268 old = current_cred();
108269
108270 retval = -EPERM;
108271+
108272+ if (gr_check_crash_uid(kuid))
108273+ goto error;
108274+ if (gr_check_user_change(kuid, kuid, kuid))
108275+ goto error;
108276+
108277 if (ns_capable(old->user_ns, CAP_SETUID)) {
108278 new->suid = new->uid = kuid;
108279 if (!uid_eq(kuid, old->uid)) {
108280@@ -617,6 +658,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
108281 goto error;
108282 }
108283
108284+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
108285+ goto error;
108286+
108287 if (ruid != (uid_t) -1) {
108288 new->uid = kruid;
108289 if (!uid_eq(kruid, old->uid)) {
108290@@ -701,6 +745,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
108291 goto error;
108292 }
108293
108294+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
108295+ goto error;
108296+
108297 if (rgid != (gid_t) -1)
108298 new->gid = krgid;
108299 if (egid != (gid_t) -1)
108300@@ -765,12 +812,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
108301 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
108302 ns_capable(old->user_ns, CAP_SETUID)) {
108303 if (!uid_eq(kuid, old->fsuid)) {
108304+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
108305+ goto error;
108306+
108307 new->fsuid = kuid;
108308 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
108309 goto change_okay;
108310 }
108311 }
108312
108313+error:
108314 abort_creds(new);
108315 return old_fsuid;
108316
108317@@ -803,12 +854,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
108318 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
108319 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
108320 ns_capable(old->user_ns, CAP_SETGID)) {
108321+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
108322+ goto error;
108323+
108324 if (!gid_eq(kgid, old->fsgid)) {
108325 new->fsgid = kgid;
108326 goto change_okay;
108327 }
108328 }
108329
108330+error:
108331 abort_creds(new);
108332 return old_fsgid;
108333
108334@@ -1187,19 +1242,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
108335 return -EFAULT;
108336
108337 down_read(&uts_sem);
108338- error = __copy_to_user(&name->sysname, &utsname()->sysname,
108339+ error = __copy_to_user(name->sysname, &utsname()->sysname,
108340 __OLD_UTS_LEN);
108341 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
108342- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
108343+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
108344 __OLD_UTS_LEN);
108345 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
108346- error |= __copy_to_user(&name->release, &utsname()->release,
108347+ error |= __copy_to_user(name->release, &utsname()->release,
108348 __OLD_UTS_LEN);
108349 error |= __put_user(0, name->release + __OLD_UTS_LEN);
108350- error |= __copy_to_user(&name->version, &utsname()->version,
108351+ error |= __copy_to_user(name->version, &utsname()->version,
108352 __OLD_UTS_LEN);
108353 error |= __put_user(0, name->version + __OLD_UTS_LEN);
108354- error |= __copy_to_user(&name->machine, &utsname()->machine,
108355+ error |= __copy_to_user(name->machine, &utsname()->machine,
108356 __OLD_UTS_LEN);
108357 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
108358 up_read(&uts_sem);
108359@@ -1400,6 +1455,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
108360 */
108361 new_rlim->rlim_cur = 1;
108362 }
108363+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
108364+ is changed to a lower value. Since tasks can be created by the same
108365+ user in between this limit change and an execve by this task, force
108366+ a recheck only for this task by setting PF_NPROC_EXCEEDED
108367+ */
108368+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
108369+ tsk->flags |= PF_NPROC_EXCEEDED;
108370 }
108371 if (!retval) {
108372 if (old_rlim)
108373diff --git a/kernel/sysctl.c b/kernel/sysctl.c
108374index c3eee4c..586e4a0 100644
108375--- a/kernel/sysctl.c
108376+++ b/kernel/sysctl.c
108377@@ -94,7 +94,6 @@
108378 #endif
108379
108380 #if defined(CONFIG_SYSCTL)
108381-
108382 /* External variables not in a header file. */
108383 extern int suid_dumpable;
108384 #ifdef CONFIG_COREDUMP
108385@@ -111,22 +110,24 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
108386 #ifndef CONFIG_MMU
108387 extern int sysctl_nr_trim_pages;
108388 #endif
108389+extern int sysctl_modify_ldt;
108390
108391 /* Constants used for minimum and maximum */
108392 #ifdef CONFIG_LOCKUP_DETECTOR
108393-static int sixty = 60;
108394+static int sixty __read_only = 60;
108395 #endif
108396
108397-static int __maybe_unused neg_one = -1;
108398+static int __maybe_unused neg_one __read_only = -1;
108399
108400-static int zero;
108401-static int __maybe_unused one = 1;
108402-static int __maybe_unused two = 2;
108403-static int __maybe_unused four = 4;
108404-static unsigned long one_ul = 1;
108405-static int one_hundred = 100;
108406+static int zero __read_only = 0;
108407+static int __maybe_unused one __read_only = 1;
108408+static int __maybe_unused two __read_only = 2;
108409+static int __maybe_unused three __read_only = 3;
108410+static int __maybe_unused four __read_only = 4;
108411+static unsigned long one_ul __read_only = 1;
108412+static int one_hundred __read_only = 100;
108413 #ifdef CONFIG_PRINTK
108414-static int ten_thousand = 10000;
108415+static int ten_thousand __read_only = 10000;
108416 #endif
108417
108418 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
108419@@ -180,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
108420 void __user *buffer, size_t *lenp, loff_t *ppos);
108421 #endif
108422
108423-#ifdef CONFIG_PRINTK
108424-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108425+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108426 void __user *buffer, size_t *lenp, loff_t *ppos);
108427-#endif
108428
108429 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
108430 void __user *buffer, size_t *lenp, loff_t *ppos);
108431@@ -214,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
108432
108433 #endif
108434
108435+extern struct ctl_table grsecurity_table[];
108436+
108437 static struct ctl_table kern_table[];
108438 static struct ctl_table vm_table[];
108439 static struct ctl_table fs_table[];
108440@@ -228,6 +229,20 @@ extern struct ctl_table epoll_table[];
108441 int sysctl_legacy_va_layout;
108442 #endif
108443
108444+#ifdef CONFIG_PAX_SOFTMODE
108445+static struct ctl_table pax_table[] = {
108446+ {
108447+ .procname = "softmode",
108448+ .data = &pax_softmode,
108449+ .maxlen = sizeof(unsigned int),
108450+ .mode = 0600,
108451+ .proc_handler = &proc_dointvec,
108452+ },
108453+
108454+ { }
108455+};
108456+#endif
108457+
108458 /* The default sysctl tables: */
108459
108460 static struct ctl_table sysctl_base_table[] = {
108461@@ -276,6 +291,22 @@ static int max_extfrag_threshold = 1000;
108462 #endif
108463
108464 static struct ctl_table kern_table[] = {
108465+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
108466+ {
108467+ .procname = "grsecurity",
108468+ .mode = 0500,
108469+ .child = grsecurity_table,
108470+ },
108471+#endif
108472+
108473+#ifdef CONFIG_PAX_SOFTMODE
108474+ {
108475+ .procname = "pax",
108476+ .mode = 0500,
108477+ .child = pax_table,
108478+ },
108479+#endif
108480+
108481 {
108482 .procname = "sched_child_runs_first",
108483 .data = &sysctl_sched_child_runs_first,
108484@@ -637,7 +668,7 @@ static struct ctl_table kern_table[] = {
108485 .maxlen = sizeof(int),
108486 .mode = 0644,
108487 /* only handle a transition from default "0" to "1" */
108488- .proc_handler = proc_dointvec_minmax,
108489+ .proc_handler = proc_dointvec_minmax_secure,
108490 .extra1 = &one,
108491 .extra2 = &one,
108492 },
108493@@ -648,7 +679,7 @@ static struct ctl_table kern_table[] = {
108494 .data = &modprobe_path,
108495 .maxlen = KMOD_PATH_LEN,
108496 .mode = 0644,
108497- .proc_handler = proc_dostring,
108498+ .proc_handler = proc_dostring_modpriv,
108499 },
108500 {
108501 .procname = "modules_disabled",
108502@@ -656,7 +687,7 @@ static struct ctl_table kern_table[] = {
108503 .maxlen = sizeof(int),
108504 .mode = 0644,
108505 /* only handle a transition from default "0" to "1" */
108506- .proc_handler = proc_dointvec_minmax,
108507+ .proc_handler = proc_dointvec_minmax_secure,
108508 .extra1 = &one,
108509 .extra2 = &one,
108510 },
108511@@ -811,20 +842,24 @@ static struct ctl_table kern_table[] = {
108512 .data = &dmesg_restrict,
108513 .maxlen = sizeof(int),
108514 .mode = 0644,
108515- .proc_handler = proc_dointvec_minmax_sysadmin,
108516+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108517 .extra1 = &zero,
108518 .extra2 = &one,
108519 },
108520+#endif
108521 {
108522 .procname = "kptr_restrict",
108523 .data = &kptr_restrict,
108524 .maxlen = sizeof(int),
108525 .mode = 0644,
108526- .proc_handler = proc_dointvec_minmax_sysadmin,
108527+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108528+#ifdef CONFIG_GRKERNSEC_HIDESYM
108529+ .extra1 = &two,
108530+#else
108531 .extra1 = &zero,
108532+#endif
108533 .extra2 = &two,
108534 },
108535-#endif
108536 {
108537 .procname = "ngroups_max",
108538 .data = &ngroups_max,
108539@@ -962,6 +997,15 @@ static struct ctl_table kern_table[] = {
108540 .mode = 0644,
108541 .proc_handler = proc_dointvec,
108542 },
108543+ {
108544+ .procname = "modify_ldt",
108545+ .data = &sysctl_modify_ldt,
108546+ .maxlen = sizeof(int),
108547+ .mode = 0644,
108548+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108549+ .extra1 = &zero,
108550+ .extra2 = &one,
108551+ },
108552 #endif
108553 #if defined(CONFIG_MMU)
108554 {
108555@@ -1084,10 +1128,17 @@ static struct ctl_table kern_table[] = {
108556 */
108557 {
108558 .procname = "perf_event_paranoid",
108559- .data = &sysctl_perf_event_paranoid,
108560- .maxlen = sizeof(sysctl_perf_event_paranoid),
108561+ .data = &sysctl_perf_event_legitimately_concerned,
108562+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
108563 .mode = 0644,
108564- .proc_handler = proc_dointvec,
108565+ /* go ahead, be a hero */
108566+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108567+ .extra1 = &neg_one,
108568+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
108569+ .extra2 = &three,
108570+#else
108571+ .extra2 = &two,
108572+#endif
108573 },
108574 {
108575 .procname = "perf_event_mlock_kb",
108576@@ -1369,6 +1420,13 @@ static struct ctl_table vm_table[] = {
108577 .proc_handler = proc_dointvec_minmax,
108578 .extra1 = &zero,
108579 },
108580+ {
108581+ .procname = "heap_stack_gap",
108582+ .data = &sysctl_heap_stack_gap,
108583+ .maxlen = sizeof(sysctl_heap_stack_gap),
108584+ .mode = 0644,
108585+ .proc_handler = proc_doulongvec_minmax,
108586+ },
108587 #else
108588 {
108589 .procname = "nr_trim_pages",
108590@@ -1845,6 +1903,16 @@ int proc_dostring(struct ctl_table *table, int write,
108591 (char __user *)buffer, lenp, ppos);
108592 }
108593
108594+int proc_dostring_modpriv(struct ctl_table *table, int write,
108595+ void __user *buffer, size_t *lenp, loff_t *ppos)
108596+{
108597+ if (write && !capable(CAP_SYS_MODULE))
108598+ return -EPERM;
108599+
108600+ return _proc_do_string(table->data, table->maxlen, write,
108601+ buffer, lenp, ppos);
108602+}
108603+
108604 static size_t proc_skip_spaces(char **buf)
108605 {
108606 size_t ret;
108607@@ -1950,6 +2018,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
108608 len = strlen(tmp);
108609 if (len > *size)
108610 len = *size;
108611+ if (len > sizeof(tmp))
108612+ len = sizeof(tmp);
108613 if (copy_to_user(*buf, tmp, len))
108614 return -EFAULT;
108615 *size -= len;
108616@@ -2128,6 +2198,44 @@ int proc_dointvec(struct ctl_table *table, int write,
108617 NULL,NULL);
108618 }
108619
108620+static int do_proc_dointvec_conv_secure(bool *negp, unsigned long *lvalp,
108621+ int *valp,
108622+ int write, void *data)
108623+{
108624+ if (write) {
108625+ if (*negp) {
108626+ if (*lvalp > (unsigned long) INT_MAX + 1)
108627+ return -EINVAL;
108628+ pax_open_kernel();
108629+ *valp = -*lvalp;
108630+ pax_close_kernel();
108631+ } else {
108632+ if (*lvalp > (unsigned long) INT_MAX)
108633+ return -EINVAL;
108634+ pax_open_kernel();
108635+ *valp = *lvalp;
108636+ pax_close_kernel();
108637+ }
108638+ } else {
108639+ int val = *valp;
108640+ if (val < 0) {
108641+ *negp = true;
108642+ *lvalp = (unsigned long)-val;
108643+ } else {
108644+ *negp = false;
108645+ *lvalp = (unsigned long)val;
108646+ }
108647+ }
108648+ return 0;
108649+}
108650+
108651+int proc_dointvec_secure(struct ctl_table *table, int write,
108652+ void __user *buffer, size_t *lenp, loff_t *ppos)
108653+{
108654+ return do_proc_dointvec(table,write,buffer,lenp,ppos,
108655+ do_proc_dointvec_conv_secure,NULL);
108656+}
108657+
108658 /*
108659 * Taint values can only be increased
108660 * This means we can safely use a temporary.
108661@@ -2135,7 +2243,7 @@ int proc_dointvec(struct ctl_table *table, int write,
108662 static int proc_taint(struct ctl_table *table, int write,
108663 void __user *buffer, size_t *lenp, loff_t *ppos)
108664 {
108665- struct ctl_table t;
108666+ ctl_table_no_const t;
108667 unsigned long tmptaint = get_taint();
108668 int err;
108669
108670@@ -2163,16 +2271,14 @@ static int proc_taint(struct ctl_table *table, int write,
108671 return err;
108672 }
108673
108674-#ifdef CONFIG_PRINTK
108675-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108676+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108677 void __user *buffer, size_t *lenp, loff_t *ppos)
108678 {
108679 if (write && !capable(CAP_SYS_ADMIN))
108680 return -EPERM;
108681
108682- return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108683+ return proc_dointvec_minmax_secure(table, write, buffer, lenp, ppos);
108684 }
108685-#endif
108686
108687 struct do_proc_dointvec_minmax_conv_param {
108688 int *min;
108689@@ -2203,6 +2309,32 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
108690 return 0;
108691 }
108692
108693+static int do_proc_dointvec_minmax_conv_secure(bool *negp, unsigned long *lvalp,
108694+ int *valp,
108695+ int write, void *data)
108696+{
108697+ struct do_proc_dointvec_minmax_conv_param *param = data;
108698+ if (write) {
108699+ int val = *negp ? -*lvalp : *lvalp;
108700+ if ((param->min && *param->min > val) ||
108701+ (param->max && *param->max < val))
108702+ return -EINVAL;
108703+ pax_open_kernel();
108704+ *valp = val;
108705+ pax_close_kernel();
108706+ } else {
108707+ int val = *valp;
108708+ if (val < 0) {
108709+ *negp = true;
108710+ *lvalp = (unsigned long)-val;
108711+ } else {
108712+ *negp = false;
108713+ *lvalp = (unsigned long)val;
108714+ }
108715+ }
108716+ return 0;
108717+}
108718+
108719 /**
108720 * proc_dointvec_minmax - read a vector of integers with min/max values
108721 * @table: the sysctl table
108722@@ -2230,6 +2362,17 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
108723 do_proc_dointvec_minmax_conv, &param);
108724 }
108725
108726+int proc_dointvec_minmax_secure(struct ctl_table *table, int write,
108727+ void __user *buffer, size_t *lenp, loff_t *ppos)
108728+{
108729+ struct do_proc_dointvec_minmax_conv_param param = {
108730+ .min = (int *) table->extra1,
108731+ .max = (int *) table->extra2,
108732+ };
108733+ return do_proc_dointvec(table, write, buffer, lenp, ppos,
108734+ do_proc_dointvec_minmax_conv_secure, &param);
108735+}
108736+
108737 static void validate_coredump_safety(void)
108738 {
108739 #ifdef CONFIG_COREDUMP
108740@@ -2732,6 +2875,12 @@ int proc_dostring(struct ctl_table *table, int write,
108741 return -ENOSYS;
108742 }
108743
108744+int proc_dostring_modpriv(struct ctl_table *table, int write,
108745+ void __user *buffer, size_t *lenp, loff_t *ppos)
108746+{
108747+ return -ENOSYS;
108748+}
108749+
108750 int proc_dointvec(struct ctl_table *table, int write,
108751 void __user *buffer, size_t *lenp, loff_t *ppos)
108752 {
108753@@ -2788,5 +2937,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
108754 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
108755 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
108756 EXPORT_SYMBOL(proc_dostring);
108757+EXPORT_SYMBOL(proc_dostring_modpriv);
108758 EXPORT_SYMBOL(proc_doulongvec_minmax);
108759 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
108760diff --git a/kernel/taskstats.c b/kernel/taskstats.c
108761index 21f82c2..c1984e5 100644
108762--- a/kernel/taskstats.c
108763+++ b/kernel/taskstats.c
108764@@ -28,9 +28,12 @@
108765 #include <linux/fs.h>
108766 #include <linux/file.h>
108767 #include <linux/pid_namespace.h>
108768+#include <linux/grsecurity.h>
108769 #include <net/genetlink.h>
108770 #include <linux/atomic.h>
108771
108772+extern int gr_is_taskstats_denied(int pid);
108773+
108774 /*
108775 * Maximum length of a cpumask that can be specified in
108776 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
108777@@ -567,6 +570,9 @@ err:
108778
108779 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
108780 {
108781+ if (gr_is_taskstats_denied(current->pid))
108782+ return -EACCES;
108783+
108784 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
108785 return cmd_attr_register_cpumask(info);
108786 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
108787diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
108788index 1b001ed..55ef9e4 100644
108789--- a/kernel/time/alarmtimer.c
108790+++ b/kernel/time/alarmtimer.c
108791@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
108792 struct platform_device *pdev;
108793 int error = 0;
108794 int i;
108795- struct k_clock alarm_clock = {
108796+ static struct k_clock alarm_clock = {
108797 .clock_getres = alarm_clock_getres,
108798 .clock_get = alarm_clock_get,
108799 .timer_create = alarm_timer_create,
108800diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
108801index 93ef7190..7c85701 100644
108802--- a/kernel/time/hrtimer.c
108803+++ b/kernel/time/hrtimer.c
108804@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
108805 local_irq_restore(flags);
108806 }
108807
108808-static void run_hrtimer_softirq(struct softirq_action *h)
108809+static __latent_entropy void run_hrtimer_softirq(void)
108810 {
108811 hrtimer_peek_ahead_timers();
108812 }
108813diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
108814index 0075da7..63cc872 100644
108815--- a/kernel/time/posix-cpu-timers.c
108816+++ b/kernel/time/posix-cpu-timers.c
108817@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
108818
108819 static __init int init_posix_cpu_timers(void)
108820 {
108821- struct k_clock process = {
108822+ static struct k_clock process = {
108823 .clock_getres = process_cpu_clock_getres,
108824 .clock_get = process_cpu_clock_get,
108825 .timer_create = process_cpu_timer_create,
108826 .nsleep = process_cpu_nsleep,
108827 .nsleep_restart = process_cpu_nsleep_restart,
108828 };
108829- struct k_clock thread = {
108830+ static struct k_clock thread = {
108831 .clock_getres = thread_cpu_clock_getres,
108832 .clock_get = thread_cpu_clock_get,
108833 .timer_create = thread_cpu_timer_create,
108834diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
108835index 31ea01f..7fc61ef 100644
108836--- a/kernel/time/posix-timers.c
108837+++ b/kernel/time/posix-timers.c
108838@@ -43,6 +43,7 @@
108839 #include <linux/hash.h>
108840 #include <linux/posix-clock.h>
108841 #include <linux/posix-timers.h>
108842+#include <linux/grsecurity.h>
108843 #include <linux/syscalls.h>
108844 #include <linux/wait.h>
108845 #include <linux/workqueue.h>
108846@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
108847 * which we beg off on and pass to do_sys_settimeofday().
108848 */
108849
108850-static struct k_clock posix_clocks[MAX_CLOCKS];
108851+static struct k_clock *posix_clocks[MAX_CLOCKS];
108852
108853 /*
108854 * These ones are defined below.
108855@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
108856 */
108857 static __init int init_posix_timers(void)
108858 {
108859- struct k_clock clock_realtime = {
108860+ static struct k_clock clock_realtime = {
108861 .clock_getres = hrtimer_get_res,
108862 .clock_get = posix_clock_realtime_get,
108863 .clock_set = posix_clock_realtime_set,
108864@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
108865 .timer_get = common_timer_get,
108866 .timer_del = common_timer_del,
108867 };
108868- struct k_clock clock_monotonic = {
108869+ static struct k_clock clock_monotonic = {
108870 .clock_getres = hrtimer_get_res,
108871 .clock_get = posix_ktime_get_ts,
108872 .nsleep = common_nsleep,
108873@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
108874 .timer_get = common_timer_get,
108875 .timer_del = common_timer_del,
108876 };
108877- struct k_clock clock_monotonic_raw = {
108878+ static struct k_clock clock_monotonic_raw = {
108879 .clock_getres = hrtimer_get_res,
108880 .clock_get = posix_get_monotonic_raw,
108881 };
108882- struct k_clock clock_realtime_coarse = {
108883+ static struct k_clock clock_realtime_coarse = {
108884 .clock_getres = posix_get_coarse_res,
108885 .clock_get = posix_get_realtime_coarse,
108886 };
108887- struct k_clock clock_monotonic_coarse = {
108888+ static struct k_clock clock_monotonic_coarse = {
108889 .clock_getres = posix_get_coarse_res,
108890 .clock_get = posix_get_monotonic_coarse,
108891 };
108892- struct k_clock clock_tai = {
108893+ static struct k_clock clock_tai = {
108894 .clock_getres = hrtimer_get_res,
108895 .clock_get = posix_get_tai,
108896 .nsleep = common_nsleep,
108897@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
108898 .timer_get = common_timer_get,
108899 .timer_del = common_timer_del,
108900 };
108901- struct k_clock clock_boottime = {
108902+ static struct k_clock clock_boottime = {
108903 .clock_getres = hrtimer_get_res,
108904 .clock_get = posix_get_boottime,
108905 .nsleep = common_nsleep,
108906@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
108907 return;
108908 }
108909
108910- posix_clocks[clock_id] = *new_clock;
108911+ posix_clocks[clock_id] = new_clock;
108912 }
108913 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
108914
108915@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
108916 return (id & CLOCKFD_MASK) == CLOCKFD ?
108917 &clock_posix_dynamic : &clock_posix_cpu;
108918
108919- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
108920+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
108921 return NULL;
108922- return &posix_clocks[id];
108923+ return posix_clocks[id];
108924 }
108925
108926 static int common_timer_create(struct k_itimer *new_timer)
108927@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
108928 struct k_clock *kc = clockid_to_kclock(which_clock);
108929 struct k_itimer *new_timer;
108930 int error, new_timer_id;
108931- sigevent_t event;
108932+ sigevent_t event = { };
108933 int it_id_set = IT_ID_NOT_SET;
108934
108935 if (!kc)
108936@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
108937 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
108938 return -EFAULT;
108939
108940+ /* only the CLOCK_REALTIME clock can be set, all other clocks
108941+ have their clock_set fptr set to a nosettime dummy function
108942+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
108943+ call common_clock_set, which calls do_sys_settimeofday, which
108944+ we hook
108945+ */
108946+
108947 return kc->clock_set(which_clock, &new_tp);
108948 }
108949
108950diff --git a/kernel/time/time.c b/kernel/time/time.c
108951index 2c85b77..6530536 100644
108952--- a/kernel/time/time.c
108953+++ b/kernel/time/time.c
108954@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
108955 return error;
108956
108957 if (tz) {
108958+ /* we log in do_settimeofday called below, so don't log twice
108959+ */
108960+ if (!tv)
108961+ gr_log_timechange();
108962+
108963 sys_tz = *tz;
108964 update_vsyscall_tz();
108965 if (firsttime) {
108966diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
108967index 946acb7..1e13c0f 100644
108968--- a/kernel/time/timekeeping.c
108969+++ b/kernel/time/timekeeping.c
108970@@ -15,6 +15,7 @@
108971 #include <linux/init.h>
108972 #include <linux/mm.h>
108973 #include <linux/sched.h>
108974+#include <linux/grsecurity.h>
108975 #include <linux/syscore_ops.h>
108976 #include <linux/clocksource.h>
108977 #include <linux/jiffies.h>
108978@@ -915,6 +916,8 @@ int do_settimeofday64(const struct timespec64 *ts)
108979 if (!timespec64_valid_strict(ts))
108980 return -EINVAL;
108981
108982+ gr_log_timechange();
108983+
108984 raw_spin_lock_irqsave(&timekeeper_lock, flags);
108985 write_seqcount_begin(&tk_core.seq);
108986
108987diff --git a/kernel/time/timer.c b/kernel/time/timer.c
108988index 2ece3aa..055a295 100644
108989--- a/kernel/time/timer.c
108990+++ b/kernel/time/timer.c
108991@@ -1405,7 +1405,7 @@ void update_process_times(int user_tick)
108992 /*
108993 * This function runs timers and the timer-tq in bottom half context.
108994 */
108995-static void run_timer_softirq(struct softirq_action *h)
108996+static __latent_entropy void run_timer_softirq(void)
108997 {
108998 struct tvec_base *base = __this_cpu_read(tvec_bases);
108999
109000@@ -1468,7 +1468,7 @@ static void process_timeout(unsigned long __data)
109001 *
109002 * In all cases the return value is guaranteed to be non-negative.
109003 */
109004-signed long __sched schedule_timeout(signed long timeout)
109005+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
109006 {
109007 struct timer_list timer;
109008 unsigned long expire;
109009diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
109010index e878c2e..cf1546bb 100644
109011--- a/kernel/time/timer_list.c
109012+++ b/kernel/time/timer_list.c
109013@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
109014
109015 static void print_name_offset(struct seq_file *m, void *sym)
109016 {
109017+#ifdef CONFIG_GRKERNSEC_HIDESYM
109018+ SEQ_printf(m, "<%p>", NULL);
109019+#else
109020 char symname[KSYM_NAME_LEN];
109021
109022 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
109023 SEQ_printf(m, "<%pK>", sym);
109024 else
109025 SEQ_printf(m, "%s", symname);
109026+#endif
109027 }
109028
109029 static void
109030@@ -119,7 +123,11 @@ next_one:
109031 static void
109032 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
109033 {
109034+#ifdef CONFIG_GRKERNSEC_HIDESYM
109035+ SEQ_printf(m, " .base: %p\n", NULL);
109036+#else
109037 SEQ_printf(m, " .base: %pK\n", base);
109038+#endif
109039 SEQ_printf(m, " .index: %d\n",
109040 base->index);
109041 SEQ_printf(m, " .resolution: %Lu nsecs\n",
109042@@ -388,7 +396,11 @@ static int __init init_timer_list_procfs(void)
109043 {
109044 struct proc_dir_entry *pe;
109045
109046+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109047+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
109048+#else
109049 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
109050+#endif
109051 if (!pe)
109052 return -ENOMEM;
109053 return 0;
109054diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
109055index 1fb08f2..ca4bb1e 100644
109056--- a/kernel/time/timer_stats.c
109057+++ b/kernel/time/timer_stats.c
109058@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
109059 static unsigned long nr_entries;
109060 static struct entry entries[MAX_ENTRIES];
109061
109062-static atomic_t overflow_count;
109063+static atomic_unchecked_t overflow_count;
109064
109065 /*
109066 * The entries are in a hash-table, for fast lookup:
109067@@ -140,7 +140,7 @@ static void reset_entries(void)
109068 nr_entries = 0;
109069 memset(entries, 0, sizeof(entries));
109070 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
109071- atomic_set(&overflow_count, 0);
109072+ atomic_set_unchecked(&overflow_count, 0);
109073 }
109074
109075 static struct entry *alloc_entry(void)
109076@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
109077 if (likely(entry))
109078 entry->count++;
109079 else
109080- atomic_inc(&overflow_count);
109081+ atomic_inc_unchecked(&overflow_count);
109082
109083 out_unlock:
109084 raw_spin_unlock_irqrestore(lock, flags);
109085@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
109086
109087 static void print_name_offset(struct seq_file *m, unsigned long addr)
109088 {
109089+#ifdef CONFIG_GRKERNSEC_HIDESYM
109090+ seq_printf(m, "<%p>", NULL);
109091+#else
109092 char symname[KSYM_NAME_LEN];
109093
109094 if (lookup_symbol_name(addr, symname) < 0)
109095- seq_printf(m, "<%p>", (void *)addr);
109096+ seq_printf(m, "<%pK>", (void *)addr);
109097 else
109098 seq_printf(m, "%s", symname);
109099+#endif
109100 }
109101
109102 static int tstats_show(struct seq_file *m, void *v)
109103@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
109104
109105 seq_puts(m, "Timer Stats Version: v0.3\n");
109106 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
109107- if (atomic_read(&overflow_count))
109108- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
109109+ if (atomic_read_unchecked(&overflow_count))
109110+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
109111 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
109112
109113 for (i = 0; i < nr_entries; i++) {
109114@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
109115 {
109116 struct proc_dir_entry *pe;
109117
109118+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109119+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
109120+#else
109121 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
109122+#endif
109123 if (!pe)
109124 return -ENOMEM;
109125 return 0;
109126diff --git a/kernel/torture.c b/kernel/torture.c
109127index dd70993..0bf694b 100644
109128--- a/kernel/torture.c
109129+++ b/kernel/torture.c
109130@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
109131 mutex_lock(&fullstop_mutex);
109132 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
109133 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
109134- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
109135+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
109136 } else {
109137 pr_warn("Concurrent rmmod and shutdown illegal!\n");
109138 }
109139@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
109140 if (!torture_must_stop()) {
109141 if (stutter > 1) {
109142 schedule_timeout_interruptible(stutter - 1);
109143- ACCESS_ONCE(stutter_pause_test) = 2;
109144+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
109145 }
109146 schedule_timeout_interruptible(1);
109147- ACCESS_ONCE(stutter_pause_test) = 1;
109148+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
109149 }
109150 if (!torture_must_stop())
109151 schedule_timeout_interruptible(stutter);
109152- ACCESS_ONCE(stutter_pause_test) = 0;
109153+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
109154 torture_shutdown_absorb("torture_stutter");
109155 } while (!torture_must_stop());
109156 torture_kthread_stopping("torture_stutter");
109157@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
109158 schedule_timeout_uninterruptible(10);
109159 return true;
109160 }
109161- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
109162+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
109163 mutex_unlock(&fullstop_mutex);
109164 torture_shutdown_cleanup();
109165 torture_shuffle_cleanup();
109166diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
109167index 483cecf..ac46091 100644
109168--- a/kernel/trace/blktrace.c
109169+++ b/kernel/trace/blktrace.c
109170@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
109171 struct blk_trace *bt = filp->private_data;
109172 char buf[16];
109173
109174- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
109175+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
109176
109177 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
109178 }
109179@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
109180 return 1;
109181
109182 bt = buf->chan->private_data;
109183- atomic_inc(&bt->dropped);
109184+ atomic_inc_unchecked(&bt->dropped);
109185 return 0;
109186 }
109187
109188@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
109189
109190 bt->dir = dir;
109191 bt->dev = dev;
109192- atomic_set(&bt->dropped, 0);
109193+ atomic_set_unchecked(&bt->dropped, 0);
109194 INIT_LIST_HEAD(&bt->running_list);
109195
109196 ret = -EIO;
109197diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
109198index 02bece4..f9b05af 100644
109199--- a/kernel/trace/ftrace.c
109200+++ b/kernel/trace/ftrace.c
109201@@ -2395,12 +2395,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
109202 if (unlikely(ftrace_disabled))
109203 return 0;
109204
109205+ ret = ftrace_arch_code_modify_prepare();
109206+ FTRACE_WARN_ON(ret);
109207+ if (ret)
109208+ return 0;
109209+
109210 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
109211+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
109212 if (ret) {
109213 ftrace_bug(ret, rec);
109214- return 0;
109215 }
109216- return 1;
109217+ return ret ? 0 : 1;
109218 }
109219
109220 /*
109221@@ -4789,8 +4794,10 @@ static int ftrace_process_locs(struct module *mod,
109222 if (!count)
109223 return 0;
109224
109225+ pax_open_kernel();
109226 sort(start, count, sizeof(*start),
109227 ftrace_cmp_ips, ftrace_swap_ips);
109228+ pax_close_kernel();
109229
109230 start_pg = ftrace_allocate_pages(count);
109231 if (!start_pg)
109232@@ -5659,7 +5666,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
109233
109234 if (t->ret_stack == NULL) {
109235 atomic_set(&t->tracing_graph_pause, 0);
109236- atomic_set(&t->trace_overrun, 0);
109237+ atomic_set_unchecked(&t->trace_overrun, 0);
109238 t->curr_ret_stack = -1;
109239 /* Make sure the tasks see the -1 first: */
109240 smp_wmb();
109241@@ -5882,7 +5889,7 @@ static void
109242 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
109243 {
109244 atomic_set(&t->tracing_graph_pause, 0);
109245- atomic_set(&t->trace_overrun, 0);
109246+ atomic_set_unchecked(&t->trace_overrun, 0);
109247 t->ftrace_timestamp = 0;
109248 /* make curr_ret_stack visible before we add the ret_stack */
109249 smp_wmb();
109250diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
109251index 0315d43..2e5e9a2 100644
109252--- a/kernel/trace/ring_buffer.c
109253+++ b/kernel/trace/ring_buffer.c
109254@@ -348,9 +348,9 @@ struct buffer_data_page {
109255 */
109256 struct buffer_page {
109257 struct list_head list; /* list of buffer pages */
109258- local_t write; /* index for next write */
109259+ local_unchecked_t write; /* index for next write */
109260 unsigned read; /* index for next read */
109261- local_t entries; /* entries on this page */
109262+ local_unchecked_t entries; /* entries on this page */
109263 unsigned long real_end; /* real end of data */
109264 struct buffer_data_page *page; /* Actual data page */
109265 };
109266@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
109267 unsigned long last_overrun;
109268 local_t entries_bytes;
109269 local_t entries;
109270- local_t overrun;
109271- local_t commit_overrun;
109272- local_t dropped_events;
109273+ local_unchecked_t overrun;
109274+ local_unchecked_t commit_overrun;
109275+ local_unchecked_t dropped_events;
109276 local_t committing;
109277- local_t commits;
109278+ local_unchecked_t commits;
109279 unsigned long read;
109280 unsigned long read_bytes;
109281 u64 write_stamp;
109282@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109283 *
109284 * We add a counter to the write field to denote this.
109285 */
109286- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
109287- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
109288+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
109289+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
109290
109291 /*
109292 * Just make sure we have seen our old_write and synchronize
109293@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109294 * cmpxchg to only update if an interrupt did not already
109295 * do it for us. If the cmpxchg fails, we don't care.
109296 */
109297- (void)local_cmpxchg(&next_page->write, old_write, val);
109298- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
109299+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
109300+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
109301
109302 /*
109303 * No need to worry about races with clearing out the commit.
109304@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
109305
109306 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
109307 {
109308- return local_read(&bpage->entries) & RB_WRITE_MASK;
109309+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
109310 }
109311
109312 static inline unsigned long rb_page_write(struct buffer_page *bpage)
109313 {
109314- return local_read(&bpage->write) & RB_WRITE_MASK;
109315+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
109316 }
109317
109318 static int
109319@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
109320 * bytes consumed in ring buffer from here.
109321 * Increment overrun to account for the lost events.
109322 */
109323- local_add(page_entries, &cpu_buffer->overrun);
109324+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
109325 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109326 }
109327
109328@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
109329 * it is our responsibility to update
109330 * the counters.
109331 */
109332- local_add(entries, &cpu_buffer->overrun);
109333+ local_add_unchecked(entries, &cpu_buffer->overrun);
109334 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109335
109336 /*
109337@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109338 if (tail == BUF_PAGE_SIZE)
109339 tail_page->real_end = 0;
109340
109341- local_sub(length, &tail_page->write);
109342+ local_sub_unchecked(length, &tail_page->write);
109343 return;
109344 }
109345
109346@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109347 rb_event_set_padding(event);
109348
109349 /* Set the write back to the previous setting */
109350- local_sub(length, &tail_page->write);
109351+ local_sub_unchecked(length, &tail_page->write);
109352 return;
109353 }
109354
109355@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109356
109357 /* Set write to end of buffer */
109358 length = (tail + length) - BUF_PAGE_SIZE;
109359- local_sub(length, &tail_page->write);
109360+ local_sub_unchecked(length, &tail_page->write);
109361 }
109362
109363 /*
109364@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109365 * about it.
109366 */
109367 if (unlikely(next_page == commit_page)) {
109368- local_inc(&cpu_buffer->commit_overrun);
109369+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109370 goto out_reset;
109371 }
109372
109373@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109374 * this is easy, just stop here.
109375 */
109376 if (!(buffer->flags & RB_FL_OVERWRITE)) {
109377- local_inc(&cpu_buffer->dropped_events);
109378+ local_inc_unchecked(&cpu_buffer->dropped_events);
109379 goto out_reset;
109380 }
109381
109382@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109383 cpu_buffer->tail_page) &&
109384 (cpu_buffer->commit_page ==
109385 cpu_buffer->reader_page))) {
109386- local_inc(&cpu_buffer->commit_overrun);
109387+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109388 goto out_reset;
109389 }
109390 }
109391@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109392 length += RB_LEN_TIME_EXTEND;
109393
109394 tail_page = cpu_buffer->tail_page;
109395- write = local_add_return(length, &tail_page->write);
109396+ write = local_add_return_unchecked(length, &tail_page->write);
109397
109398 /* set write to only the index of the write */
109399 write &= RB_WRITE_MASK;
109400@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109401 kmemcheck_annotate_bitfield(event, bitfield);
109402 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
109403
109404- local_inc(&tail_page->entries);
109405+ local_inc_unchecked(&tail_page->entries);
109406
109407 /*
109408 * If this is the first commit on the page, then update
109409@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109410
109411 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
109412 unsigned long write_mask =
109413- local_read(&bpage->write) & ~RB_WRITE_MASK;
109414+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
109415 unsigned long event_length = rb_event_length(event);
109416 /*
109417 * This is on the tail page. It is possible that
109418@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109419 */
109420 old_index += write_mask;
109421 new_index += write_mask;
109422- index = local_cmpxchg(&bpage->write, old_index, new_index);
109423+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
109424 if (index == old_index) {
109425 /* update counters */
109426 local_sub(event_length, &cpu_buffer->entries_bytes);
109427@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109428 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
109429 {
109430 local_inc(&cpu_buffer->committing);
109431- local_inc(&cpu_buffer->commits);
109432+ local_inc_unchecked(&cpu_buffer->commits);
109433 }
109434
109435 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109436@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109437 return;
109438
109439 again:
109440- commits = local_read(&cpu_buffer->commits);
109441+ commits = local_read_unchecked(&cpu_buffer->commits);
109442 /* synchronize with interrupts */
109443 barrier();
109444 if (local_read(&cpu_buffer->committing) == 1)
109445@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109446 * updating of the commit page and the clearing of the
109447 * committing counter.
109448 */
109449- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
109450+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
109451 !local_read(&cpu_buffer->committing)) {
109452 local_inc(&cpu_buffer->committing);
109453 goto again;
109454@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
109455 barrier();
109456 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
109457 local_dec(&cpu_buffer->committing);
109458- local_dec(&cpu_buffer->commits);
109459+ local_dec_unchecked(&cpu_buffer->commits);
109460 return NULL;
109461 }
109462 #endif
109463@@ -2898,7 +2898,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109464
109465 /* Do the likely case first */
109466 if (likely(bpage->page == (void *)addr)) {
109467- local_dec(&bpage->entries);
109468+ local_dec_unchecked(&bpage->entries);
109469 return;
109470 }
109471
109472@@ -2910,7 +2910,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109473 start = bpage;
109474 do {
109475 if (bpage->page == (void *)addr) {
109476- local_dec(&bpage->entries);
109477+ local_dec_unchecked(&bpage->entries);
109478 return;
109479 }
109480 rb_inc_page(cpu_buffer, &bpage);
109481@@ -3194,7 +3194,7 @@ static inline unsigned long
109482 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
109483 {
109484 return local_read(&cpu_buffer->entries) -
109485- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
109486+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
109487 }
109488
109489 /**
109490@@ -3283,7 +3283,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
109491 return 0;
109492
109493 cpu_buffer = buffer->buffers[cpu];
109494- ret = local_read(&cpu_buffer->overrun);
109495+ ret = local_read_unchecked(&cpu_buffer->overrun);
109496
109497 return ret;
109498 }
109499@@ -3306,7 +3306,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
109500 return 0;
109501
109502 cpu_buffer = buffer->buffers[cpu];
109503- ret = local_read(&cpu_buffer->commit_overrun);
109504+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
109505
109506 return ret;
109507 }
109508@@ -3328,7 +3328,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
109509 return 0;
109510
109511 cpu_buffer = buffer->buffers[cpu];
109512- ret = local_read(&cpu_buffer->dropped_events);
109513+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
109514
109515 return ret;
109516 }
109517@@ -3391,7 +3391,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
109518 /* if you care about this being correct, lock the buffer */
109519 for_each_buffer_cpu(buffer, cpu) {
109520 cpu_buffer = buffer->buffers[cpu];
109521- overruns += local_read(&cpu_buffer->overrun);
109522+ overruns += local_read_unchecked(&cpu_buffer->overrun);
109523 }
109524
109525 return overruns;
109526@@ -3562,8 +3562,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109527 /*
109528 * Reset the reader page to size zero.
109529 */
109530- local_set(&cpu_buffer->reader_page->write, 0);
109531- local_set(&cpu_buffer->reader_page->entries, 0);
109532+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109533+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109534 local_set(&cpu_buffer->reader_page->page->commit, 0);
109535 cpu_buffer->reader_page->real_end = 0;
109536
109537@@ -3597,7 +3597,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109538 * want to compare with the last_overrun.
109539 */
109540 smp_mb();
109541- overwrite = local_read(&(cpu_buffer->overrun));
109542+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
109543
109544 /*
109545 * Here's the tricky part.
109546@@ -4169,8 +4169,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109547
109548 cpu_buffer->head_page
109549 = list_entry(cpu_buffer->pages, struct buffer_page, list);
109550- local_set(&cpu_buffer->head_page->write, 0);
109551- local_set(&cpu_buffer->head_page->entries, 0);
109552+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
109553+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
109554 local_set(&cpu_buffer->head_page->page->commit, 0);
109555
109556 cpu_buffer->head_page->read = 0;
109557@@ -4180,18 +4180,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109558
109559 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
109560 INIT_LIST_HEAD(&cpu_buffer->new_pages);
109561- local_set(&cpu_buffer->reader_page->write, 0);
109562- local_set(&cpu_buffer->reader_page->entries, 0);
109563+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109564+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109565 local_set(&cpu_buffer->reader_page->page->commit, 0);
109566 cpu_buffer->reader_page->read = 0;
109567
109568 local_set(&cpu_buffer->entries_bytes, 0);
109569- local_set(&cpu_buffer->overrun, 0);
109570- local_set(&cpu_buffer->commit_overrun, 0);
109571- local_set(&cpu_buffer->dropped_events, 0);
109572+ local_set_unchecked(&cpu_buffer->overrun, 0);
109573+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
109574+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
109575 local_set(&cpu_buffer->entries, 0);
109576 local_set(&cpu_buffer->committing, 0);
109577- local_set(&cpu_buffer->commits, 0);
109578+ local_set_unchecked(&cpu_buffer->commits, 0);
109579 cpu_buffer->read = 0;
109580 cpu_buffer->read_bytes = 0;
109581
109582@@ -4592,8 +4592,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
109583 rb_init_page(bpage);
109584 bpage = reader->page;
109585 reader->page = *data_page;
109586- local_set(&reader->write, 0);
109587- local_set(&reader->entries, 0);
109588+ local_set_unchecked(&reader->write, 0);
109589+ local_set_unchecked(&reader->entries, 0);
109590 reader->read = 0;
109591 *data_page = bpage;
109592
109593diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
109594index 0533049..85e27f0 100644
109595--- a/kernel/trace/trace.c
109596+++ b/kernel/trace/trace.c
109597@@ -3538,7 +3538,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
109598 return 0;
109599 }
109600
109601-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
109602+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
109603 {
109604 /* do nothing if flag is already set */
109605 if (!!(trace_flags & mask) == !!enabled)
109606diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
109607index d261201..da10429 100644
109608--- a/kernel/trace/trace.h
109609+++ b/kernel/trace/trace.h
109610@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
109611 void trace_printk_init_buffers(void);
109612 void trace_printk_start_comm(void);
109613 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
109614-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
109615+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
109616
109617 /*
109618 * Normal trace_printk() and friends allocates special buffers
109619diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
109620index 57b67b1..66082a9 100644
109621--- a/kernel/trace/trace_clock.c
109622+++ b/kernel/trace/trace_clock.c
109623@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
109624 return now;
109625 }
109626
109627-static atomic64_t trace_counter;
109628+static atomic64_unchecked_t trace_counter;
109629
109630 /*
109631 * trace_clock_counter(): simply an atomic counter.
109632@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
109633 */
109634 u64 notrace trace_clock_counter(void)
109635 {
109636- return atomic64_add_return(1, &trace_counter);
109637+ return atomic64_inc_return_unchecked(&trace_counter);
109638 }
109639diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
109640index c4de47f..5f134b8 100644
109641--- a/kernel/trace/trace_events.c
109642+++ b/kernel/trace/trace_events.c
109643@@ -1887,7 +1887,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
109644 return 0;
109645 }
109646
109647-struct ftrace_module_file_ops;
109648 static void __add_event_to_tracers(struct ftrace_event_call *call);
109649
109650 /* Add an additional event_call dynamically */
109651diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
109652index 7f2e97c..085a257 100644
109653--- a/kernel/trace/trace_events_filter.c
109654+++ b/kernel/trace/trace_events_filter.c
109655@@ -1056,6 +1056,9 @@ static void parse_init(struct filter_parse_state *ps,
109656
109657 static char infix_next(struct filter_parse_state *ps)
109658 {
109659+ if (!ps->infix.cnt)
109660+ return 0;
109661+
109662 ps->infix.cnt--;
109663
109664 return ps->infix.string[ps->infix.tail++];
109665@@ -1071,6 +1074,9 @@ static char infix_peek(struct filter_parse_state *ps)
109666
109667 static void infix_advance(struct filter_parse_state *ps)
109668 {
109669+ if (!ps->infix.cnt)
109670+ return;
109671+
109672 ps->infix.cnt--;
109673 ps->infix.tail++;
109674 }
109675diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
109676index a51e796..1f32ebd 100644
109677--- a/kernel/trace/trace_functions_graph.c
109678+++ b/kernel/trace/trace_functions_graph.c
109679@@ -132,7 +132,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
109680
109681 /* The return trace stack is full */
109682 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
109683- atomic_inc(&current->trace_overrun);
109684+ atomic_inc_unchecked(&current->trace_overrun);
109685 return -EBUSY;
109686 }
109687
109688@@ -229,7 +229,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
109689 *ret = current->ret_stack[index].ret;
109690 trace->func = current->ret_stack[index].func;
109691 trace->calltime = current->ret_stack[index].calltime;
109692- trace->overrun = atomic_read(&current->trace_overrun);
109693+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
109694 trace->depth = index;
109695 }
109696
109697diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
109698index 7a9ba62..2e0e4a1 100644
109699--- a/kernel/trace/trace_mmiotrace.c
109700+++ b/kernel/trace/trace_mmiotrace.c
109701@@ -24,7 +24,7 @@ struct header_iter {
109702 static struct trace_array *mmio_trace_array;
109703 static bool overrun_detected;
109704 static unsigned long prev_overruns;
109705-static atomic_t dropped_count;
109706+static atomic_unchecked_t dropped_count;
109707
109708 static void mmio_reset_data(struct trace_array *tr)
109709 {
109710@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
109711
109712 static unsigned long count_overruns(struct trace_iterator *iter)
109713 {
109714- unsigned long cnt = atomic_xchg(&dropped_count, 0);
109715+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
109716 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
109717
109718 if (over > prev_overruns)
109719@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
109720 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
109721 sizeof(*entry), 0, pc);
109722 if (!event) {
109723- atomic_inc(&dropped_count);
109724+ atomic_inc_unchecked(&dropped_count);
109725 return;
109726 }
109727 entry = ring_buffer_event_data(event);
109728@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
109729 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
109730 sizeof(*entry), 0, pc);
109731 if (!event) {
109732- atomic_inc(&dropped_count);
109733+ atomic_inc_unchecked(&dropped_count);
109734 return;
109735 }
109736 entry = ring_buffer_event_data(event);
109737diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
109738index 25a086b..a918131 100644
109739--- a/kernel/trace/trace_output.c
109740+++ b/kernel/trace/trace_output.c
109741@@ -752,14 +752,16 @@ int register_ftrace_event(struct trace_event *event)
109742 goto out;
109743 }
109744
109745+ pax_open_kernel();
109746 if (event->funcs->trace == NULL)
109747- event->funcs->trace = trace_nop_print;
109748+ *(void **)&event->funcs->trace = trace_nop_print;
109749 if (event->funcs->raw == NULL)
109750- event->funcs->raw = trace_nop_print;
109751+ *(void **)&event->funcs->raw = trace_nop_print;
109752 if (event->funcs->hex == NULL)
109753- event->funcs->hex = trace_nop_print;
109754+ *(void **)&event->funcs->hex = trace_nop_print;
109755 if (event->funcs->binary == NULL)
109756- event->funcs->binary = trace_nop_print;
109757+ *(void **)&event->funcs->binary = trace_nop_print;
109758+ pax_close_kernel();
109759
109760 key = event->type & (EVENT_HASHSIZE - 1);
109761
109762diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
109763index e694c9f..6775a38 100644
109764--- a/kernel/trace/trace_seq.c
109765+++ b/kernel/trace/trace_seq.c
109766@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
109767 return 0;
109768 }
109769
109770- seq_buf_path(&s->seq, path, "\n");
109771+ seq_buf_path(&s->seq, path, "\n\\");
109772
109773 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
109774 s->seq.len = save_len;
109775diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
109776index 3f34496..0492d95 100644
109777--- a/kernel/trace/trace_stack.c
109778+++ b/kernel/trace/trace_stack.c
109779@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
109780 return;
109781
109782 /* we do not handle interrupt stacks yet */
109783- if (!object_is_on_stack(stack))
109784+ if (!object_starts_on_stack(stack))
109785 return;
109786
109787 local_irq_save(flags);
109788diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
109789index f97f6e3..d367b48 100644
109790--- a/kernel/trace/trace_syscalls.c
109791+++ b/kernel/trace/trace_syscalls.c
109792@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
109793 int num;
109794
109795 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109796+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109797+ return -EINVAL;
109798
109799 mutex_lock(&syscall_trace_lock);
109800 if (!sys_perf_refcount_enter)
109801@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
109802 int num;
109803
109804 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109805+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109806+ return;
109807
109808 mutex_lock(&syscall_trace_lock);
109809 sys_perf_refcount_enter--;
109810@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
109811 int num;
109812
109813 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109814+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109815+ return -EINVAL;
109816
109817 mutex_lock(&syscall_trace_lock);
109818 if (!sys_perf_refcount_exit)
109819@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
109820 int num;
109821
109822 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109823+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109824+ return;
109825
109826 mutex_lock(&syscall_trace_lock);
109827 sys_perf_refcount_exit--;
109828diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
109829index 4109f83..fe1f830 100644
109830--- a/kernel/user_namespace.c
109831+++ b/kernel/user_namespace.c
109832@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
109833 !kgid_has_mapping(parent_ns, group))
109834 return -EPERM;
109835
109836+#ifdef CONFIG_GRKERNSEC
109837+ /*
109838+ * This doesn't really inspire confidence:
109839+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
109840+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
109841+ * Increases kernel attack surface in areas developers
109842+ * previously cared little about ("low importance due
109843+ * to requiring "root" capability")
109844+ * To be removed when this code receives *proper* review
109845+ */
109846+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
109847+ !capable(CAP_SETGID))
109848+ return -EPERM;
109849+#endif
109850+
109851 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
109852 if (!ns)
109853 return -ENOMEM;
109854@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
109855 if (atomic_read(&current->mm->mm_users) > 1)
109856 return -EINVAL;
109857
109858- if (current->fs->users != 1)
109859+ if (atomic_read(&current->fs->users) != 1)
109860 return -EINVAL;
109861
109862 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
109863diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
109864index c8eac43..4b5f08f 100644
109865--- a/kernel/utsname_sysctl.c
109866+++ b/kernel/utsname_sysctl.c
109867@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
109868 static int proc_do_uts_string(struct ctl_table *table, int write,
109869 void __user *buffer, size_t *lenp, loff_t *ppos)
109870 {
109871- struct ctl_table uts_table;
109872+ ctl_table_no_const uts_table;
109873 int r;
109874 memcpy(&uts_table, table, sizeof(uts_table));
109875 uts_table.data = get_uts(table, write);
109876diff --git a/kernel/watchdog.c b/kernel/watchdog.c
109877index 581a68a..7ff6a89 100644
109878--- a/kernel/watchdog.c
109879+++ b/kernel/watchdog.c
109880@@ -648,7 +648,7 @@ void watchdog_nmi_enable_all(void) {}
109881 void watchdog_nmi_disable_all(void) {}
109882 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
109883
109884-static struct smp_hotplug_thread watchdog_threads = {
109885+static struct smp_hotplug_thread watchdog_threads __read_only = {
109886 .store = &softlockup_watchdog,
109887 .thread_should_run = watchdog_should_run,
109888 .thread_fn = watchdog,
109889diff --git a/kernel/workqueue.c b/kernel/workqueue.c
109890index 586ad91..5f8844a 100644
109891--- a/kernel/workqueue.c
109892+++ b/kernel/workqueue.c
109893@@ -4428,7 +4428,7 @@ static void rebind_workers(struct worker_pool *pool)
109894 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
109895 worker_flags |= WORKER_REBOUND;
109896 worker_flags &= ~WORKER_UNBOUND;
109897- ACCESS_ONCE(worker->flags) = worker_flags;
109898+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
109899 }
109900
109901 spin_unlock_irq(&pool->lock);
109902diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
109903index ba2b0c8..a571efc 100644
109904--- a/lib/Kconfig.debug
109905+++ b/lib/Kconfig.debug
109906@@ -936,7 +936,7 @@ config DEBUG_MUTEXES
109907
109908 config DEBUG_WW_MUTEX_SLOWPATH
109909 bool "Wait/wound mutex debugging: Slowpath testing"
109910- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109911+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109912 select DEBUG_LOCK_ALLOC
109913 select DEBUG_SPINLOCK
109914 select DEBUG_MUTEXES
109915@@ -953,7 +953,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
109916
109917 config DEBUG_LOCK_ALLOC
109918 bool "Lock debugging: detect incorrect freeing of live locks"
109919- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109920+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109921 select DEBUG_SPINLOCK
109922 select DEBUG_MUTEXES
109923 select LOCKDEP
109924@@ -967,7 +967,7 @@ config DEBUG_LOCK_ALLOC
109925
109926 config PROVE_LOCKING
109927 bool "Lock debugging: prove locking correctness"
109928- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109929+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109930 select LOCKDEP
109931 select DEBUG_SPINLOCK
109932 select DEBUG_MUTEXES
109933@@ -1018,7 +1018,7 @@ config LOCKDEP
109934
109935 config LOCK_STAT
109936 bool "Lock usage statistics"
109937- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109938+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109939 select LOCKDEP
109940 select DEBUG_SPINLOCK
109941 select DEBUG_MUTEXES
109942@@ -1496,6 +1496,7 @@ config LATENCYTOP
109943 depends on DEBUG_KERNEL
109944 depends on STACKTRACE_SUPPORT
109945 depends on PROC_FS
109946+ depends on !GRKERNSEC_HIDESYM
109947 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
109948 select KALLSYMS
109949 select KALLSYMS_ALL
109950@@ -1512,7 +1513,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109951 config DEBUG_STRICT_USER_COPY_CHECKS
109952 bool "Strict user copy size checks"
109953 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109954- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
109955+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
109956 help
109957 Enabling this option turns a certain set of sanity checks for user
109958 copy operations into compile time failures.
109959@@ -1643,7 +1644,7 @@ endmenu # runtime tests
109960
109961 config PROVIDE_OHCI1394_DMA_INIT
109962 bool "Remote debugging over FireWire early on boot"
109963- depends on PCI && X86
109964+ depends on PCI && X86 && !GRKERNSEC
109965 help
109966 If you want to debug problems which hang or crash the kernel early
109967 on boot and the crashing machine has a FireWire port, you can use
109968diff --git a/lib/Makefile b/lib/Makefile
109969index 6c37933..d48e7ca 100644
109970--- a/lib/Makefile
109971+++ b/lib/Makefile
109972@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
109973 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
109974 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
109975 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
109976-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
109977+obj-y += list_debug.o
109978 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
109979
109980 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
109981diff --git a/lib/average.c b/lib/average.c
109982index 114d1be..ab0350c 100644
109983--- a/lib/average.c
109984+++ b/lib/average.c
109985@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
109986 {
109987 unsigned long internal = ACCESS_ONCE(avg->internal);
109988
109989- ACCESS_ONCE(avg->internal) = internal ?
109990+ ACCESS_ONCE_RW(avg->internal) = internal ?
109991 (((internal << avg->weight) - internal) +
109992 (val << avg->factor)) >> avg->weight :
109993 (val << avg->factor);
109994diff --git a/lib/bitmap.c b/lib/bitmap.c
109995index 64c0926f..9de1a1f 100644
109996--- a/lib/bitmap.c
109997+++ b/lib/bitmap.c
109998@@ -234,7 +234,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
109999 }
110000 EXPORT_SYMBOL(__bitmap_subset);
110001
110002-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
110003+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
110004 {
110005 unsigned int k, lim = bits/BITS_PER_LONG;
110006 int w = 0;
110007@@ -361,7 +361,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
110008 {
110009 int c, old_c, totaldigits, ndigits, nchunks, nbits;
110010 u32 chunk;
110011- const char __user __force *ubuf = (const char __user __force *)buf;
110012+ const char __user *ubuf = (const char __force_user *)buf;
110013
110014 bitmap_zero(maskp, nmaskbits);
110015
110016@@ -446,7 +446,7 @@ int bitmap_parse_user(const char __user *ubuf,
110017 {
110018 if (!access_ok(VERIFY_READ, ubuf, ulen))
110019 return -EFAULT;
110020- return __bitmap_parse((const char __force *)ubuf,
110021+ return __bitmap_parse((const char __force_kernel *)ubuf,
110022 ulen, 1, maskp, nmaskbits);
110023
110024 }
110025@@ -505,7 +505,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
110026 {
110027 unsigned a, b;
110028 int c, old_c, totaldigits;
110029- const char __user __force *ubuf = (const char __user __force *)buf;
110030+ const char __user *ubuf = (const char __force_user *)buf;
110031 int exp_digit, in_range;
110032
110033 totaldigits = c = 0;
110034@@ -600,7 +600,7 @@ int bitmap_parselist_user(const char __user *ubuf,
110035 {
110036 if (!access_ok(VERIFY_READ, ubuf, ulen))
110037 return -EFAULT;
110038- return __bitmap_parselist((const char __force *)ubuf,
110039+ return __bitmap_parselist((const char __force_kernel *)ubuf,
110040 ulen, 1, maskp, nmaskbits);
110041 }
110042 EXPORT_SYMBOL(bitmap_parselist_user);
110043diff --git a/lib/bug.c b/lib/bug.c
110044index 0c3bd95..5a615a1 100644
110045--- a/lib/bug.c
110046+++ b/lib/bug.c
110047@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
110048 return BUG_TRAP_TYPE_NONE;
110049
110050 bug = find_bug(bugaddr);
110051+ if (!bug)
110052+ return BUG_TRAP_TYPE_NONE;
110053
110054 file = NULL;
110055 line = 0;
110056diff --git a/lib/debugobjects.c b/lib/debugobjects.c
110057index 547f7f9..a6d4ba0 100644
110058--- a/lib/debugobjects.c
110059+++ b/lib/debugobjects.c
110060@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
110061 if (limit > 4)
110062 return;
110063
110064- is_on_stack = object_is_on_stack(addr);
110065+ is_on_stack = object_starts_on_stack(addr);
110066 if (is_on_stack == onstack)
110067 return;
110068
110069diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
110070index 6dd0335..1e9c239 100644
110071--- a/lib/decompress_bunzip2.c
110072+++ b/lib/decompress_bunzip2.c
110073@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
110074
110075 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
110076 uncompressed data. Allocate intermediate buffer for block. */
110077- bd->dbufSize = 100000*(i-BZh0);
110078+ i -= BZh0;
110079+ bd->dbufSize = 100000 * i;
110080
110081 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
110082 if (!bd->dbuf)
110083diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
110084index 0be83af..4605e93 100644
110085--- a/lib/decompress_unlzma.c
110086+++ b/lib/decompress_unlzma.c
110087@@ -39,10 +39,10 @@
110088
110089 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
110090
110091-static long long INIT read_int(unsigned char *ptr, int size)
110092+static unsigned long long INIT read_int(unsigned char *ptr, int size)
110093 {
110094 int i;
110095- long long ret = 0;
110096+ unsigned long long ret = 0;
110097
110098 for (i = 0; i < size; i++)
110099 ret = (ret << 8) | ptr[size-i-1];
110100diff --git a/lib/div64.c b/lib/div64.c
110101index 19ea7ed..20cac21 100644
110102--- a/lib/div64.c
110103+++ b/lib/div64.c
110104@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
110105 EXPORT_SYMBOL(__div64_32);
110106
110107 #ifndef div_s64_rem
110108-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
110109+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
110110 {
110111 u64 quotient;
110112
110113@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
110114 * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
110115 */
110116 #ifndef div64_u64
110117-u64 div64_u64(u64 dividend, u64 divisor)
110118+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
110119 {
110120 u32 high = divisor >> 32;
110121 u64 quot;
110122diff --git a/lib/dma-debug.c b/lib/dma-debug.c
110123index ae4b65e..daf0230 100644
110124--- a/lib/dma-debug.c
110125+++ b/lib/dma-debug.c
110126@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
110127
110128 void dma_debug_add_bus(struct bus_type *bus)
110129 {
110130- struct notifier_block *nb;
110131+ notifier_block_no_const *nb;
110132
110133 if (dma_debug_disabled())
110134 return;
110135@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
110136
110137 static void check_for_stack(struct device *dev, void *addr)
110138 {
110139- if (object_is_on_stack(addr))
110140+ if (object_starts_on_stack(addr))
110141 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
110142 "stack [addr=%p]\n", addr);
110143 }
110144diff --git a/lib/inflate.c b/lib/inflate.c
110145index 013a761..c28f3fc 100644
110146--- a/lib/inflate.c
110147+++ b/lib/inflate.c
110148@@ -269,7 +269,7 @@ static void free(void *where)
110149 malloc_ptr = free_mem_ptr;
110150 }
110151 #else
110152-#define malloc(a) kmalloc(a, GFP_KERNEL)
110153+#define malloc(a) kmalloc((a), GFP_KERNEL)
110154 #define free(a) kfree(a)
110155 #endif
110156
110157diff --git a/lib/ioremap.c b/lib/ioremap.c
110158index 86c8911..f5bfc34 100644
110159--- a/lib/ioremap.c
110160+++ b/lib/ioremap.c
110161@@ -75,7 +75,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
110162 unsigned long next;
110163
110164 phys_addr -= addr;
110165- pmd = pmd_alloc(&init_mm, pud, addr);
110166+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
110167 if (!pmd)
110168 return -ENOMEM;
110169 do {
110170@@ -101,7 +101,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
110171 unsigned long next;
110172
110173 phys_addr -= addr;
110174- pud = pud_alloc(&init_mm, pgd, addr);
110175+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
110176 if (!pud)
110177 return -ENOMEM;
110178 do {
110179diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
110180index bd2bea9..6b3c95e 100644
110181--- a/lib/is_single_threaded.c
110182+++ b/lib/is_single_threaded.c
110183@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
110184 struct task_struct *p, *t;
110185 bool ret;
110186
110187+ if (!mm)
110188+ return true;
110189+
110190 if (atomic_read(&task->signal->live) != 1)
110191 return false;
110192
110193diff --git a/lib/kobject.c b/lib/kobject.c
110194index 3b841b9..7c215aa 100644
110195--- a/lib/kobject.c
110196+++ b/lib/kobject.c
110197@@ -340,8 +340,9 @@ error:
110198 }
110199 EXPORT_SYMBOL(kobject_init);
110200
110201-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
110202- const char *fmt, va_list vargs)
110203+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
110204+ struct kobject *parent,
110205+ const char *fmt, va_list vargs)
110206 {
110207 int retval;
110208
110209@@ -936,9 +937,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
110210
110211
110212 static DEFINE_SPINLOCK(kobj_ns_type_lock);
110213-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
110214+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
110215
110216-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110217+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110218 {
110219 enum kobj_ns_type type = ops->type;
110220 int error;
110221diff --git a/lib/list_debug.c b/lib/list_debug.c
110222index c24c2f7..f0296f4 100644
110223--- a/lib/list_debug.c
110224+++ b/lib/list_debug.c
110225@@ -11,7 +11,9 @@
110226 #include <linux/bug.h>
110227 #include <linux/kernel.h>
110228 #include <linux/rculist.h>
110229+#include <linux/mm.h>
110230
110231+#ifdef CONFIG_DEBUG_LIST
110232 /*
110233 * Insert a new entry between two known consecutive entries.
110234 *
110235@@ -19,21 +21,40 @@
110236 * the prev/next entries already!
110237 */
110238
110239+static bool __list_add_debug(struct list_head *new,
110240+ struct list_head *prev,
110241+ struct list_head *next)
110242+{
110243+ if (unlikely(next->prev != prev)) {
110244+ printk(KERN_ERR "list_add corruption. next->prev should be "
110245+ "prev (%p), but was %p. (next=%p).\n",
110246+ prev, next->prev, next);
110247+ BUG();
110248+ return false;
110249+ }
110250+ if (unlikely(prev->next != next)) {
110251+ printk(KERN_ERR "list_add corruption. prev->next should be "
110252+ "next (%p), but was %p. (prev=%p).\n",
110253+ next, prev->next, prev);
110254+ BUG();
110255+ return false;
110256+ }
110257+ if (unlikely(new == prev || new == next)) {
110258+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
110259+ new, prev, next);
110260+ BUG();
110261+ return false;
110262+ }
110263+ return true;
110264+}
110265+
110266 void __list_add(struct list_head *new,
110267- struct list_head *prev,
110268- struct list_head *next)
110269+ struct list_head *prev,
110270+ struct list_head *next)
110271 {
110272- WARN(next->prev != prev,
110273- "list_add corruption. next->prev should be "
110274- "prev (%p), but was %p. (next=%p).\n",
110275- prev, next->prev, next);
110276- WARN(prev->next != next,
110277- "list_add corruption. prev->next should be "
110278- "next (%p), but was %p. (prev=%p).\n",
110279- next, prev->next, prev);
110280- WARN(new == prev || new == next,
110281- "list_add double add: new=%p, prev=%p, next=%p.\n",
110282- new, prev, next);
110283+ if (!__list_add_debug(new, prev, next))
110284+ return;
110285+
110286 next->prev = new;
110287 new->next = next;
110288 new->prev = prev;
110289@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
110290 }
110291 EXPORT_SYMBOL(__list_add);
110292
110293-void __list_del_entry(struct list_head *entry)
110294+static bool __list_del_entry_debug(struct list_head *entry)
110295 {
110296 struct list_head *prev, *next;
110297
110298 prev = entry->prev;
110299 next = entry->next;
110300
110301- if (WARN(next == LIST_POISON1,
110302- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110303- entry, LIST_POISON1) ||
110304- WARN(prev == LIST_POISON2,
110305- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110306- entry, LIST_POISON2) ||
110307- WARN(prev->next != entry,
110308- "list_del corruption. prev->next should be %p, "
110309- "but was %p\n", entry, prev->next) ||
110310- WARN(next->prev != entry,
110311- "list_del corruption. next->prev should be %p, "
110312- "but was %p\n", entry, next->prev))
110313+ if (unlikely(next == LIST_POISON1)) {
110314+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110315+ entry, LIST_POISON1);
110316+ BUG();
110317+ return false;
110318+ }
110319+ if (unlikely(prev == LIST_POISON2)) {
110320+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110321+ entry, LIST_POISON2);
110322+ BUG();
110323+ return false;
110324+ }
110325+ if (unlikely(entry->prev->next != entry)) {
110326+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
110327+ "but was %p\n", entry, prev->next);
110328+ BUG();
110329+ return false;
110330+ }
110331+ if (unlikely(entry->next->prev != entry)) {
110332+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
110333+ "but was %p\n", entry, next->prev);
110334+ BUG();
110335+ return false;
110336+ }
110337+ return true;
110338+}
110339+
110340+void __list_del_entry(struct list_head *entry)
110341+{
110342+ if (!__list_del_entry_debug(entry))
110343 return;
110344
110345- __list_del(prev, next);
110346+ __list_del(entry->prev, entry->next);
110347 }
110348 EXPORT_SYMBOL(__list_del_entry);
110349
110350@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
110351 void __list_add_rcu(struct list_head *new,
110352 struct list_head *prev, struct list_head *next)
110353 {
110354- WARN(next->prev != prev,
110355- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
110356- prev, next->prev, next);
110357- WARN(prev->next != next,
110358- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
110359- next, prev->next, prev);
110360+ if (!__list_add_debug(new, prev, next))
110361+ return;
110362+
110363 new->next = next;
110364 new->prev = prev;
110365 rcu_assign_pointer(list_next_rcu(prev), new);
110366 next->prev = new;
110367 }
110368 EXPORT_SYMBOL(__list_add_rcu);
110369+#endif
110370+
110371+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
110372+{
110373+#ifdef CONFIG_DEBUG_LIST
110374+ if (!__list_add_debug(new, prev, next))
110375+ return;
110376+#endif
110377+
110378+ pax_open_kernel();
110379+ next->prev = new;
110380+ new->next = next;
110381+ new->prev = prev;
110382+ prev->next = new;
110383+ pax_close_kernel();
110384+}
110385+EXPORT_SYMBOL(__pax_list_add);
110386+
110387+void pax_list_del(struct list_head *entry)
110388+{
110389+#ifdef CONFIG_DEBUG_LIST
110390+ if (!__list_del_entry_debug(entry))
110391+ return;
110392+#endif
110393+
110394+ pax_open_kernel();
110395+ __list_del(entry->prev, entry->next);
110396+ entry->next = LIST_POISON1;
110397+ entry->prev = LIST_POISON2;
110398+ pax_close_kernel();
110399+}
110400+EXPORT_SYMBOL(pax_list_del);
110401+
110402+void pax_list_del_init(struct list_head *entry)
110403+{
110404+ pax_open_kernel();
110405+ __list_del(entry->prev, entry->next);
110406+ INIT_LIST_HEAD(entry);
110407+ pax_close_kernel();
110408+}
110409+EXPORT_SYMBOL(pax_list_del_init);
110410+
110411+void __pax_list_add_rcu(struct list_head *new,
110412+ struct list_head *prev, struct list_head *next)
110413+{
110414+#ifdef CONFIG_DEBUG_LIST
110415+ if (!__list_add_debug(new, prev, next))
110416+ return;
110417+#endif
110418+
110419+ pax_open_kernel();
110420+ new->next = next;
110421+ new->prev = prev;
110422+ rcu_assign_pointer(list_next_rcu(prev), new);
110423+ next->prev = new;
110424+ pax_close_kernel();
110425+}
110426+EXPORT_SYMBOL(__pax_list_add_rcu);
110427+
110428+void pax_list_del_rcu(struct list_head *entry)
110429+{
110430+#ifdef CONFIG_DEBUG_LIST
110431+ if (!__list_del_entry_debug(entry))
110432+ return;
110433+#endif
110434+
110435+ pax_open_kernel();
110436+ __list_del(entry->prev, entry->next);
110437+ entry->next = LIST_POISON1;
110438+ entry->prev = LIST_POISON2;
110439+ pax_close_kernel();
110440+}
110441+EXPORT_SYMBOL(pax_list_del_rcu);
110442diff --git a/lib/lockref.c b/lib/lockref.c
110443index 494994b..65caf94 100644
110444--- a/lib/lockref.c
110445+++ b/lib/lockref.c
110446@@ -48,13 +48,13 @@
110447 void lockref_get(struct lockref *lockref)
110448 {
110449 CMPXCHG_LOOP(
110450- new.count++;
110451+ __lockref_inc(&new);
110452 ,
110453 return;
110454 );
110455
110456 spin_lock(&lockref->lock);
110457- lockref->count++;
110458+ __lockref_inc(lockref);
110459 spin_unlock(&lockref->lock);
110460 }
110461 EXPORT_SYMBOL(lockref_get);
110462@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110463 int retval;
110464
110465 CMPXCHG_LOOP(
110466- new.count++;
110467- if (old.count <= 0)
110468+ __lockref_inc(&new);
110469+ if (__lockref_read(&old) <= 0)
110470 return 0;
110471 ,
110472 return 1;
110473@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110474
110475 spin_lock(&lockref->lock);
110476 retval = 0;
110477- if (lockref->count > 0) {
110478- lockref->count++;
110479+ if (__lockref_read(lockref) > 0) {
110480+ __lockref_inc(lockref);
110481 retval = 1;
110482 }
110483 spin_unlock(&lockref->lock);
110484@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
110485 int lockref_get_or_lock(struct lockref *lockref)
110486 {
110487 CMPXCHG_LOOP(
110488- new.count++;
110489- if (old.count <= 0)
110490+ __lockref_inc(&new);
110491+ if (__lockref_read(&old) <= 0)
110492 break;
110493 ,
110494 return 1;
110495 );
110496
110497 spin_lock(&lockref->lock);
110498- if (lockref->count <= 0)
110499+ if (__lockref_read(lockref) <= 0)
110500 return 0;
110501- lockref->count++;
110502+ __lockref_inc(lockref);
110503 spin_unlock(&lockref->lock);
110504 return 1;
110505 }
110506@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
110507 int lockref_put_return(struct lockref *lockref)
110508 {
110509 CMPXCHG_LOOP(
110510- new.count--;
110511- if (old.count <= 0)
110512+ __lockref_dec(&new);
110513+ if (__lockref_read(&old) <= 0)
110514 return -1;
110515 ,
110516- return new.count;
110517+ return __lockref_read(&new);
110518 );
110519 return -1;
110520 }
110521@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
110522 int lockref_put_or_lock(struct lockref *lockref)
110523 {
110524 CMPXCHG_LOOP(
110525- new.count--;
110526- if (old.count <= 1)
110527+ __lockref_dec(&new);
110528+ if (__lockref_read(&old) <= 1)
110529 break;
110530 ,
110531 return 1;
110532 );
110533
110534 spin_lock(&lockref->lock);
110535- if (lockref->count <= 1)
110536+ if (__lockref_read(lockref) <= 1)
110537 return 0;
110538- lockref->count--;
110539+ __lockref_dec(lockref);
110540 spin_unlock(&lockref->lock);
110541 return 1;
110542 }
110543@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
110544 void lockref_mark_dead(struct lockref *lockref)
110545 {
110546 assert_spin_locked(&lockref->lock);
110547- lockref->count = -128;
110548+ __lockref_set(lockref, -128);
110549 }
110550 EXPORT_SYMBOL(lockref_mark_dead);
110551
110552@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110553 int retval;
110554
110555 CMPXCHG_LOOP(
110556- new.count++;
110557- if (old.count < 0)
110558+ __lockref_inc(&new);
110559+ if (__lockref_read(&old) < 0)
110560 return 0;
110561 ,
110562 return 1;
110563@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110564
110565 spin_lock(&lockref->lock);
110566 retval = 0;
110567- if (lockref->count >= 0) {
110568- lockref->count++;
110569+ if (__lockref_read(lockref) >= 0) {
110570+ __lockref_inc(lockref);
110571 retval = 1;
110572 }
110573 spin_unlock(&lockref->lock);
110574diff --git a/lib/nlattr.c b/lib/nlattr.c
110575index f5907d2..36072be 100644
110576--- a/lib/nlattr.c
110577+++ b/lib/nlattr.c
110578@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
110579 {
110580 int minlen = min_t(int, count, nla_len(src));
110581
110582+ BUG_ON(minlen < 0);
110583+
110584 memcpy(dest, nla_data(src), minlen);
110585 if (count > minlen)
110586 memset(dest + minlen, 0, count - minlen);
110587diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
110588index 6111bcb..02e816b 100644
110589--- a/lib/percpu-refcount.c
110590+++ b/lib/percpu-refcount.c
110591@@ -31,7 +31,7 @@
110592 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
110593 */
110594
110595-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
110596+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
110597
110598 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
110599
110600diff --git a/lib/radix-tree.c b/lib/radix-tree.c
110601index 3d2aa27..a472f20 100644
110602--- a/lib/radix-tree.c
110603+++ b/lib/radix-tree.c
110604@@ -67,7 +67,7 @@ struct radix_tree_preload {
110605 int nr;
110606 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
110607 };
110608-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
110609+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
110610
110611 static inline void *ptr_to_indirect(void *ptr)
110612 {
110613diff --git a/lib/random32.c b/lib/random32.c
110614index 0bee183..526f12f 100644
110615--- a/lib/random32.c
110616+++ b/lib/random32.c
110617@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
110618 }
110619 #endif
110620
110621-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
110622+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
110623
110624 /**
110625 * prandom_u32_state - seeded pseudo-random number generator.
110626diff --git a/lib/rbtree.c b/lib/rbtree.c
110627index c16c81a..4dcbda1 100644
110628--- a/lib/rbtree.c
110629+++ b/lib/rbtree.c
110630@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
110631 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
110632
110633 static const struct rb_augment_callbacks dummy_callbacks = {
110634- dummy_propagate, dummy_copy, dummy_rotate
110635+ .propagate = dummy_propagate,
110636+ .copy = dummy_copy,
110637+ .rotate = dummy_rotate
110638 };
110639
110640 void rb_insert_color(struct rb_node *node, struct rb_root *root)
110641diff --git a/lib/show_mem.c b/lib/show_mem.c
110642index adc98e18..0ce83c2 100644
110643--- a/lib/show_mem.c
110644+++ b/lib/show_mem.c
110645@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
110646 quicklist_total_size());
110647 #endif
110648 #ifdef CONFIG_MEMORY_FAILURE
110649- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
110650+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
110651 #endif
110652 }
110653diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
110654index e0af6ff..fcc9f15 100644
110655--- a/lib/strncpy_from_user.c
110656+++ b/lib/strncpy_from_user.c
110657@@ -22,7 +22,7 @@
110658 */
110659 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
110660 {
110661- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110662+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110663 long res = 0;
110664
110665 /*
110666diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
110667index fe9a325..85cd8aa 100644
110668--- a/lib/strnlen_user.c
110669+++ b/lib/strnlen_user.c
110670@@ -26,7 +26,7 @@
110671 */
110672 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
110673 {
110674- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110675+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110676 long align, res = 0;
110677 unsigned long c;
110678
110679diff --git a/lib/swiotlb.c b/lib/swiotlb.c
110680index 3c365ab..75b43df 100644
110681--- a/lib/swiotlb.c
110682+++ b/lib/swiotlb.c
110683@@ -683,7 +683,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
110684
110685 void
110686 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
110687- dma_addr_t dev_addr)
110688+ dma_addr_t dev_addr, struct dma_attrs *attrs)
110689 {
110690 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
110691
110692diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
110693index c227cc4..5241df3 100644
110694--- a/lib/test-hexdump.c
110695+++ b/lib/test-hexdump.c
110696@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
110697 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
110698 };
110699
110700-static const char *test_data_2_le[] __initdata = {
110701+static const char * const test_data_2_le[] __initconst = {
110702 "32be", "7bdb", "180a", "b293",
110703 "ba70", "24c4", "837d", "9b34",
110704 "9ca6", "ad31", "0f9c", "e9ac",
110705 "d14c", "9919", "b143", "0caf",
110706 };
110707
110708-static const char *test_data_4_le[] __initdata = {
110709+static const char * const test_data_4_le[] __initconst = {
110710 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
110711 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
110712 };
110713
110714-static const char *test_data_8_le[] __initdata = {
110715+static const char * const test_data_8_le[] __initconst = {
110716 "b293180a7bdb32be", "9b34837d24c4ba70",
110717 "e9ac0f9cad319ca6", "0cafb1439919d14c",
110718 };
110719diff --git a/lib/usercopy.c b/lib/usercopy.c
110720index 4f5b1dd..7cab418 100644
110721--- a/lib/usercopy.c
110722+++ b/lib/usercopy.c
110723@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
110724 WARN(1, "Buffer overflow detected!\n");
110725 }
110726 EXPORT_SYMBOL(copy_from_user_overflow);
110727+
110728+void copy_to_user_overflow(void)
110729+{
110730+ WARN(1, "Buffer overflow detected!\n");
110731+}
110732+EXPORT_SYMBOL(copy_to_user_overflow);
110733diff --git a/lib/vsprintf.c b/lib/vsprintf.c
110734index da39c60..ac91239 100644
110735--- a/lib/vsprintf.c
110736+++ b/lib/vsprintf.c
110737@@ -16,6 +16,9 @@
110738 * - scnprintf and vscnprintf
110739 */
110740
110741+#ifdef CONFIG_GRKERNSEC_HIDESYM
110742+#define __INCLUDED_BY_HIDESYM 1
110743+#endif
110744 #include <stdarg.h>
110745 #include <linux/clk-provider.h>
110746 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
110747@@ -628,7 +631,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
110748 #ifdef CONFIG_KALLSYMS
110749 if (*fmt == 'B')
110750 sprint_backtrace(sym, value);
110751- else if (*fmt != 'f' && *fmt != 's')
110752+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
110753 sprint_symbol(sym, value);
110754 else
110755 sprint_symbol_no_offset(sym, value);
110756@@ -1360,7 +1363,11 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
110757 }
110758 }
110759
110760-int kptr_restrict __read_mostly;
110761+#ifdef CONFIG_GRKERNSEC_HIDESYM
110762+int kptr_restrict __read_only = 2;
110763+#else
110764+int kptr_restrict __read_only;
110765+#endif
110766
110767 /*
110768 * Show a '%p' thing. A kernel extension is that the '%p' is followed
110769@@ -1371,8 +1378,10 @@ int kptr_restrict __read_mostly;
110770 *
110771 * - 'F' For symbolic function descriptor pointers with offset
110772 * - 'f' For simple symbolic function names without offset
110773+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
110774 * - 'S' For symbolic direct pointers with offset
110775 * - 's' For symbolic direct pointers without offset
110776+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
110777 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
110778 * - 'B' For backtraced symbolic direct pointers with offset
110779 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
110780@@ -1460,12 +1469,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110781
110782 if (!ptr && *fmt != 'K') {
110783 /*
110784- * Print (null) with the same width as a pointer so it makes
110785+ * Print (nil) with the same width as a pointer so it makes
110786 * tabular output look nice.
110787 */
110788 if (spec.field_width == -1)
110789 spec.field_width = default_width;
110790- return string(buf, end, "(null)", spec);
110791+ return string(buf, end, "(nil)", spec);
110792 }
110793
110794 switch (*fmt) {
110795@@ -1475,6 +1484,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110796 /* Fallthrough */
110797 case 'S':
110798 case 's':
110799+#ifdef CONFIG_GRKERNSEC_HIDESYM
110800+ break;
110801+#else
110802+ return symbol_string(buf, end, ptr, spec, fmt);
110803+#endif
110804+ case 'X':
110805+ ptr = dereference_function_descriptor(ptr);
110806+ case 'A':
110807 case 'B':
110808 return symbol_string(buf, end, ptr, spec, fmt);
110809 case 'R':
110810@@ -1539,6 +1556,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110811 va_end(va);
110812 return buf;
110813 }
110814+ case 'P':
110815+ break;
110816 case 'K':
110817 /*
110818 * %pK cannot be used in IRQ context because its test
110819@@ -1598,6 +1617,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110820 ((const struct file *)ptr)->f_path.dentry,
110821 spec, fmt);
110822 }
110823+
110824+#ifdef CONFIG_GRKERNSEC_HIDESYM
110825+ /* 'P' = approved pointers to copy to userland,
110826+ as in the /proc/kallsyms case, as we make it display nothing
110827+ for non-root users, and the real contents for root users
110828+ 'X' = approved simple symbols
110829+ Also ignore 'K' pointers, since we force their NULLing for non-root users
110830+ above
110831+ */
110832+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
110833+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
110834+ dump_stack();
110835+ ptr = NULL;
110836+ }
110837+#endif
110838+
110839 spec.flags |= SMALL;
110840 if (spec.field_width == -1) {
110841 spec.field_width = default_width;
110842@@ -2296,11 +2331,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110843 typeof(type) value; \
110844 if (sizeof(type) == 8) { \
110845 args = PTR_ALIGN(args, sizeof(u32)); \
110846- *(u32 *)&value = *(u32 *)args; \
110847- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
110848+ *(u32 *)&value = *(const u32 *)args; \
110849+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
110850 } else { \
110851 args = PTR_ALIGN(args, sizeof(type)); \
110852- value = *(typeof(type) *)args; \
110853+ value = *(const typeof(type) *)args; \
110854 } \
110855 args += sizeof(type); \
110856 value; \
110857@@ -2363,7 +2398,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110858 case FORMAT_TYPE_STR: {
110859 const char *str_arg = args;
110860 args += strlen(str_arg) + 1;
110861- str = string(str, end, (char *)str_arg, spec);
110862+ str = string(str, end, str_arg, spec);
110863 break;
110864 }
110865
110866diff --git a/localversion-grsec b/localversion-grsec
110867new file mode 100644
110868index 0000000..7cd6065
110869--- /dev/null
110870+++ b/localversion-grsec
110871@@ -0,0 +1 @@
110872+-grsec
110873diff --git a/mm/Kconfig b/mm/Kconfig
110874index 390214d..f96e3b8 100644
110875--- a/mm/Kconfig
110876+++ b/mm/Kconfig
110877@@ -342,10 +342,11 @@ config KSM
110878 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
110879
110880 config DEFAULT_MMAP_MIN_ADDR
110881- int "Low address space to protect from user allocation"
110882+ int "Low address space to protect from user allocation"
110883 depends on MMU
110884- default 4096
110885- help
110886+ default 32768 if ALPHA || ARM || PARISC || SPARC32
110887+ default 65536
110888+ help
110889 This is the portion of low virtual memory which should be protected
110890 from userspace allocation. Keeping a user from writing to low pages
110891 can help reduce the impact of kernel NULL pointer bugs.
110892@@ -376,7 +377,7 @@ config MEMORY_FAILURE
110893
110894 config HWPOISON_INJECT
110895 tristate "HWPoison pages injector"
110896- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
110897+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
110898 select PROC_PAGE_MONITOR
110899
110900 config NOMMU_INITIAL_TRIM_EXCESS
110901diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
110902index 957d3da..1d34e20 100644
110903--- a/mm/Kconfig.debug
110904+++ b/mm/Kconfig.debug
110905@@ -10,6 +10,7 @@ config PAGE_EXTENSION
110906 config DEBUG_PAGEALLOC
110907 bool "Debug page memory allocations"
110908 depends on DEBUG_KERNEL
110909+ depends on !PAX_MEMORY_SANITIZE
110910 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
110911 depends on !KMEMCHECK
110912 select PAGE_EXTENSION
110913diff --git a/mm/backing-dev.c b/mm/backing-dev.c
110914index 000e7b3..aad2605 100644
110915--- a/mm/backing-dev.c
110916+++ b/mm/backing-dev.c
110917@@ -12,7 +12,7 @@
110918 #include <linux/device.h>
110919 #include <trace/events/writeback.h>
110920
110921-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
110922+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
110923
110924 struct backing_dev_info noop_backing_dev_info = {
110925 .name = "noop",
110926@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
110927 return err;
110928
110929 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
110930- atomic_long_inc_return(&bdi_seq));
110931+ atomic_long_inc_return_unchecked(&bdi_seq));
110932 if (err) {
110933 bdi_destroy(bdi);
110934 return err;
110935diff --git a/mm/cma_debug.c b/mm/cma_debug.c
110936index 7621ee3..f8e4b60 100644
110937--- a/mm/cma_debug.c
110938+++ b/mm/cma_debug.c
110939@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
110940
110941 mutex_lock(&cma->lock);
110942 /* pages counter is smaller than sizeof(int) */
110943- used = bitmap_weight(cma->bitmap, (int)cma->count);
110944+ used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
110945 mutex_unlock(&cma->lock);
110946 *val = (u64)used << cma->order_per_bit;
110947
110948@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
110949 struct cma *cma = data;
110950 unsigned long maxchunk = 0;
110951 unsigned long start, end = 0;
110952+ unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
110953
110954 mutex_lock(&cma->lock);
110955 for (;;) {
110956- start = find_next_zero_bit(cma->bitmap, cma->count, end);
110957+ start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
110958 if (start >= cma->count)
110959 break;
110960- end = find_next_bit(cma->bitmap, cma->count, start);
110961+ end = find_next_bit(cma->bitmap, bitmap_maxno, start);
110962 maxchunk = max(end - start, maxchunk);
110963 }
110964 mutex_unlock(&cma->lock);
110965@@ -170,10 +171,10 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
110966
110967 tmp = debugfs_create_dir(name, cma_debugfs_root);
110968
110969- debugfs_create_file("alloc", S_IWUSR, cma_debugfs_root, cma,
110970+ debugfs_create_file("alloc", S_IWUSR, tmp, cma,
110971 &cma_alloc_fops);
110972
110973- debugfs_create_file("free", S_IWUSR, cma_debugfs_root, cma,
110974+ debugfs_create_file("free", S_IWUSR, tmp, cma,
110975 &cma_free_fops);
110976
110977 debugfs_create_file("base_pfn", S_IRUGO, tmp,
110978diff --git a/mm/filemap.c b/mm/filemap.c
110979index 6bf5e42..1e631ee 100644
110980--- a/mm/filemap.c
110981+++ b/mm/filemap.c
110982@@ -2095,7 +2095,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
110983 struct address_space *mapping = file->f_mapping;
110984
110985 if (!mapping->a_ops->readpage)
110986- return -ENOEXEC;
110987+ return -ENODEV;
110988 file_accessed(file);
110989 vma->vm_ops = &generic_file_vm_ops;
110990 return 0;
110991@@ -2276,6 +2276,7 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
110992 pos = iocb->ki_pos;
110993
110994 if (limit != RLIM_INFINITY) {
110995+ gr_learn_resource(current, RLIMIT_FSIZE, iocb->ki_pos, 0);
110996 if (iocb->ki_pos >= limit) {
110997 send_sig(SIGXFSZ, current, 0);
110998 return -EFBIG;
110999diff --git a/mm/gup.c b/mm/gup.c
111000index 6297f6b..7652403 100644
111001--- a/mm/gup.c
111002+++ b/mm/gup.c
111003@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
111004 unsigned int fault_flags = 0;
111005 int ret;
111006
111007- /* For mm_populate(), just skip the stack guard page. */
111008- if ((*flags & FOLL_POPULATE) &&
111009- (stack_guard_page_start(vma, address) ||
111010- stack_guard_page_end(vma, address + PAGE_SIZE)))
111011- return -ENOENT;
111012 if (*flags & FOLL_WRITE)
111013 fault_flags |= FAULT_FLAG_WRITE;
111014 if (nonblocking)
111015@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
111016 if (!(gup_flags & FOLL_FORCE))
111017 gup_flags |= FOLL_NUMA;
111018
111019- do {
111020+ while (nr_pages) {
111021 struct page *page;
111022 unsigned int foll_flags = gup_flags;
111023 unsigned int page_increm;
111024
111025 /* first iteration or cross vma bound */
111026 if (!vma || start >= vma->vm_end) {
111027- vma = find_extend_vma(mm, start);
111028+ vma = find_vma(mm, start);
111029 if (!vma && in_gate_area(mm, start)) {
111030 int ret;
111031 ret = get_gate_page(mm, start & PAGE_MASK,
111032@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
111033 goto next_page;
111034 }
111035
111036- if (!vma || check_vma_flags(vma, gup_flags))
111037+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
111038 return i ? : -EFAULT;
111039 if (is_vm_hugetlb_page(vma)) {
111040 i = follow_hugetlb_page(mm, vma, pages, vmas,
111041@@ -509,7 +504,7 @@ next_page:
111042 i += page_increm;
111043 start += page_increm * PAGE_SIZE;
111044 nr_pages -= page_increm;
111045- } while (nr_pages);
111046+ }
111047 return i;
111048 }
111049 EXPORT_SYMBOL(__get_user_pages);
111050diff --git a/mm/highmem.c b/mm/highmem.c
111051index 123bcd3..0de52ba 100644
111052--- a/mm/highmem.c
111053+++ b/mm/highmem.c
111054@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
111055 * So no dangers, even with speculative execution.
111056 */
111057 page = pte_page(pkmap_page_table[i]);
111058+ pax_open_kernel();
111059 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
111060-
111061+ pax_close_kernel();
111062 set_page_address(page, NULL);
111063 need_flush = 1;
111064 }
111065@@ -259,9 +260,11 @@ start:
111066 }
111067 }
111068 vaddr = PKMAP_ADDR(last_pkmap_nr);
111069+
111070+ pax_open_kernel();
111071 set_pte_at(&init_mm, vaddr,
111072 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
111073-
111074+ pax_close_kernel();
111075 pkmap_count[last_pkmap_nr] = 1;
111076 set_page_address(page, (void *)vaddr);
111077
111078diff --git a/mm/hugetlb.c b/mm/hugetlb.c
111079index 271e443..c582971 100644
111080--- a/mm/hugetlb.c
111081+++ b/mm/hugetlb.c
111082@@ -2362,6 +2362,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
111083 struct ctl_table *table, int write,
111084 void __user *buffer, size_t *length, loff_t *ppos)
111085 {
111086+ ctl_table_no_const t;
111087 struct hstate *h = &default_hstate;
111088 unsigned long tmp = h->max_huge_pages;
111089 int ret;
111090@@ -2369,9 +2370,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
111091 if (!hugepages_supported())
111092 return -ENOTSUPP;
111093
111094- table->data = &tmp;
111095- table->maxlen = sizeof(unsigned long);
111096- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
111097+ t = *table;
111098+ t.data = &tmp;
111099+ t.maxlen = sizeof(unsigned long);
111100+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
111101 if (ret)
111102 goto out;
111103
111104@@ -2406,6 +2408,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
111105 struct hstate *h = &default_hstate;
111106 unsigned long tmp;
111107 int ret;
111108+ ctl_table_no_const hugetlb_table;
111109
111110 if (!hugepages_supported())
111111 return -ENOTSUPP;
111112@@ -2415,9 +2418,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
111113 if (write && hstate_is_gigantic(h))
111114 return -EINVAL;
111115
111116- table->data = &tmp;
111117- table->maxlen = sizeof(unsigned long);
111118- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
111119+ hugetlb_table = *table;
111120+ hugetlb_table.data = &tmp;
111121+ hugetlb_table.maxlen = sizeof(unsigned long);
111122+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
111123 if (ret)
111124 goto out;
111125
111126@@ -2907,6 +2911,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
111127 i_mmap_unlock_write(mapping);
111128 }
111129
111130+#ifdef CONFIG_PAX_SEGMEXEC
111131+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
111132+{
111133+ struct mm_struct *mm = vma->vm_mm;
111134+ struct vm_area_struct *vma_m;
111135+ unsigned long address_m;
111136+ pte_t *ptep_m;
111137+
111138+ vma_m = pax_find_mirror_vma(vma);
111139+ if (!vma_m)
111140+ return;
111141+
111142+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111143+ address_m = address + SEGMEXEC_TASK_SIZE;
111144+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
111145+ get_page(page_m);
111146+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
111147+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
111148+}
111149+#endif
111150+
111151 /*
111152 * Hugetlb_cow() should be called with page lock of the original hugepage held.
111153 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
111154@@ -3020,6 +3045,11 @@ retry_avoidcopy:
111155 make_huge_pte(vma, new_page, 1));
111156 page_remove_rmap(old_page);
111157 hugepage_add_new_anon_rmap(new_page, vma, address);
111158+
111159+#ifdef CONFIG_PAX_SEGMEXEC
111160+ pax_mirror_huge_pte(vma, address, new_page);
111161+#endif
111162+
111163 /* Make the old page be freed below */
111164 new_page = old_page;
111165 }
111166@@ -3181,6 +3211,10 @@ retry:
111167 && (vma->vm_flags & VM_SHARED)));
111168 set_huge_pte_at(mm, address, ptep, new_pte);
111169
111170+#ifdef CONFIG_PAX_SEGMEXEC
111171+ pax_mirror_huge_pte(vma, address, page);
111172+#endif
111173+
111174 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
111175 /* Optimization, do the COW without a second fault */
111176 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
111177@@ -3248,6 +3282,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111178 struct address_space *mapping;
111179 int need_wait_lock = 0;
111180
111181+#ifdef CONFIG_PAX_SEGMEXEC
111182+ struct vm_area_struct *vma_m;
111183+#endif
111184+
111185 address &= huge_page_mask(h);
111186
111187 ptep = huge_pte_offset(mm, address);
111188@@ -3261,6 +3299,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111189 VM_FAULT_SET_HINDEX(hstate_index(h));
111190 }
111191
111192+#ifdef CONFIG_PAX_SEGMEXEC
111193+ vma_m = pax_find_mirror_vma(vma);
111194+ if (vma_m) {
111195+ unsigned long address_m;
111196+
111197+ if (vma->vm_start > vma_m->vm_start) {
111198+ address_m = address;
111199+ address -= SEGMEXEC_TASK_SIZE;
111200+ vma = vma_m;
111201+ h = hstate_vma(vma);
111202+ } else
111203+ address_m = address + SEGMEXEC_TASK_SIZE;
111204+
111205+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
111206+ return VM_FAULT_OOM;
111207+ address_m &= HPAGE_MASK;
111208+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
111209+ }
111210+#endif
111211+
111212 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
111213 if (!ptep)
111214 return VM_FAULT_OOM;
111215diff --git a/mm/internal.h b/mm/internal.h
111216index a25e359..e2c96e9 100644
111217--- a/mm/internal.h
111218+++ b/mm/internal.h
111219@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
111220
111221 extern int __isolate_free_page(struct page *page, unsigned int order);
111222 extern void __free_pages_bootmem(struct page *page, unsigned int order);
111223+extern void free_compound_page(struct page *page);
111224 extern void prep_compound_page(struct page *page, unsigned long order);
111225 #ifdef CONFIG_MEMORY_FAILURE
111226 extern bool is_free_buddy_page(struct page *page);
111227@@ -413,7 +414,7 @@ extern u32 hwpoison_filter_enable;
111228
111229 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
111230 unsigned long, unsigned long,
111231- unsigned long, unsigned long);
111232+ unsigned long, unsigned long) __intentional_overflow(-1);
111233
111234 extern void set_pageblock_order(void);
111235 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
111236diff --git a/mm/kmemleak.c b/mm/kmemleak.c
111237index 3716cdb..25b97dc 100644
111238--- a/mm/kmemleak.c
111239+++ b/mm/kmemleak.c
111240@@ -368,7 +368,7 @@ static void print_unreferenced(struct seq_file *seq,
111241
111242 for (i = 0; i < object->trace_len; i++) {
111243 void *ptr = (void *)object->trace[i];
111244- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
111245+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
111246 }
111247 }
111248
111249@@ -1926,7 +1926,7 @@ static int __init kmemleak_late_init(void)
111250 return -ENOMEM;
111251 }
111252
111253- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
111254+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
111255 &kmemleak_fops);
111256 if (!dentry)
111257 pr_warning("Failed to create the debugfs kmemleak file\n");
111258diff --git a/mm/maccess.c b/mm/maccess.c
111259index d53adf9..03a24bf 100644
111260--- a/mm/maccess.c
111261+++ b/mm/maccess.c
111262@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
111263 set_fs(KERNEL_DS);
111264 pagefault_disable();
111265 ret = __copy_from_user_inatomic(dst,
111266- (__force const void __user *)src, size);
111267+ (const void __force_user *)src, size);
111268 pagefault_enable();
111269 set_fs(old_fs);
111270
111271@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
111272
111273 set_fs(KERNEL_DS);
111274 pagefault_disable();
111275- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
111276+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
111277 pagefault_enable();
111278 set_fs(old_fs);
111279
111280diff --git a/mm/madvise.c b/mm/madvise.c
111281index d551475..8fdd7f3 100644
111282--- a/mm/madvise.c
111283+++ b/mm/madvise.c
111284@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
111285 pgoff_t pgoff;
111286 unsigned long new_flags = vma->vm_flags;
111287
111288+#ifdef CONFIG_PAX_SEGMEXEC
111289+ struct vm_area_struct *vma_m;
111290+#endif
111291+
111292 switch (behavior) {
111293 case MADV_NORMAL:
111294 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
111295@@ -126,6 +130,13 @@ success:
111296 /*
111297 * vm_flags is protected by the mmap_sem held in write mode.
111298 */
111299+
111300+#ifdef CONFIG_PAX_SEGMEXEC
111301+ vma_m = pax_find_mirror_vma(vma);
111302+ if (vma_m)
111303+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
111304+#endif
111305+
111306 vma->vm_flags = new_flags;
111307
111308 out:
111309@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
111310 struct vm_area_struct **prev,
111311 unsigned long start, unsigned long end)
111312 {
111313+
111314+#ifdef CONFIG_PAX_SEGMEXEC
111315+ struct vm_area_struct *vma_m;
111316+#endif
111317+
111318 *prev = vma;
111319 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111320 return -EINVAL;
111321
111322 zap_page_range(vma, start, end - start, NULL);
111323+
111324+#ifdef CONFIG_PAX_SEGMEXEC
111325+ vma_m = pax_find_mirror_vma(vma);
111326+ if (vma_m) {
111327+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111328+ return -EINVAL;
111329+
111330+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
111331+ }
111332+#endif
111333+
111334 return 0;
111335 }
111336
111337@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
111338 if (end < start)
111339 return error;
111340
111341+#ifdef CONFIG_PAX_SEGMEXEC
111342+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
111343+ if (end > SEGMEXEC_TASK_SIZE)
111344+ return error;
111345+ } else
111346+#endif
111347+
111348+ if (end > TASK_SIZE)
111349+ return error;
111350+
111351 error = 0;
111352 if (end == start)
111353 return error;
111354diff --git a/mm/memory-failure.c b/mm/memory-failure.c
111355index 501820c..9612bcf 100644
111356--- a/mm/memory-failure.c
111357+++ b/mm/memory-failure.c
111358@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
111359
111360 int sysctl_memory_failure_recovery __read_mostly = 1;
111361
111362-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111363+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111364
111365 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
111366
111367@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
111368 pfn, t->comm, t->pid);
111369 si.si_signo = SIGBUS;
111370 si.si_errno = 0;
111371- si.si_addr = (void *)addr;
111372+ si.si_addr = (void __user *)addr;
111373 #ifdef __ARCH_SI_TRAPNO
111374 si.si_trapno = trapno;
111375 #endif
111376@@ -825,7 +825,7 @@ static struct page_state {
111377 unsigned long res;
111378 enum action_page_type type;
111379 int (*action)(struct page *p, unsigned long pfn);
111380-} error_states[] = {
111381+} __do_const error_states[] = {
111382 { reserved, reserved, MSG_KERNEL, me_kernel },
111383 /*
111384 * free pages are specially detected outside this table:
111385@@ -1133,7 +1133,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111386 nr_pages = 1 << compound_order(hpage);
111387 else /* normal page or thp */
111388 nr_pages = 1;
111389- atomic_long_add(nr_pages, &num_poisoned_pages);
111390+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
111391
111392 /*
111393 * We need/can do nothing about count=0 pages.
111394@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111395 if (PageHWPoison(hpage)) {
111396 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
111397 || (p != hpage && TestSetPageHWPoison(hpage))) {
111398- atomic_long_sub(nr_pages, &num_poisoned_pages);
111399+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111400 unlock_page(hpage);
111401 return 0;
111402 }
111403@@ -1231,14 +1231,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111404 */
111405 if (!PageHWPoison(p)) {
111406 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
111407- atomic_long_sub(nr_pages, &num_poisoned_pages);
111408+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111409 put_page(hpage);
111410 res = 0;
111411 goto out;
111412 }
111413 if (hwpoison_filter(p)) {
111414 if (TestClearPageHWPoison(p))
111415- atomic_long_sub(nr_pages, &num_poisoned_pages);
111416+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111417 unlock_page(hpage);
111418 put_page(hpage);
111419 return 0;
111420@@ -1467,7 +1467,7 @@ int unpoison_memory(unsigned long pfn)
111421 return 0;
111422 }
111423 if (TestClearPageHWPoison(p))
111424- atomic_long_dec(&num_poisoned_pages);
111425+ atomic_long_dec_unchecked(&num_poisoned_pages);
111426 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
111427 return 0;
111428 }
111429@@ -1481,7 +1481,7 @@ int unpoison_memory(unsigned long pfn)
111430 */
111431 if (TestClearPageHWPoison(page)) {
111432 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
111433- atomic_long_sub(nr_pages, &num_poisoned_pages);
111434+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111435 freeit = 1;
111436 if (PageHuge(page))
111437 clear_page_hwpoison_huge_page(page);
111438@@ -1616,11 +1616,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
111439 if (PageHuge(page)) {
111440 set_page_hwpoison_huge_page(hpage);
111441 dequeue_hwpoisoned_huge_page(hpage);
111442- atomic_long_add(1 << compound_order(hpage),
111443+ atomic_long_add_unchecked(1 << compound_order(hpage),
111444 &num_poisoned_pages);
111445 } else {
111446 SetPageHWPoison(page);
111447- atomic_long_inc(&num_poisoned_pages);
111448+ atomic_long_inc_unchecked(&num_poisoned_pages);
111449 }
111450 }
111451 return ret;
111452@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
111453 put_page(page);
111454 pr_info("soft_offline: %#lx: invalidated\n", pfn);
111455 SetPageHWPoison(page);
111456- atomic_long_inc(&num_poisoned_pages);
111457+ atomic_long_inc_unchecked(&num_poisoned_pages);
111458 return 0;
111459 }
111460
111461@@ -1708,7 +1708,7 @@ static int __soft_offline_page(struct page *page, int flags)
111462 if (!is_free_buddy_page(page))
111463 pr_info("soft offline: %#lx: page leaked\n",
111464 pfn);
111465- atomic_long_inc(&num_poisoned_pages);
111466+ atomic_long_inc_unchecked(&num_poisoned_pages);
111467 }
111468 } else {
111469 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
111470@@ -1778,11 +1778,11 @@ int soft_offline_page(struct page *page, int flags)
111471 if (PageHuge(page)) {
111472 set_page_hwpoison_huge_page(hpage);
111473 if (!dequeue_hwpoisoned_huge_page(hpage))
111474- atomic_long_add(1 << compound_order(hpage),
111475+ atomic_long_add_unchecked(1 << compound_order(hpage),
111476 &num_poisoned_pages);
111477 } else {
111478 if (!TestSetPageHWPoison(page))
111479- atomic_long_inc(&num_poisoned_pages);
111480+ atomic_long_inc_unchecked(&num_poisoned_pages);
111481 }
111482 }
111483 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
111484diff --git a/mm/memory.c b/mm/memory.c
111485index 22e037e..347d230 100644
111486--- a/mm/memory.c
111487+++ b/mm/memory.c
111488@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111489 free_pte_range(tlb, pmd, addr);
111490 } while (pmd++, addr = next, addr != end);
111491
111492+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
111493 start &= PUD_MASK;
111494 if (start < floor)
111495 return;
111496@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111497 pud_clear(pud);
111498 pmd_free_tlb(tlb, pmd, start);
111499 mm_dec_nr_pmds(tlb->mm);
111500+#endif
111501 }
111502
111503 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111504@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111505 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
111506 } while (pud++, addr = next, addr != end);
111507
111508+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
111509 start &= PGDIR_MASK;
111510 if (start < floor)
111511 return;
111512@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111513 pud = pud_offset(pgd, start);
111514 pgd_clear(pgd);
111515 pud_free_tlb(tlb, pud, start);
111516+#endif
111517+
111518 }
111519
111520 /*
111521@@ -690,7 +695,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
111522 /*
111523 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
111524 */
111525- pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n",
111526+ pr_alert("file:%pD fault:%pX mmap:%pX readpage:%pX\n",
111527 vma->vm_file,
111528 vma->vm_ops ? vma->vm_ops->fault : NULL,
111529 vma->vm_file ? vma->vm_file->f_op->mmap : NULL,
111530@@ -1463,6 +1468,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
111531 page_add_file_rmap(page);
111532 set_pte_at(mm, addr, pte, mk_pte(page, prot));
111533
111534+#ifdef CONFIG_PAX_SEGMEXEC
111535+ pax_mirror_file_pte(vma, addr, page, ptl);
111536+#endif
111537+
111538 retval = 0;
111539 pte_unmap_unlock(pte, ptl);
111540 return retval;
111541@@ -1507,9 +1516,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
111542 if (!page_count(page))
111543 return -EINVAL;
111544 if (!(vma->vm_flags & VM_MIXEDMAP)) {
111545+
111546+#ifdef CONFIG_PAX_SEGMEXEC
111547+ struct vm_area_struct *vma_m;
111548+#endif
111549+
111550 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
111551 BUG_ON(vma->vm_flags & VM_PFNMAP);
111552 vma->vm_flags |= VM_MIXEDMAP;
111553+
111554+#ifdef CONFIG_PAX_SEGMEXEC
111555+ vma_m = pax_find_mirror_vma(vma);
111556+ if (vma_m)
111557+ vma_m->vm_flags |= VM_MIXEDMAP;
111558+#endif
111559+
111560 }
111561 return insert_page(vma, addr, page, vma->vm_page_prot);
111562 }
111563@@ -1592,6 +1613,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
111564 unsigned long pfn)
111565 {
111566 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
111567+ BUG_ON(vma->vm_mirror);
111568
111569 if (addr < vma->vm_start || addr >= vma->vm_end)
111570 return -EFAULT;
111571@@ -1839,7 +1861,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
111572
111573 BUG_ON(pud_huge(*pud));
111574
111575- pmd = pmd_alloc(mm, pud, addr);
111576+ pmd = (mm == &init_mm) ?
111577+ pmd_alloc_kernel(mm, pud, addr) :
111578+ pmd_alloc(mm, pud, addr);
111579 if (!pmd)
111580 return -ENOMEM;
111581 do {
111582@@ -1859,7 +1883,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
111583 unsigned long next;
111584 int err;
111585
111586- pud = pud_alloc(mm, pgd, addr);
111587+ pud = (mm == &init_mm) ?
111588+ pud_alloc_kernel(mm, pgd, addr) :
111589+ pud_alloc(mm, pgd, addr);
111590 if (!pud)
111591 return -ENOMEM;
111592 do {
111593@@ -2040,6 +2066,185 @@ static inline int wp_page_reuse(struct mm_struct *mm,
111594 return VM_FAULT_WRITE;
111595 }
111596
111597+#ifdef CONFIG_PAX_SEGMEXEC
111598+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
111599+{
111600+ struct mm_struct *mm = vma->vm_mm;
111601+ spinlock_t *ptl;
111602+ pte_t *pte, entry;
111603+
111604+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
111605+ entry = *pte;
111606+ if (!pte_present(entry)) {
111607+ if (!pte_none(entry)) {
111608+ free_swap_and_cache(pte_to_swp_entry(entry));
111609+ pte_clear_not_present_full(mm, address, pte, 0);
111610+ }
111611+ } else {
111612+ struct page *page;
111613+
111614+ flush_cache_page(vma, address, pte_pfn(entry));
111615+ entry = ptep_clear_flush(vma, address, pte);
111616+ BUG_ON(pte_dirty(entry));
111617+ page = vm_normal_page(vma, address, entry);
111618+ if (page) {
111619+ update_hiwater_rss(mm);
111620+ if (PageAnon(page))
111621+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111622+ else
111623+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111624+ page_remove_rmap(page);
111625+ page_cache_release(page);
111626+ }
111627+ }
111628+ pte_unmap_unlock(pte, ptl);
111629+}
111630+
111631+/* PaX: if vma is mirrored, synchronize the mirror's PTE
111632+ *
111633+ * the ptl of the lower mapped page is held on entry and is not released on exit
111634+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
111635+ */
111636+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111637+{
111638+ struct mm_struct *mm = vma->vm_mm;
111639+ unsigned long address_m;
111640+ spinlock_t *ptl_m;
111641+ struct vm_area_struct *vma_m;
111642+ pmd_t *pmd_m;
111643+ pte_t *pte_m, entry_m;
111644+
111645+ BUG_ON(!page_m || !PageAnon(page_m));
111646+
111647+ vma_m = pax_find_mirror_vma(vma);
111648+ if (!vma_m)
111649+ return;
111650+
111651+ BUG_ON(!PageLocked(page_m));
111652+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111653+ address_m = address + SEGMEXEC_TASK_SIZE;
111654+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111655+ pte_m = pte_offset_map(pmd_m, address_m);
111656+ ptl_m = pte_lockptr(mm, pmd_m);
111657+ if (ptl != ptl_m) {
111658+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111659+ if (!pte_none(*pte_m))
111660+ goto out;
111661+ }
111662+
111663+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111664+ page_cache_get(page_m);
111665+ page_add_anon_rmap(page_m, vma_m, address_m);
111666+ inc_mm_counter_fast(mm, MM_ANONPAGES);
111667+ set_pte_at(mm, address_m, pte_m, entry_m);
111668+ update_mmu_cache(vma_m, address_m, pte_m);
111669+out:
111670+ if (ptl != ptl_m)
111671+ spin_unlock(ptl_m);
111672+ pte_unmap(pte_m);
111673+ unlock_page(page_m);
111674+}
111675+
111676+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111677+{
111678+ struct mm_struct *mm = vma->vm_mm;
111679+ unsigned long address_m;
111680+ spinlock_t *ptl_m;
111681+ struct vm_area_struct *vma_m;
111682+ pmd_t *pmd_m;
111683+ pte_t *pte_m, entry_m;
111684+
111685+ BUG_ON(!page_m || PageAnon(page_m));
111686+
111687+ vma_m = pax_find_mirror_vma(vma);
111688+ if (!vma_m)
111689+ return;
111690+
111691+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111692+ address_m = address + SEGMEXEC_TASK_SIZE;
111693+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111694+ pte_m = pte_offset_map(pmd_m, address_m);
111695+ ptl_m = pte_lockptr(mm, pmd_m);
111696+ if (ptl != ptl_m) {
111697+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111698+ if (!pte_none(*pte_m))
111699+ goto out;
111700+ }
111701+
111702+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111703+ page_cache_get(page_m);
111704+ page_add_file_rmap(page_m);
111705+ inc_mm_counter_fast(mm, MM_FILEPAGES);
111706+ set_pte_at(mm, address_m, pte_m, entry_m);
111707+ update_mmu_cache(vma_m, address_m, pte_m);
111708+out:
111709+ if (ptl != ptl_m)
111710+ spin_unlock(ptl_m);
111711+ pte_unmap(pte_m);
111712+}
111713+
111714+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
111715+{
111716+ struct mm_struct *mm = vma->vm_mm;
111717+ unsigned long address_m;
111718+ spinlock_t *ptl_m;
111719+ struct vm_area_struct *vma_m;
111720+ pmd_t *pmd_m;
111721+ pte_t *pte_m, entry_m;
111722+
111723+ vma_m = pax_find_mirror_vma(vma);
111724+ if (!vma_m)
111725+ return;
111726+
111727+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111728+ address_m = address + SEGMEXEC_TASK_SIZE;
111729+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111730+ pte_m = pte_offset_map(pmd_m, address_m);
111731+ ptl_m = pte_lockptr(mm, pmd_m);
111732+ if (ptl != ptl_m) {
111733+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111734+ if (!pte_none(*pte_m))
111735+ goto out;
111736+ }
111737+
111738+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
111739+ set_pte_at(mm, address_m, pte_m, entry_m);
111740+out:
111741+ if (ptl != ptl_m)
111742+ spin_unlock(ptl_m);
111743+ pte_unmap(pte_m);
111744+}
111745+
111746+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
111747+{
111748+ struct page *page_m;
111749+ pte_t entry;
111750+
111751+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
111752+ goto out;
111753+
111754+ entry = *pte;
111755+ page_m = vm_normal_page(vma, address, entry);
111756+ if (!page_m)
111757+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
111758+ else if (PageAnon(page_m)) {
111759+ if (pax_find_mirror_vma(vma)) {
111760+ pte_unmap_unlock(pte, ptl);
111761+ lock_page(page_m);
111762+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
111763+ if (pte_same(entry, *pte))
111764+ pax_mirror_anon_pte(vma, address, page_m, ptl);
111765+ else
111766+ unlock_page(page_m);
111767+ }
111768+ } else
111769+ pax_mirror_file_pte(vma, address, page_m, ptl);
111770+
111771+out:
111772+ pte_unmap_unlock(pte, ptl);
111773+}
111774+#endif
111775+
111776 /*
111777 * Handle the case of a page which we actually need to copy to a new page.
111778 *
111779@@ -2093,6 +2298,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111780 */
111781 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111782 if (likely(pte_same(*page_table, orig_pte))) {
111783+
111784+#ifdef CONFIG_PAX_SEGMEXEC
111785+ if (pax_find_mirror_vma(vma))
111786+ BUG_ON(!trylock_page(new_page));
111787+#endif
111788+
111789 if (old_page) {
111790 if (!PageAnon(old_page)) {
111791 dec_mm_counter_fast(mm, MM_FILEPAGES);
111792@@ -2147,6 +2358,10 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111793 page_remove_rmap(old_page);
111794 }
111795
111796+#ifdef CONFIG_PAX_SEGMEXEC
111797+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111798+#endif
111799+
111800 /* Free the old page.. */
111801 new_page = old_page;
111802 page_copied = 1;
111803@@ -2578,6 +2793,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111804 swap_free(entry);
111805 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
111806 try_to_free_swap(page);
111807+
111808+#ifdef CONFIG_PAX_SEGMEXEC
111809+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
111810+#endif
111811+
111812 unlock_page(page);
111813 if (page != swapcache) {
111814 /*
111815@@ -2601,6 +2821,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111816
111817 /* No need to invalidate - it was non-present before */
111818 update_mmu_cache(vma, address, page_table);
111819+
111820+#ifdef CONFIG_PAX_SEGMEXEC
111821+ pax_mirror_anon_pte(vma, address, page, ptl);
111822+#endif
111823+
111824 unlock:
111825 pte_unmap_unlock(page_table, ptl);
111826 out:
111827@@ -2620,40 +2845,6 @@ out_release:
111828 }
111829
111830 /*
111831- * This is like a special single-page "expand_{down|up}wards()",
111832- * except we must first make sure that 'address{-|+}PAGE_SIZE'
111833- * doesn't hit another vma.
111834- */
111835-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
111836-{
111837- address &= PAGE_MASK;
111838- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
111839- struct vm_area_struct *prev = vma->vm_prev;
111840-
111841- /*
111842- * Is there a mapping abutting this one below?
111843- *
111844- * That's only ok if it's the same stack mapping
111845- * that has gotten split..
111846- */
111847- if (prev && prev->vm_end == address)
111848- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
111849-
111850- return expand_downwards(vma, address - PAGE_SIZE);
111851- }
111852- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
111853- struct vm_area_struct *next = vma->vm_next;
111854-
111855- /* As VM_GROWSDOWN but s/below/above/ */
111856- if (next && next->vm_start == address + PAGE_SIZE)
111857- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
111858-
111859- return expand_upwards(vma, address + PAGE_SIZE);
111860- }
111861- return 0;
111862-}
111863-
111864-/*
111865 * We enter with non-exclusive mmap_sem (to exclude vma changes,
111866 * but allow concurrent faults), and pte mapped but not yet locked.
111867 * We return with mmap_sem still held, but pte unmapped and unlocked.
111868@@ -2663,27 +2854,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111869 unsigned int flags)
111870 {
111871 struct mem_cgroup *memcg;
111872- struct page *page;
111873+ struct page *page = NULL;
111874 spinlock_t *ptl;
111875 pte_t entry;
111876
111877- pte_unmap(page_table);
111878-
111879- /* Check if we need to add a guard page to the stack */
111880- if (check_stack_guard_page(vma, address) < 0)
111881- return VM_FAULT_SIGSEGV;
111882-
111883- /* Use the zero-page for reads */
111884 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
111885 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
111886 vma->vm_page_prot));
111887- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111888+ ptl = pte_lockptr(mm, pmd);
111889+ spin_lock(ptl);
111890 if (!pte_none(*page_table))
111891 goto unlock;
111892 goto setpte;
111893 }
111894
111895 /* Allocate our own private page. */
111896+ pte_unmap(page_table);
111897+
111898 if (unlikely(anon_vma_prepare(vma)))
111899 goto oom;
111900 page = alloc_zeroed_user_highpage_movable(vma, address);
111901@@ -2707,6 +2894,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111902 if (!pte_none(*page_table))
111903 goto release;
111904
111905+#ifdef CONFIG_PAX_SEGMEXEC
111906+ if (pax_find_mirror_vma(vma))
111907+ BUG_ON(!trylock_page(page));
111908+#endif
111909+
111910 inc_mm_counter_fast(mm, MM_ANONPAGES);
111911 page_add_new_anon_rmap(page, vma, address);
111912 mem_cgroup_commit_charge(page, memcg, false);
111913@@ -2716,6 +2908,12 @@ setpte:
111914
111915 /* No need to invalidate - it was non-present before */
111916 update_mmu_cache(vma, address, page_table);
111917+
111918+#ifdef CONFIG_PAX_SEGMEXEC
111919+ if (page)
111920+ pax_mirror_anon_pte(vma, address, page, ptl);
111921+#endif
111922+
111923 unlock:
111924 pte_unmap_unlock(page_table, ptl);
111925 return 0;
111926@@ -2948,6 +3146,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111927 return ret;
111928 }
111929 do_set_pte(vma, address, fault_page, pte, false, false);
111930+
111931+#ifdef CONFIG_PAX_SEGMEXEC
111932+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111933+#endif
111934+
111935 unlock_page(fault_page);
111936 unlock_out:
111937 pte_unmap_unlock(pte, ptl);
111938@@ -2999,7 +3202,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111939 }
111940 goto uncharge_out;
111941 }
111942+
111943+#ifdef CONFIG_PAX_SEGMEXEC
111944+ if (pax_find_mirror_vma(vma))
111945+ BUG_ON(!trylock_page(new_page));
111946+#endif
111947+
111948 do_set_pte(vma, address, new_page, pte, true, true);
111949+
111950+#ifdef CONFIG_PAX_SEGMEXEC
111951+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111952+#endif
111953+
111954 mem_cgroup_commit_charge(new_page, memcg, false);
111955 lru_cache_add_active_or_unevictable(new_page, vma);
111956 pte_unmap_unlock(pte, ptl);
111957@@ -3057,6 +3271,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111958 return ret;
111959 }
111960 do_set_pte(vma, address, fault_page, pte, true, false);
111961+
111962+#ifdef CONFIG_PAX_SEGMEXEC
111963+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111964+#endif
111965+
111966 pte_unmap_unlock(pte, ptl);
111967
111968 if (set_page_dirty(fault_page))
111969@@ -3280,6 +3499,12 @@ static int handle_pte_fault(struct mm_struct *mm,
111970 if (flags & FAULT_FLAG_WRITE)
111971 flush_tlb_fix_spurious_fault(vma, address);
111972 }
111973+
111974+#ifdef CONFIG_PAX_SEGMEXEC
111975+ pax_mirror_pte(vma, address, pte, pmd, ptl);
111976+ return 0;
111977+#endif
111978+
111979 unlock:
111980 pte_unmap_unlock(pte, ptl);
111981 return 0;
111982@@ -3299,9 +3524,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111983 pmd_t *pmd;
111984 pte_t *pte;
111985
111986+#ifdef CONFIG_PAX_SEGMEXEC
111987+ struct vm_area_struct *vma_m;
111988+#endif
111989+
111990 if (unlikely(is_vm_hugetlb_page(vma)))
111991 return hugetlb_fault(mm, vma, address, flags);
111992
111993+#ifdef CONFIG_PAX_SEGMEXEC
111994+ vma_m = pax_find_mirror_vma(vma);
111995+ if (vma_m) {
111996+ unsigned long address_m;
111997+ pgd_t *pgd_m;
111998+ pud_t *pud_m;
111999+ pmd_t *pmd_m;
112000+
112001+ if (vma->vm_start > vma_m->vm_start) {
112002+ address_m = address;
112003+ address -= SEGMEXEC_TASK_SIZE;
112004+ vma = vma_m;
112005+ } else
112006+ address_m = address + SEGMEXEC_TASK_SIZE;
112007+
112008+ pgd_m = pgd_offset(mm, address_m);
112009+ pud_m = pud_alloc(mm, pgd_m, address_m);
112010+ if (!pud_m)
112011+ return VM_FAULT_OOM;
112012+ pmd_m = pmd_alloc(mm, pud_m, address_m);
112013+ if (!pmd_m)
112014+ return VM_FAULT_OOM;
112015+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
112016+ return VM_FAULT_OOM;
112017+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
112018+ }
112019+#endif
112020+
112021 pgd = pgd_offset(mm, address);
112022 pud = pud_alloc(mm, pgd, address);
112023 if (!pud)
112024@@ -3436,6 +3693,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
112025 spin_unlock(&mm->page_table_lock);
112026 return 0;
112027 }
112028+
112029+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
112030+{
112031+ pud_t *new = pud_alloc_one(mm, address);
112032+ if (!new)
112033+ return -ENOMEM;
112034+
112035+ smp_wmb(); /* See comment in __pte_alloc */
112036+
112037+ spin_lock(&mm->page_table_lock);
112038+ if (pgd_present(*pgd)) /* Another has populated it */
112039+ pud_free(mm, new);
112040+ else
112041+ pgd_populate_kernel(mm, pgd, new);
112042+ spin_unlock(&mm->page_table_lock);
112043+ return 0;
112044+}
112045 #endif /* __PAGETABLE_PUD_FOLDED */
112046
112047 #ifndef __PAGETABLE_PMD_FOLDED
112048@@ -3468,6 +3742,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
112049 spin_unlock(&mm->page_table_lock);
112050 return 0;
112051 }
112052+
112053+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
112054+{
112055+ pmd_t *new = pmd_alloc_one(mm, address);
112056+ if (!new)
112057+ return -ENOMEM;
112058+
112059+ smp_wmb(); /* See comment in __pte_alloc */
112060+
112061+ spin_lock(&mm->page_table_lock);
112062+#ifndef __ARCH_HAS_4LEVEL_HACK
112063+ if (!pud_present(*pud)) {
112064+ mm_inc_nr_pmds(mm);
112065+ pud_populate_kernel(mm, pud, new);
112066+ } else /* Another has populated it */
112067+ pmd_free(mm, new);
112068+#else
112069+ if (!pgd_present(*pud)) {
112070+ mm_inc_nr_pmds(mm);
112071+ pgd_populate_kernel(mm, pud, new);
112072+ } else /* Another has populated it */
112073+ pmd_free(mm, new);
112074+#endif /* __ARCH_HAS_4LEVEL_HACK */
112075+ spin_unlock(&mm->page_table_lock);
112076+ return 0;
112077+}
112078 #endif /* __PAGETABLE_PMD_FOLDED */
112079
112080 static int __follow_pte(struct mm_struct *mm, unsigned long address,
112081@@ -3577,8 +3877,8 @@ out:
112082 return ret;
112083 }
112084
112085-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
112086- void *buf, int len, int write)
112087+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
112088+ void *buf, size_t len, int write)
112089 {
112090 resource_size_t phys_addr;
112091 unsigned long prot = 0;
112092@@ -3604,8 +3904,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
112093 * Access another process' address space as given in mm. If non-NULL, use the
112094 * given task for page fault accounting.
112095 */
112096-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112097- unsigned long addr, void *buf, int len, int write)
112098+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112099+ unsigned long addr, void *buf, size_t len, int write)
112100 {
112101 struct vm_area_struct *vma;
112102 void *old_buf = buf;
112103@@ -3613,7 +3913,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112104 down_read(&mm->mmap_sem);
112105 /* ignore errors, just check how much was successfully transferred */
112106 while (len) {
112107- int bytes, ret, offset;
112108+ ssize_t bytes, ret, offset;
112109 void *maddr;
112110 struct page *page = NULL;
112111
112112@@ -3674,8 +3974,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112113 *
112114 * The caller must hold a reference on @mm.
112115 */
112116-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
112117- void *buf, int len, int write)
112118+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
112119+ void *buf, size_t len, int write)
112120 {
112121 return __access_remote_vm(NULL, mm, addr, buf, len, write);
112122 }
112123@@ -3685,11 +3985,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
112124 * Source/target buffer must be kernel space,
112125 * Do not walk the page table directly, use get_user_pages
112126 */
112127-int access_process_vm(struct task_struct *tsk, unsigned long addr,
112128- void *buf, int len, int write)
112129+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
112130+ void *buf, size_t len, int write)
112131 {
112132 struct mm_struct *mm;
112133- int ret;
112134+ ssize_t ret;
112135
112136 mm = get_task_mm(tsk);
112137 if (!mm)
112138diff --git a/mm/mempolicy.c b/mm/mempolicy.c
112139index 99d4c1d..a577817 100644
112140--- a/mm/mempolicy.c
112141+++ b/mm/mempolicy.c
112142@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112143 unsigned long vmstart;
112144 unsigned long vmend;
112145
112146+#ifdef CONFIG_PAX_SEGMEXEC
112147+ struct vm_area_struct *vma_m;
112148+#endif
112149+
112150 vma = find_vma(mm, start);
112151 if (!vma || vma->vm_start > start)
112152 return -EFAULT;
112153@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112154 err = vma_replace_policy(vma, new_pol);
112155 if (err)
112156 goto out;
112157+
112158+#ifdef CONFIG_PAX_SEGMEXEC
112159+ vma_m = pax_find_mirror_vma(vma);
112160+ if (vma_m) {
112161+ err = vma_replace_policy(vma_m, new_pol);
112162+ if (err)
112163+ goto out;
112164+ }
112165+#endif
112166+
112167 }
112168
112169 out:
112170@@ -1161,6 +1175,17 @@ static long do_mbind(unsigned long start, unsigned long len,
112171
112172 if (end < start)
112173 return -EINVAL;
112174+
112175+#ifdef CONFIG_PAX_SEGMEXEC
112176+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
112177+ if (end > SEGMEXEC_TASK_SIZE)
112178+ return -EINVAL;
112179+ } else
112180+#endif
112181+
112182+ if (end > TASK_SIZE)
112183+ return -EINVAL;
112184+
112185 if (end == start)
112186 return 0;
112187
112188@@ -1386,8 +1411,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112189 */
112190 tcred = __task_cred(task);
112191 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112192- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112193- !capable(CAP_SYS_NICE)) {
112194+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112195 rcu_read_unlock();
112196 err = -EPERM;
112197 goto out_put;
112198@@ -1418,6 +1442,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112199 goto out;
112200 }
112201
112202+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112203+ if (mm != current->mm &&
112204+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
112205+ mmput(mm);
112206+ err = -EPERM;
112207+ goto out;
112208+ }
112209+#endif
112210+
112211 err = do_migrate_pages(mm, old, new,
112212 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
112213
112214diff --git a/mm/migrate.c b/mm/migrate.c
112215index f53838f..a26fa94 100644
112216--- a/mm/migrate.c
112217+++ b/mm/migrate.c
112218@@ -1484,8 +1484,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
112219 */
112220 tcred = __task_cred(task);
112221 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112222- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112223- !capable(CAP_SYS_NICE)) {
112224+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112225 rcu_read_unlock();
112226 err = -EPERM;
112227 goto out;
112228diff --git a/mm/mlock.c b/mm/mlock.c
112229index 6fd2cf1..cbae765 100644
112230--- a/mm/mlock.c
112231+++ b/mm/mlock.c
112232@@ -14,6 +14,7 @@
112233 #include <linux/pagevec.h>
112234 #include <linux/mempolicy.h>
112235 #include <linux/syscalls.h>
112236+#include <linux/security.h>
112237 #include <linux/sched.h>
112238 #include <linux/export.h>
112239 #include <linux/rmap.h>
112240@@ -557,7 +558,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
112241 {
112242 unsigned long nstart, end, tmp;
112243 struct vm_area_struct * vma, * prev;
112244- int error;
112245+ int error = 0;
112246
112247 VM_BUG_ON(start & ~PAGE_MASK);
112248 VM_BUG_ON(len != PAGE_ALIGN(len));
112249@@ -566,6 +567,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
112250 return -EINVAL;
112251 if (end == start)
112252 return 0;
112253+ if (end > TASK_SIZE)
112254+ return -EINVAL;
112255+
112256 vma = find_vma(current->mm, start);
112257 if (!vma || vma->vm_start > start)
112258 return -ENOMEM;
112259@@ -577,6 +581,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
112260 for (nstart = start ; ; ) {
112261 vm_flags_t newflags;
112262
112263+#ifdef CONFIG_PAX_SEGMEXEC
112264+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112265+ break;
112266+#endif
112267+
112268 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
112269
112270 newflags = vma->vm_flags & ~VM_LOCKED;
112271@@ -627,6 +636,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
112272 locked += current->mm->locked_vm;
112273
112274 /* check against resource limits */
112275+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
112276 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
112277 error = do_mlock(start, len, 1);
112278
112279@@ -668,6 +678,11 @@ static int do_mlockall(int flags)
112280 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
112281 vm_flags_t newflags;
112282
112283+#ifdef CONFIG_PAX_SEGMEXEC
112284+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112285+ break;
112286+#endif
112287+
112288 newflags = vma->vm_flags & ~VM_LOCKED;
112289 if (flags & MCL_CURRENT)
112290 newflags |= VM_LOCKED;
112291@@ -699,8 +714,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
112292 lock_limit >>= PAGE_SHIFT;
112293
112294 ret = -ENOMEM;
112295+
112296+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
112297+
112298 down_write(&current->mm->mmap_sem);
112299-
112300 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
112301 capable(CAP_IPC_LOCK))
112302 ret = do_mlockall(flags);
112303diff --git a/mm/mm_init.c b/mm/mm_init.c
112304index 5f420f7..dd42fb1b 100644
112305--- a/mm/mm_init.c
112306+++ b/mm/mm_init.c
112307@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
112308 return NOTIFY_OK;
112309 }
112310
112311-static struct notifier_block compute_batch_nb __meminitdata = {
112312+static struct notifier_block compute_batch_nb __meminitconst = {
112313 .notifier_call = mm_compute_batch_notifier,
112314 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
112315 };
112316diff --git a/mm/mmap.c b/mm/mmap.c
112317index bb50cac..6d50a9f 100644
112318--- a/mm/mmap.c
112319+++ b/mm/mmap.c
112320@@ -41,6 +41,7 @@
112321 #include <linux/notifier.h>
112322 #include <linux/memory.h>
112323 #include <linux/printk.h>
112324+#include <linux/random.h>
112325
112326 #include <asm/uaccess.h>
112327 #include <asm/cacheflush.h>
112328@@ -57,6 +58,16 @@
112329 #define arch_rebalance_pgtables(addr, len) (addr)
112330 #endif
112331
112332+static inline void verify_mm_writelocked(struct mm_struct *mm)
112333+{
112334+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
112335+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
112336+ up_read(&mm->mmap_sem);
112337+ BUG();
112338+ }
112339+#endif
112340+}
112341+
112342 static void unmap_region(struct mm_struct *mm,
112343 struct vm_area_struct *vma, struct vm_area_struct *prev,
112344 unsigned long start, unsigned long end);
112345@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
112346 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
112347 *
112348 */
112349-pgprot_t protection_map[16] = {
112350+pgprot_t protection_map[16] __read_only = {
112351 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
112352 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
112353 };
112354
112355-pgprot_t vm_get_page_prot(unsigned long vm_flags)
112356+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
112357 {
112358- return __pgprot(pgprot_val(protection_map[vm_flags &
112359+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
112360 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
112361 pgprot_val(arch_vm_get_page_prot(vm_flags)));
112362+
112363+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112364+ if (!(__supported_pte_mask & _PAGE_NX) &&
112365+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
112366+ (vm_flags & (VM_READ | VM_WRITE)))
112367+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
112368+#endif
112369+
112370+ return prot;
112371 }
112372 EXPORT_SYMBOL(vm_get_page_prot);
112373
112374@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
112375 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
112376 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
112377 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
112378+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
112379 /*
112380 * Make sure vm_committed_as in one cacheline and not cacheline shared with
112381 * other variables. It can be updated by several CPUs frequently.
112382@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
112383 struct vm_area_struct *next = vma->vm_next;
112384
112385 might_sleep();
112386+ BUG_ON(vma->vm_mirror);
112387 if (vma->vm_ops && vma->vm_ops->close)
112388 vma->vm_ops->close(vma);
112389 if (vma->vm_file)
112390@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
112391
112392 SYSCALL_DEFINE1(brk, unsigned long, brk)
112393 {
112394+ unsigned long rlim;
112395 unsigned long retval;
112396 unsigned long newbrk, oldbrk;
112397 struct mm_struct *mm = current->mm;
112398@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
112399 * segment grow beyond its set limit the in case where the limit is
112400 * not page aligned -Ram Gupta
112401 */
112402- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
112403+ rlim = rlimit(RLIMIT_DATA);
112404+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112405+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
112406+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
112407+ rlim = 4096 * PAGE_SIZE;
112408+#endif
112409+ if (check_data_rlimit(rlim, brk, mm->start_brk,
112410 mm->end_data, mm->start_data))
112411 goto out;
112412
112413@@ -967,6 +996,12 @@ static int
112414 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
112415 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112416 {
112417+
112418+#ifdef CONFIG_PAX_SEGMEXEC
112419+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
112420+ return 0;
112421+#endif
112422+
112423 if (is_mergeable_vma(vma, file, vm_flags) &&
112424 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112425 if (vma->vm_pgoff == vm_pgoff)
112426@@ -986,6 +1021,12 @@ static int
112427 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
112428 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112429 {
112430+
112431+#ifdef CONFIG_PAX_SEGMEXEC
112432+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
112433+ return 0;
112434+#endif
112435+
112436 if (is_mergeable_vma(vma, file, vm_flags) &&
112437 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112438 pgoff_t vm_pglen;
112439@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112440 struct vm_area_struct *area, *next;
112441 int err;
112442
112443+#ifdef CONFIG_PAX_SEGMEXEC
112444+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
112445+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
112446+
112447+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
112448+#endif
112449+
112450 /*
112451 * We later require that vma->vm_flags == vm_flags,
112452 * so this tests vma->vm_flags & VM_SPECIAL, too.
112453@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112454 if (next && next->vm_end == end) /* cases 6, 7, 8 */
112455 next = next->vm_next;
112456
112457+#ifdef CONFIG_PAX_SEGMEXEC
112458+ if (prev)
112459+ prev_m = pax_find_mirror_vma(prev);
112460+ if (area)
112461+ area_m = pax_find_mirror_vma(area);
112462+ if (next)
112463+ next_m = pax_find_mirror_vma(next);
112464+#endif
112465+
112466 /*
112467 * Can it merge with the predecessor?
112468 */
112469@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112470 /* cases 1, 6 */
112471 err = vma_adjust(prev, prev->vm_start,
112472 next->vm_end, prev->vm_pgoff, NULL);
112473- } else /* cases 2, 5, 7 */
112474+
112475+#ifdef CONFIG_PAX_SEGMEXEC
112476+ if (!err && prev_m)
112477+ err = vma_adjust(prev_m, prev_m->vm_start,
112478+ next_m->vm_end, prev_m->vm_pgoff, NULL);
112479+#endif
112480+
112481+ } else { /* cases 2, 5, 7 */
112482 err = vma_adjust(prev, prev->vm_start,
112483 end, prev->vm_pgoff, NULL);
112484+
112485+#ifdef CONFIG_PAX_SEGMEXEC
112486+ if (!err && prev_m)
112487+ err = vma_adjust(prev_m, prev_m->vm_start,
112488+ end_m, prev_m->vm_pgoff, NULL);
112489+#endif
112490+
112491+ }
112492 if (err)
112493 return NULL;
112494 khugepaged_enter_vma_merge(prev, vm_flags);
112495@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112496 mpol_equal(policy, vma_policy(next)) &&
112497 can_vma_merge_before(next, vm_flags,
112498 anon_vma, file, pgoff+pglen)) {
112499- if (prev && addr < prev->vm_end) /* case 4 */
112500+ if (prev && addr < prev->vm_end) { /* case 4 */
112501 err = vma_adjust(prev, prev->vm_start,
112502 addr, prev->vm_pgoff, NULL);
112503- else /* cases 3, 8 */
112504+
112505+#ifdef CONFIG_PAX_SEGMEXEC
112506+ if (!err && prev_m)
112507+ err = vma_adjust(prev_m, prev_m->vm_start,
112508+ addr_m, prev_m->vm_pgoff, NULL);
112509+#endif
112510+
112511+ } else { /* cases 3, 8 */
112512 err = vma_adjust(area, addr, next->vm_end,
112513 next->vm_pgoff - pglen, NULL);
112514+
112515+#ifdef CONFIG_PAX_SEGMEXEC
112516+ if (!err && area_m)
112517+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
112518+ next_m->vm_pgoff - pglen, NULL);
112519+#endif
112520+
112521+ }
112522 if (err)
112523 return NULL;
112524 khugepaged_enter_vma_merge(area, vm_flags);
112525@@ -1199,8 +1286,10 @@ none:
112526 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112527 struct file *file, long pages)
112528 {
112529- const unsigned long stack_flags
112530- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
112531+
112532+#ifdef CONFIG_PAX_RANDMMAP
112533+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112534+#endif
112535
112536 mm->total_vm += pages;
112537
112538@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112539 mm->shared_vm += pages;
112540 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
112541 mm->exec_vm += pages;
112542- } else if (flags & stack_flags)
112543+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
112544 mm->stack_vm += pages;
112545 }
112546 #endif /* CONFIG_PROC_FS */
112547@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
112548 locked += mm->locked_vm;
112549 lock_limit = rlimit(RLIMIT_MEMLOCK);
112550 lock_limit >>= PAGE_SHIFT;
112551+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112552 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
112553 return -EAGAIN;
112554 }
112555@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112556 * (the exception is when the underlying filesystem is noexec
112557 * mounted, in which case we dont add PROT_EXEC.)
112558 */
112559- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
112560+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
112561 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
112562 prot |= PROT_EXEC;
112563
112564@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112565 /* Obtain the address to map to. we verify (or select) it and ensure
112566 * that it represents a valid section of the address space.
112567 */
112568- addr = get_unmapped_area(file, addr, len, pgoff, flags);
112569+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
112570 if (addr & ~PAGE_MASK)
112571 return addr;
112572
112573@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112574 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
112575 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
112576
112577+#ifdef CONFIG_PAX_MPROTECT
112578+ if (mm->pax_flags & MF_PAX_MPROTECT) {
112579+
112580+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
112581+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
112582+ mm->binfmt->handle_mmap)
112583+ mm->binfmt->handle_mmap(file);
112584+#endif
112585+
112586+#ifndef CONFIG_PAX_MPROTECT_COMPAT
112587+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
112588+ gr_log_rwxmmap(file);
112589+
112590+#ifdef CONFIG_PAX_EMUPLT
112591+ vm_flags &= ~VM_EXEC;
112592+#else
112593+ return -EPERM;
112594+#endif
112595+
112596+ }
112597+
112598+ if (!(vm_flags & VM_EXEC))
112599+ vm_flags &= ~VM_MAYEXEC;
112600+#else
112601+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
112602+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
112603+#endif
112604+ else
112605+ vm_flags &= ~VM_MAYWRITE;
112606+ }
112607+#endif
112608+
112609+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112610+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
112611+ vm_flags &= ~VM_PAGEEXEC;
112612+#endif
112613+
112614 if (flags & MAP_LOCKED)
112615 if (!can_do_mlock())
112616 return -EPERM;
112617@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112618 vm_flags |= VM_NORESERVE;
112619 }
112620
112621+ if (!gr_acl_handle_mmap(file, prot))
112622+ return -EACCES;
112623+
112624 addr = mmap_region(file, addr, len, vm_flags, pgoff);
112625 if (!IS_ERR_VALUE(addr) &&
112626 ((vm_flags & VM_LOCKED) ||
112627@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
112628 vm_flags_t vm_flags = vma->vm_flags;
112629
112630 /* If it was private or non-writable, the write bit is already clear */
112631- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
112632+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
112633 return 0;
112634
112635 /* The backer wishes to know when pages are first written to? */
112636@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112637 struct rb_node **rb_link, *rb_parent;
112638 unsigned long charged = 0;
112639
112640+#ifdef CONFIG_PAX_SEGMEXEC
112641+ struct vm_area_struct *vma_m = NULL;
112642+#endif
112643+
112644+ /*
112645+ * mm->mmap_sem is required to protect against another thread
112646+ * changing the mappings in case we sleep.
112647+ */
112648+ verify_mm_writelocked(mm);
112649+
112650 /* Check against address space limit. */
112651+
112652+#ifdef CONFIG_PAX_RANDMMAP
112653+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112654+#endif
112655+
112656 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
112657 unsigned long nr_pages;
112658
112659@@ -1555,6 +1700,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112660 &rb_parent)) {
112661 if (do_munmap(mm, addr, len))
112662 return -ENOMEM;
112663+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
112664 }
112665
112666 /*
112667@@ -1586,6 +1732,16 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112668 goto unacct_error;
112669 }
112670
112671+#ifdef CONFIG_PAX_SEGMEXEC
112672+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
112673+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
112674+ if (!vma_m) {
112675+ error = -ENOMEM;
112676+ goto free_vma;
112677+ }
112678+ }
112679+#endif
112680+
112681 vma->vm_mm = mm;
112682 vma->vm_start = addr;
112683 vma->vm_end = addr + len;
112684@@ -1616,6 +1772,13 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112685 if (error)
112686 goto unmap_and_free_vma;
112687
112688+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112689+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
112690+ vma->vm_flags |= VM_PAGEEXEC;
112691+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
112692+ }
112693+#endif
112694+
112695 /* Can addr have changed??
112696 *
112697 * Answer: Yes, several device drivers can do it in their
112698@@ -1634,6 +1797,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112699 }
112700
112701 vma_link(mm, vma, prev, rb_link, rb_parent);
112702+
112703+#ifdef CONFIG_PAX_SEGMEXEC
112704+ if (vma_m)
112705+ BUG_ON(pax_mirror_vma(vma_m, vma));
112706+#endif
112707+
112708 /* Once vma denies write, undo our temporary denial count */
112709 if (file) {
112710 if (vm_flags & VM_SHARED)
112711@@ -1646,6 +1815,7 @@ out:
112712 perf_event_mmap(vma);
112713
112714 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
112715+ track_exec_limit(mm, addr, addr + len, vm_flags);
112716 if (vm_flags & VM_LOCKED) {
112717 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
112718 vma == get_gate_vma(current->mm)))
112719@@ -1683,6 +1853,12 @@ allow_write_and_free_vma:
112720 if (vm_flags & VM_DENYWRITE)
112721 allow_write_access(file);
112722 free_vma:
112723+
112724+#ifdef CONFIG_PAX_SEGMEXEC
112725+ if (vma_m)
112726+ kmem_cache_free(vm_area_cachep, vma_m);
112727+#endif
112728+
112729 kmem_cache_free(vm_area_cachep, vma);
112730 unacct_error:
112731 if (charged)
112732@@ -1690,7 +1866,63 @@ unacct_error:
112733 return error;
112734 }
112735
112736-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112737+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
112738+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
112739+{
112740+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
112741+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
112742+
112743+ return 0;
112744+}
112745+#endif
112746+
112747+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
112748+{
112749+ if (!vma) {
112750+#ifdef CONFIG_STACK_GROWSUP
112751+ if (addr > sysctl_heap_stack_gap)
112752+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
112753+ else
112754+ vma = find_vma(current->mm, 0);
112755+ if (vma && (vma->vm_flags & VM_GROWSUP))
112756+ return false;
112757+#endif
112758+ return true;
112759+ }
112760+
112761+ if (addr + len > vma->vm_start)
112762+ return false;
112763+
112764+ if (vma->vm_flags & VM_GROWSDOWN)
112765+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
112766+#ifdef CONFIG_STACK_GROWSUP
112767+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
112768+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
112769+#endif
112770+ else if (offset)
112771+ return offset <= vma->vm_start - addr - len;
112772+
112773+ return true;
112774+}
112775+
112776+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
112777+{
112778+ if (vma->vm_start < len)
112779+ return -ENOMEM;
112780+
112781+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
112782+ if (offset <= vma->vm_start - len)
112783+ return vma->vm_start - len - offset;
112784+ else
112785+ return -ENOMEM;
112786+ }
112787+
112788+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
112789+ return vma->vm_start - len - sysctl_heap_stack_gap;
112790+ return -ENOMEM;
112791+}
112792+
112793+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
112794 {
112795 /*
112796 * We implement the search by looking for an rbtree node that
112797@@ -1738,11 +1970,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112798 }
112799 }
112800
112801- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
112802+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
112803 check_current:
112804 /* Check if current node has a suitable gap */
112805 if (gap_start > high_limit)
112806 return -ENOMEM;
112807+
112808+ if (gap_end - gap_start > info->threadstack_offset)
112809+ gap_start += info->threadstack_offset;
112810+ else
112811+ gap_start = gap_end;
112812+
112813+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112814+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112815+ gap_start += sysctl_heap_stack_gap;
112816+ else
112817+ gap_start = gap_end;
112818+ }
112819+ if (vma->vm_flags & VM_GROWSDOWN) {
112820+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112821+ gap_end -= sysctl_heap_stack_gap;
112822+ else
112823+ gap_end = gap_start;
112824+ }
112825 if (gap_end >= low_limit && gap_end - gap_start >= length)
112826 goto found;
112827
112828@@ -1792,7 +2042,7 @@ found:
112829 return gap_start;
112830 }
112831
112832-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
112833+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
112834 {
112835 struct mm_struct *mm = current->mm;
112836 struct vm_area_struct *vma;
112837@@ -1846,6 +2096,24 @@ check_current:
112838 gap_end = vma->vm_start;
112839 if (gap_end < low_limit)
112840 return -ENOMEM;
112841+
112842+ if (gap_end - gap_start > info->threadstack_offset)
112843+ gap_end -= info->threadstack_offset;
112844+ else
112845+ gap_end = gap_start;
112846+
112847+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112848+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112849+ gap_start += sysctl_heap_stack_gap;
112850+ else
112851+ gap_start = gap_end;
112852+ }
112853+ if (vma->vm_flags & VM_GROWSDOWN) {
112854+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112855+ gap_end -= sysctl_heap_stack_gap;
112856+ else
112857+ gap_end = gap_start;
112858+ }
112859 if (gap_start <= high_limit && gap_end - gap_start >= length)
112860 goto found;
112861
112862@@ -1909,6 +2177,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112863 struct mm_struct *mm = current->mm;
112864 struct vm_area_struct *vma;
112865 struct vm_unmapped_area_info info;
112866+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112867
112868 if (len > TASK_SIZE - mmap_min_addr)
112869 return -ENOMEM;
112870@@ -1916,11 +2185,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112871 if (flags & MAP_FIXED)
112872 return addr;
112873
112874+#ifdef CONFIG_PAX_RANDMMAP
112875+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112876+#endif
112877+
112878 if (addr) {
112879 addr = PAGE_ALIGN(addr);
112880 vma = find_vma(mm, addr);
112881 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112882- (!vma || addr + len <= vma->vm_start))
112883+ check_heap_stack_gap(vma, addr, len, offset))
112884 return addr;
112885 }
112886
112887@@ -1929,6 +2202,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112888 info.low_limit = mm->mmap_base;
112889 info.high_limit = TASK_SIZE;
112890 info.align_mask = 0;
112891+ info.threadstack_offset = offset;
112892 return vm_unmapped_area(&info);
112893 }
112894 #endif
112895@@ -1947,6 +2221,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112896 struct mm_struct *mm = current->mm;
112897 unsigned long addr = addr0;
112898 struct vm_unmapped_area_info info;
112899+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112900
112901 /* requested length too big for entire address space */
112902 if (len > TASK_SIZE - mmap_min_addr)
112903@@ -1955,12 +2230,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112904 if (flags & MAP_FIXED)
112905 return addr;
112906
112907+#ifdef CONFIG_PAX_RANDMMAP
112908+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112909+#endif
112910+
112911 /* requesting a specific address */
112912 if (addr) {
112913 addr = PAGE_ALIGN(addr);
112914 vma = find_vma(mm, addr);
112915 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112916- (!vma || addr + len <= vma->vm_start))
112917+ check_heap_stack_gap(vma, addr, len, offset))
112918 return addr;
112919 }
112920
112921@@ -1969,6 +2248,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112922 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
112923 info.high_limit = mm->mmap_base;
112924 info.align_mask = 0;
112925+ info.threadstack_offset = offset;
112926 addr = vm_unmapped_area(&info);
112927
112928 /*
112929@@ -1981,6 +2261,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112930 VM_BUG_ON(addr != -ENOMEM);
112931 info.flags = 0;
112932 info.low_limit = TASK_UNMAPPED_BASE;
112933+
112934+#ifdef CONFIG_PAX_RANDMMAP
112935+ if (mm->pax_flags & MF_PAX_RANDMMAP)
112936+ info.low_limit += mm->delta_mmap;
112937+#endif
112938+
112939 info.high_limit = TASK_SIZE;
112940 addr = vm_unmapped_area(&info);
112941 }
112942@@ -2081,6 +2367,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
112943 return vma;
112944 }
112945
112946+#ifdef CONFIG_PAX_SEGMEXEC
112947+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
112948+{
112949+ struct vm_area_struct *vma_m;
112950+
112951+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
112952+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
112953+ BUG_ON(vma->vm_mirror);
112954+ return NULL;
112955+ }
112956+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
112957+ vma_m = vma->vm_mirror;
112958+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
112959+ BUG_ON(vma->vm_file != vma_m->vm_file);
112960+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
112961+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
112962+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
112963+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
112964+ return vma_m;
112965+}
112966+#endif
112967+
112968 /*
112969 * Verify that the stack growth is acceptable and
112970 * update accounting. This is shared with both the
112971@@ -2098,8 +2406,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112972
112973 /* Stack limit test */
112974 actual_size = size;
112975- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
112976- actual_size -= PAGE_SIZE;
112977+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
112978 if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
112979 return -ENOMEM;
112980
112981@@ -2110,6 +2417,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112982 locked = mm->locked_vm + grow;
112983 limit = READ_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
112984 limit >>= PAGE_SHIFT;
112985+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112986 if (locked > limit && !capable(CAP_IPC_LOCK))
112987 return -ENOMEM;
112988 }
112989@@ -2139,37 +2447,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112990 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
112991 * vma is the last one with address > vma->vm_end. Have to extend vma.
112992 */
112993+#ifndef CONFIG_IA64
112994+static
112995+#endif
112996 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112997 {
112998 int error;
112999+ bool locknext;
113000
113001 if (!(vma->vm_flags & VM_GROWSUP))
113002 return -EFAULT;
113003
113004+ /* Also guard against wrapping around to address 0. */
113005+ if (address < PAGE_ALIGN(address+1))
113006+ address = PAGE_ALIGN(address+1);
113007+ else
113008+ return -ENOMEM;
113009+
113010 /*
113011 * We must make sure the anon_vma is allocated
113012 * so that the anon_vma locking is not a noop.
113013 */
113014 if (unlikely(anon_vma_prepare(vma)))
113015 return -ENOMEM;
113016+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
113017+ if (locknext && anon_vma_prepare(vma->vm_next))
113018+ return -ENOMEM;
113019 vma_lock_anon_vma(vma);
113020+ if (locknext)
113021+ vma_lock_anon_vma(vma->vm_next);
113022
113023 /*
113024 * vma->vm_start/vm_end cannot change under us because the caller
113025 * is required to hold the mmap_sem in read mode. We need the
113026- * anon_vma lock to serialize against concurrent expand_stacks.
113027- * Also guard against wrapping around to address 0.
113028+ * anon_vma locks to serialize against concurrent expand_stacks
113029+ * and expand_upwards.
113030 */
113031- if (address < PAGE_ALIGN(address+4))
113032- address = PAGE_ALIGN(address+4);
113033- else {
113034- vma_unlock_anon_vma(vma);
113035- return -ENOMEM;
113036- }
113037 error = 0;
113038
113039 /* Somebody else might have raced and expanded it already */
113040- if (address > vma->vm_end) {
113041+ 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)
113042+ error = -ENOMEM;
113043+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
113044 unsigned long size, grow;
113045
113046 size = address - vma->vm_start;
113047@@ -2204,6 +2523,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
113048 }
113049 }
113050 }
113051+ if (locknext)
113052+ vma_unlock_anon_vma(vma->vm_next);
113053 vma_unlock_anon_vma(vma);
113054 khugepaged_enter_vma_merge(vma, vma->vm_flags);
113055 validate_mm(vma->vm_mm);
113056@@ -2218,6 +2539,8 @@ int expand_downwards(struct vm_area_struct *vma,
113057 unsigned long address)
113058 {
113059 int error;
113060+ bool lockprev = false;
113061+ struct vm_area_struct *prev;
113062
113063 /*
113064 * We must make sure the anon_vma is allocated
113065@@ -2231,6 +2554,15 @@ int expand_downwards(struct vm_area_struct *vma,
113066 if (error)
113067 return error;
113068
113069+ prev = vma->vm_prev;
113070+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
113071+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
113072+#endif
113073+ if (lockprev && anon_vma_prepare(prev))
113074+ return -ENOMEM;
113075+ if (lockprev)
113076+ vma_lock_anon_vma(prev);
113077+
113078 vma_lock_anon_vma(vma);
113079
113080 /*
113081@@ -2240,9 +2572,17 @@ int expand_downwards(struct vm_area_struct *vma,
113082 */
113083
113084 /* Somebody else might have raced and expanded it already */
113085- if (address < vma->vm_start) {
113086+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
113087+ error = -ENOMEM;
113088+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
113089 unsigned long size, grow;
113090
113091+#ifdef CONFIG_PAX_SEGMEXEC
113092+ struct vm_area_struct *vma_m;
113093+
113094+ vma_m = pax_find_mirror_vma(vma);
113095+#endif
113096+
113097 size = vma->vm_end - address;
113098 grow = (vma->vm_start - address) >> PAGE_SHIFT;
113099
113100@@ -2267,13 +2607,27 @@ int expand_downwards(struct vm_area_struct *vma,
113101 vma->vm_pgoff -= grow;
113102 anon_vma_interval_tree_post_update_vma(vma);
113103 vma_gap_update(vma);
113104+
113105+#ifdef CONFIG_PAX_SEGMEXEC
113106+ if (vma_m) {
113107+ anon_vma_interval_tree_pre_update_vma(vma_m);
113108+ vma_m->vm_start -= grow << PAGE_SHIFT;
113109+ vma_m->vm_pgoff -= grow;
113110+ anon_vma_interval_tree_post_update_vma(vma_m);
113111+ vma_gap_update(vma_m);
113112+ }
113113+#endif
113114+
113115 spin_unlock(&vma->vm_mm->page_table_lock);
113116
113117+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
113118 perf_event_mmap(vma);
113119 }
113120 }
113121 }
113122 vma_unlock_anon_vma(vma);
113123+ if (lockprev)
113124+ vma_unlock_anon_vma(prev);
113125 khugepaged_enter_vma_merge(vma, vma->vm_flags);
113126 validate_mm(vma->vm_mm);
113127 return error;
113128@@ -2373,6 +2727,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
113129 do {
113130 long nrpages = vma_pages(vma);
113131
113132+#ifdef CONFIG_PAX_SEGMEXEC
113133+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
113134+ vma = remove_vma(vma);
113135+ continue;
113136+ }
113137+#endif
113138+
113139 if (vma->vm_flags & VM_ACCOUNT)
113140 nr_accounted += nrpages;
113141 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
113142@@ -2417,6 +2778,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
113143 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
113144 vma->vm_prev = NULL;
113145 do {
113146+
113147+#ifdef CONFIG_PAX_SEGMEXEC
113148+ if (vma->vm_mirror) {
113149+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
113150+ vma->vm_mirror->vm_mirror = NULL;
113151+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
113152+ vma->vm_mirror = NULL;
113153+ }
113154+#endif
113155+
113156 vma_rb_erase(vma, &mm->mm_rb);
113157 mm->map_count--;
113158 tail_vma = vma;
113159@@ -2444,14 +2815,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113160 struct vm_area_struct *new;
113161 int err = -ENOMEM;
113162
113163+#ifdef CONFIG_PAX_SEGMEXEC
113164+ struct vm_area_struct *vma_m, *new_m = NULL;
113165+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
113166+#endif
113167+
113168 if (is_vm_hugetlb_page(vma) && (addr &
113169 ~(huge_page_mask(hstate_vma(vma)))))
113170 return -EINVAL;
113171
113172+#ifdef CONFIG_PAX_SEGMEXEC
113173+ vma_m = pax_find_mirror_vma(vma);
113174+#endif
113175+
113176 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113177 if (!new)
113178 goto out_err;
113179
113180+#ifdef CONFIG_PAX_SEGMEXEC
113181+ if (vma_m) {
113182+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113183+ if (!new_m) {
113184+ kmem_cache_free(vm_area_cachep, new);
113185+ goto out_err;
113186+ }
113187+ }
113188+#endif
113189+
113190 /* most fields are the same, copy all, and then fixup */
113191 *new = *vma;
113192
113193@@ -2464,6 +2854,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113194 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
113195 }
113196
113197+#ifdef CONFIG_PAX_SEGMEXEC
113198+ if (vma_m) {
113199+ *new_m = *vma_m;
113200+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
113201+ new_m->vm_mirror = new;
113202+ new->vm_mirror = new_m;
113203+
113204+ if (new_below)
113205+ new_m->vm_end = addr_m;
113206+ else {
113207+ new_m->vm_start = addr_m;
113208+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
113209+ }
113210+ }
113211+#endif
113212+
113213 err = vma_dup_policy(vma, new);
113214 if (err)
113215 goto out_free_vma;
113216@@ -2484,6 +2890,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113217 else
113218 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
113219
113220+#ifdef CONFIG_PAX_SEGMEXEC
113221+ if (!err && vma_m) {
113222+ struct mempolicy *pol = vma_policy(new);
113223+
113224+ if (anon_vma_clone(new_m, vma_m))
113225+ goto out_free_mpol;
113226+
113227+ mpol_get(pol);
113228+ set_vma_policy(new_m, pol);
113229+
113230+ if (new_m->vm_file)
113231+ get_file(new_m->vm_file);
113232+
113233+ if (new_m->vm_ops && new_m->vm_ops->open)
113234+ new_m->vm_ops->open(new_m);
113235+
113236+ if (new_below)
113237+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
113238+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
113239+ else
113240+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
113241+
113242+ if (err) {
113243+ if (new_m->vm_ops && new_m->vm_ops->close)
113244+ new_m->vm_ops->close(new_m);
113245+ if (new_m->vm_file)
113246+ fput(new_m->vm_file);
113247+ mpol_put(pol);
113248+ }
113249+ }
113250+#endif
113251+
113252 /* Success. */
113253 if (!err)
113254 return 0;
113255@@ -2493,10 +2931,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113256 new->vm_ops->close(new);
113257 if (new->vm_file)
113258 fput(new->vm_file);
113259- unlink_anon_vmas(new);
113260 out_free_mpol:
113261 mpol_put(vma_policy(new));
113262 out_free_vma:
113263+
113264+#ifdef CONFIG_PAX_SEGMEXEC
113265+ if (new_m) {
113266+ unlink_anon_vmas(new_m);
113267+ kmem_cache_free(vm_area_cachep, new_m);
113268+ }
113269+#endif
113270+
113271+ unlink_anon_vmas(new);
113272 kmem_cache_free(vm_area_cachep, new);
113273 out_err:
113274 return err;
113275@@ -2509,6 +2955,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113276 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113277 unsigned long addr, int new_below)
113278 {
113279+
113280+#ifdef CONFIG_PAX_SEGMEXEC
113281+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
113282+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
113283+ if (mm->map_count >= sysctl_max_map_count-1)
113284+ return -ENOMEM;
113285+ } else
113286+#endif
113287+
113288 if (mm->map_count >= sysctl_max_map_count)
113289 return -ENOMEM;
113290
113291@@ -2520,11 +2975,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113292 * work. This now handles partial unmappings.
113293 * Jeremy Fitzhardinge <jeremy@goop.org>
113294 */
113295+#ifdef CONFIG_PAX_SEGMEXEC
113296 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113297 {
113298+ int ret = __do_munmap(mm, start, len);
113299+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
113300+ return ret;
113301+
113302+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
113303+}
113304+
113305+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113306+#else
113307+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113308+#endif
113309+{
113310 unsigned long end;
113311 struct vm_area_struct *vma, *prev, *last;
113312
113313+ /*
113314+ * mm->mmap_sem is required to protect against another thread
113315+ * changing the mappings in case we sleep.
113316+ */
113317+ verify_mm_writelocked(mm);
113318+
113319 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
113320 return -EINVAL;
113321
113322@@ -2602,6 +3076,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113323 /* Fix up all other VM information */
113324 remove_vma_list(mm, vma);
113325
113326+ track_exec_limit(mm, start, end, 0UL);
113327+
113328 return 0;
113329 }
113330
113331@@ -2610,6 +3086,13 @@ int vm_munmap(unsigned long start, size_t len)
113332 int ret;
113333 struct mm_struct *mm = current->mm;
113334
113335+
113336+#ifdef CONFIG_PAX_SEGMEXEC
113337+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
113338+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
113339+ return -EINVAL;
113340+#endif
113341+
113342 down_write(&mm->mmap_sem);
113343 ret = do_munmap(mm, start, len);
113344 up_write(&mm->mmap_sem);
113345@@ -2656,6 +3139,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
113346 down_write(&mm->mmap_sem);
113347 vma = find_vma(mm, start);
113348
113349+#ifdef CONFIG_PAX_SEGMEXEC
113350+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
113351+ goto out;
113352+#endif
113353+
113354 if (!vma || !(vma->vm_flags & VM_SHARED))
113355 goto out;
113356
113357@@ -2692,16 +3180,6 @@ out:
113358 return ret;
113359 }
113360
113361-static inline void verify_mm_writelocked(struct mm_struct *mm)
113362-{
113363-#ifdef CONFIG_DEBUG_VM
113364- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
113365- WARN_ON(1);
113366- up_read(&mm->mmap_sem);
113367- }
113368-#endif
113369-}
113370-
113371 /*
113372 * this is really a simplified "do_mmap". it only handles
113373 * anonymous maps. eventually we may be able to do some
113374@@ -2715,6 +3193,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113375 struct rb_node **rb_link, *rb_parent;
113376 pgoff_t pgoff = addr >> PAGE_SHIFT;
113377 int error;
113378+ unsigned long charged;
113379
113380 len = PAGE_ALIGN(len);
113381 if (!len)
113382@@ -2722,10 +3201,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113383
113384 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
113385
113386+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
113387+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
113388+ flags &= ~VM_EXEC;
113389+
113390+#ifdef CONFIG_PAX_MPROTECT
113391+ if (mm->pax_flags & MF_PAX_MPROTECT)
113392+ flags &= ~VM_MAYEXEC;
113393+#endif
113394+
113395+ }
113396+#endif
113397+
113398 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
113399 if (error & ~PAGE_MASK)
113400 return error;
113401
113402+ charged = len >> PAGE_SHIFT;
113403+
113404 error = mlock_future_check(mm, mm->def_flags, len);
113405 if (error)
113406 return error;
113407@@ -2743,16 +3236,17 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113408 &rb_parent)) {
113409 if (do_munmap(mm, addr, len))
113410 return -ENOMEM;
113411+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
113412 }
113413
113414 /* Check against address space limits *after* clearing old maps... */
113415- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
113416+ if (!may_expand_vm(mm, charged))
113417 return -ENOMEM;
113418
113419 if (mm->map_count > sysctl_max_map_count)
113420 return -ENOMEM;
113421
113422- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
113423+ if (security_vm_enough_memory_mm(mm, charged))
113424 return -ENOMEM;
113425
113426 /* Can we just expand an old private anonymous mapping? */
113427@@ -2766,7 +3260,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113428 */
113429 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113430 if (!vma) {
113431- vm_unacct_memory(len >> PAGE_SHIFT);
113432+ vm_unacct_memory(charged);
113433 return -ENOMEM;
113434 }
113435
113436@@ -2780,10 +3274,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113437 vma_link(mm, vma, prev, rb_link, rb_parent);
113438 out:
113439 perf_event_mmap(vma);
113440- mm->total_vm += len >> PAGE_SHIFT;
113441+ mm->total_vm += charged;
113442 if (flags & VM_LOCKED)
113443- mm->locked_vm += (len >> PAGE_SHIFT);
113444+ mm->locked_vm += charged;
113445 vma->vm_flags |= VM_SOFTDIRTY;
113446+ track_exec_limit(mm, addr, addr + len, flags);
113447 return addr;
113448 }
113449
113450@@ -2845,6 +3340,7 @@ void exit_mmap(struct mm_struct *mm)
113451 while (vma) {
113452 if (vma->vm_flags & VM_ACCOUNT)
113453 nr_accounted += vma_pages(vma);
113454+ vma->vm_mirror = NULL;
113455 vma = remove_vma(vma);
113456 }
113457 vm_unacct_memory(nr_accounted);
113458@@ -2859,6 +3355,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113459 struct vm_area_struct *prev;
113460 struct rb_node **rb_link, *rb_parent;
113461
113462+#ifdef CONFIG_PAX_SEGMEXEC
113463+ struct vm_area_struct *vma_m = NULL;
113464+#endif
113465+
113466+ if (security_mmap_addr(vma->vm_start))
113467+ return -EPERM;
113468+
113469 /*
113470 * The vm_pgoff of a purely anonymous vma should be irrelevant
113471 * until its first write fault, when page's anon_vma and index
113472@@ -2882,7 +3385,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113473 security_vm_enough_memory_mm(mm, vma_pages(vma)))
113474 return -ENOMEM;
113475
113476+#ifdef CONFIG_PAX_SEGMEXEC
113477+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
113478+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113479+ if (!vma_m)
113480+ return -ENOMEM;
113481+ }
113482+#endif
113483+
113484 vma_link(mm, vma, prev, rb_link, rb_parent);
113485+
113486+#ifdef CONFIG_PAX_SEGMEXEC
113487+ if (vma_m)
113488+ BUG_ON(pax_mirror_vma(vma_m, vma));
113489+#endif
113490+
113491 return 0;
113492 }
113493
113494@@ -2901,6 +3418,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113495 struct rb_node **rb_link, *rb_parent;
113496 bool faulted_in_anon_vma = true;
113497
113498+ BUG_ON(vma->vm_mirror);
113499+
113500 /*
113501 * If anonymous vma has not yet been faulted, update new pgoff
113502 * to match new location, to increase its chance of merging.
113503@@ -2965,6 +3484,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113504 return NULL;
113505 }
113506
113507+#ifdef CONFIG_PAX_SEGMEXEC
113508+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
113509+{
113510+ struct vm_area_struct *prev_m;
113511+ struct rb_node **rb_link_m, *rb_parent_m;
113512+ struct mempolicy *pol_m;
113513+
113514+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
113515+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
113516+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
113517+ *vma_m = *vma;
113518+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
113519+ if (anon_vma_clone(vma_m, vma))
113520+ return -ENOMEM;
113521+ pol_m = vma_policy(vma_m);
113522+ mpol_get(pol_m);
113523+ set_vma_policy(vma_m, pol_m);
113524+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
113525+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
113526+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
113527+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
113528+ if (vma_m->vm_file)
113529+ get_file(vma_m->vm_file);
113530+ if (vma_m->vm_ops && vma_m->vm_ops->open)
113531+ vma_m->vm_ops->open(vma_m);
113532+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
113533+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
113534+ vma_m->vm_mirror = vma;
113535+ vma->vm_mirror = vma_m;
113536+ return 0;
113537+}
113538+#endif
113539+
113540 /*
113541 * Return true if the calling process may expand its vm space by the passed
113542 * number of pages
113543@@ -2976,6 +3528,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
113544
113545 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
113546
113547+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
113548 if (cur + npages > lim)
113549 return 0;
113550 return 1;
113551@@ -3058,6 +3611,22 @@ static struct vm_area_struct *__install_special_mapping(
113552 vma->vm_start = addr;
113553 vma->vm_end = addr + len;
113554
113555+#ifdef CONFIG_PAX_MPROTECT
113556+ if (mm->pax_flags & MF_PAX_MPROTECT) {
113557+#ifndef CONFIG_PAX_MPROTECT_COMPAT
113558+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
113559+ return ERR_PTR(-EPERM);
113560+ if (!(vm_flags & VM_EXEC))
113561+ vm_flags &= ~VM_MAYEXEC;
113562+#else
113563+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
113564+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
113565+#endif
113566+ else
113567+ vm_flags &= ~VM_MAYWRITE;
113568+ }
113569+#endif
113570+
113571 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
113572 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
113573
113574diff --git a/mm/mprotect.c b/mm/mprotect.c
113575index 8858483..72f2464 100644
113576--- a/mm/mprotect.c
113577+++ b/mm/mprotect.c
113578@@ -24,10 +24,18 @@
113579 #include <linux/migrate.h>
113580 #include <linux/perf_event.h>
113581 #include <linux/ksm.h>
113582+#include <linux/sched/sysctl.h>
113583+
113584+#ifdef CONFIG_PAX_MPROTECT
113585+#include <linux/elf.h>
113586+#include <linux/binfmts.h>
113587+#endif
113588+
113589 #include <asm/uaccess.h>
113590 #include <asm/pgtable.h>
113591 #include <asm/cacheflush.h>
113592 #include <asm/tlbflush.h>
113593+#include <asm/mmu_context.h>
113594
113595 /*
113596 * For a prot_numa update we only hold mmap_sem for read so there is a
113597@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
113598 return pages;
113599 }
113600
113601+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113602+/* called while holding the mmap semaphor for writing except stack expansion */
113603+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
113604+{
113605+ unsigned long oldlimit, newlimit = 0UL;
113606+
113607+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
113608+ return;
113609+
113610+ spin_lock(&mm->page_table_lock);
113611+ oldlimit = mm->context.user_cs_limit;
113612+ if ((prot & VM_EXEC) && oldlimit < end)
113613+ /* USER_CS limit moved up */
113614+ newlimit = end;
113615+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
113616+ /* USER_CS limit moved down */
113617+ newlimit = start;
113618+
113619+ if (newlimit) {
113620+ mm->context.user_cs_limit = newlimit;
113621+
113622+#ifdef CONFIG_SMP
113623+ wmb();
113624+ cpumask_clear(&mm->context.cpu_user_cs_mask);
113625+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
113626+#endif
113627+
113628+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
113629+ }
113630+ spin_unlock(&mm->page_table_lock);
113631+ if (newlimit == end) {
113632+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
113633+
113634+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
113635+ if (is_vm_hugetlb_page(vma))
113636+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
113637+ else
113638+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
113639+ }
113640+}
113641+#endif
113642+
113643 int
113644 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113645 unsigned long start, unsigned long end, unsigned long newflags)
113646@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113647 int error;
113648 int dirty_accountable = 0;
113649
113650+#ifdef CONFIG_PAX_SEGMEXEC
113651+ struct vm_area_struct *vma_m = NULL;
113652+ unsigned long start_m, end_m;
113653+
113654+ start_m = start + SEGMEXEC_TASK_SIZE;
113655+ end_m = end + SEGMEXEC_TASK_SIZE;
113656+#endif
113657+
113658 if (newflags == oldflags) {
113659 *pprev = vma;
113660 return 0;
113661 }
113662
113663+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
113664+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
113665+
113666+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
113667+ return -ENOMEM;
113668+
113669+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
113670+ return -ENOMEM;
113671+ }
113672+
113673 /*
113674 * If we make a private mapping writable we increase our commit;
113675 * but (without finer accounting) cannot reduce our commit if we
113676@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113677 }
113678 }
113679
113680+#ifdef CONFIG_PAX_SEGMEXEC
113681+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
113682+ if (start != vma->vm_start) {
113683+ error = split_vma(mm, vma, start, 1);
113684+ if (error)
113685+ goto fail;
113686+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
113687+ *pprev = (*pprev)->vm_next;
113688+ }
113689+
113690+ if (end != vma->vm_end) {
113691+ error = split_vma(mm, vma, end, 0);
113692+ if (error)
113693+ goto fail;
113694+ }
113695+
113696+ if (pax_find_mirror_vma(vma)) {
113697+ error = __do_munmap(mm, start_m, end_m - start_m);
113698+ if (error)
113699+ goto fail;
113700+ } else {
113701+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113702+ if (!vma_m) {
113703+ error = -ENOMEM;
113704+ goto fail;
113705+ }
113706+ vma->vm_flags = newflags;
113707+ error = pax_mirror_vma(vma_m, vma);
113708+ if (error) {
113709+ vma->vm_flags = oldflags;
113710+ goto fail;
113711+ }
113712+ }
113713+ }
113714+#endif
113715+
113716 /*
113717 * First try to merge with previous and/or next vma.
113718 */
113719@@ -315,7 +419,19 @@ success:
113720 * vm_flags and vm_page_prot are protected by the mmap_sem
113721 * held in write mode.
113722 */
113723+
113724+#ifdef CONFIG_PAX_SEGMEXEC
113725+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
113726+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
113727+#endif
113728+
113729 vma->vm_flags = newflags;
113730+
113731+#ifdef CONFIG_PAX_MPROTECT
113732+ if (mm->binfmt && mm->binfmt->handle_mprotect)
113733+ mm->binfmt->handle_mprotect(vma, newflags);
113734+#endif
113735+
113736 dirty_accountable = vma_wants_writenotify(vma);
113737 vma_set_page_prot(vma);
113738
113739@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113740 end = start + len;
113741 if (end <= start)
113742 return -ENOMEM;
113743+
113744+#ifdef CONFIG_PAX_SEGMEXEC
113745+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
113746+ if (end > SEGMEXEC_TASK_SIZE)
113747+ return -EINVAL;
113748+ } else
113749+#endif
113750+
113751+ if (end > TASK_SIZE)
113752+ return -EINVAL;
113753+
113754 if (!arch_validate_prot(prot))
113755 return -EINVAL;
113756
113757@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113758 /*
113759 * Does the application expect PROT_READ to imply PROT_EXEC:
113760 */
113761- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
113762+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
113763 prot |= PROT_EXEC;
113764
113765 vm_flags = calc_vm_prot_bits(prot);
113766@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113767 if (start > vma->vm_start)
113768 prev = vma;
113769
113770+#ifdef CONFIG_PAX_MPROTECT
113771+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
113772+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
113773+#endif
113774+
113775 for (nstart = start ; ; ) {
113776 unsigned long newflags;
113777
113778@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113779
113780 /* newflags >> 4 shift VM_MAY% in place of VM_% */
113781 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
113782+ if (prot & (PROT_WRITE | PROT_EXEC))
113783+ gr_log_rwxmprotect(vma);
113784+
113785+ error = -EACCES;
113786+ goto out;
113787+ }
113788+
113789+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
113790 error = -EACCES;
113791 goto out;
113792 }
113793@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113794 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
113795 if (error)
113796 goto out;
113797+
113798+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
113799+
113800 nstart = tmp;
113801
113802 if (nstart < prev->vm_end)
113803diff --git a/mm/mremap.c b/mm/mremap.c
113804index 034e2d3..81deca5 100644
113805--- a/mm/mremap.c
113806+++ b/mm/mremap.c
113807@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
113808 continue;
113809 pte = ptep_get_and_clear(mm, old_addr, old_pte);
113810 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
113811+
113812+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113813+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
113814+ pte = pte_exprotect(pte);
113815+#endif
113816+
113817 pte = move_soft_dirty_pte(pte);
113818 set_pte_at(mm, new_addr, new_pte, pte);
113819 }
113820@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
113821 if (is_vm_hugetlb_page(vma))
113822 return ERR_PTR(-EINVAL);
113823
113824+#ifdef CONFIG_PAX_SEGMEXEC
113825+ if (pax_find_mirror_vma(vma))
113826+ return ERR_PTR(-EINVAL);
113827+#endif
113828+
113829 /* We can't remap across vm area boundaries */
113830 if (old_len > vma->vm_end - addr)
113831 return ERR_PTR(-EFAULT);
113832@@ -396,20 +407,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
113833 unsigned long ret = -EINVAL;
113834 unsigned long charged = 0;
113835 unsigned long map_flags;
113836+ unsigned long pax_task_size = TASK_SIZE;
113837
113838 if (new_addr & ~PAGE_MASK)
113839 goto out;
113840
113841- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
113842+#ifdef CONFIG_PAX_SEGMEXEC
113843+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113844+ pax_task_size = SEGMEXEC_TASK_SIZE;
113845+#endif
113846+
113847+ pax_task_size -= PAGE_SIZE;
113848+
113849+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
113850 goto out;
113851
113852 /* Check if the location we're moving into overlaps the
113853 * old location at all, and fail if it does.
113854 */
113855- if ((new_addr <= addr) && (new_addr+new_len) > addr)
113856- goto out;
113857-
113858- if ((addr <= new_addr) && (addr+old_len) > new_addr)
113859+ if (addr + old_len > new_addr && new_addr + new_len > addr)
113860 goto out;
113861
113862 ret = do_munmap(mm, new_addr, new_len);
113863@@ -478,6 +494,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113864 unsigned long ret = -EINVAL;
113865 unsigned long charged = 0;
113866 bool locked = false;
113867+ unsigned long pax_task_size = TASK_SIZE;
113868
113869 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
113870 return ret;
113871@@ -499,6 +516,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113872 if (!new_len)
113873 return ret;
113874
113875+#ifdef CONFIG_PAX_SEGMEXEC
113876+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113877+ pax_task_size = SEGMEXEC_TASK_SIZE;
113878+#endif
113879+
113880+ pax_task_size -= PAGE_SIZE;
113881+
113882+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
113883+ old_len > pax_task_size || addr > pax_task_size-old_len)
113884+ return ret;
113885+
113886 down_write(&current->mm->mmap_sem);
113887
113888 if (flags & MREMAP_FIXED) {
113889@@ -549,6 +577,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113890 new_addr = addr;
113891 }
113892 ret = addr;
113893+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
113894 goto out;
113895 }
113896 }
113897@@ -572,7 +601,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113898 goto out;
113899 }
113900
113901+ map_flags = vma->vm_flags;
113902 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
113903+ if (!(ret & ~PAGE_MASK)) {
113904+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
113905+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
113906+ }
113907 }
113908 out:
113909 if (ret & ~PAGE_MASK)
113910diff --git a/mm/nommu.c b/mm/nommu.c
113911index e544508..b56ce7a 100644
113912--- a/mm/nommu.c
113913+++ b/mm/nommu.c
113914@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
113915 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
113916 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
113917 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
113918-int heap_stack_gap = 0;
113919
113920 atomic_long_t mmap_pages_allocated;
113921
113922@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
113923 EXPORT_SYMBOL(find_vma);
113924
113925 /*
113926- * find a VMA
113927- * - we don't extend stack VMAs under NOMMU conditions
113928- */
113929-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
113930-{
113931- return find_vma(mm, addr);
113932-}
113933-
113934-/*
113935 * expand a stack to a given address
113936 * - not supported under NOMMU conditions
113937 */
113938@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113939
113940 /* most fields are the same, copy all, and then fixup */
113941 *new = *vma;
113942+ INIT_LIST_HEAD(&new->anon_vma_chain);
113943 *region = *vma->vm_region;
113944 new->vm_region = region;
113945
113946@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
113947 }
113948 EXPORT_SYMBOL(filemap_map_pages);
113949
113950-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113951- unsigned long addr, void *buf, int len, int write)
113952+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113953+ unsigned long addr, void *buf, size_t len, int write)
113954 {
113955 struct vm_area_struct *vma;
113956
113957@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113958 *
113959 * The caller must hold a reference on @mm.
113960 */
113961-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113962- void *buf, int len, int write)
113963+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
113964+ void *buf, size_t len, int write)
113965 {
113966 return __access_remote_vm(NULL, mm, addr, buf, len, write);
113967 }
113968@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113969 * Access another process' address space.
113970 * - source/target buffer must be kernel space
113971 */
113972-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
113973+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
113974 {
113975 struct mm_struct *mm;
113976
113977diff --git a/mm/page-writeback.c b/mm/page-writeback.c
113978index eb59f7e..b23a2a8 100644
113979--- a/mm/page-writeback.c
113980+++ b/mm/page-writeback.c
113981@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
113982 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
113983 * - the bdi dirty thresh drops quickly due to change of JBOD workload
113984 */
113985-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
113986+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
113987 unsigned long thresh,
113988 unsigned long bg_thresh,
113989 unsigned long dirty,
113990diff --git a/mm/page_alloc.c b/mm/page_alloc.c
113991index ebffa0e..c61160a 100644
113992--- a/mm/page_alloc.c
113993+++ b/mm/page_alloc.c
113994@@ -61,6 +61,7 @@
113995 #include <linux/hugetlb.h>
113996 #include <linux/sched/rt.h>
113997 #include <linux/page_owner.h>
113998+#include <linux/random.h>
113999
114000 #include <asm/sections.h>
114001 #include <asm/tlbflush.h>
114002@@ -357,7 +358,7 @@ out:
114003 * This usage means that zero-order pages may not be compound.
114004 */
114005
114006-static void free_compound_page(struct page *page)
114007+void free_compound_page(struct page *page)
114008 {
114009 __free_pages_ok(page, compound_order(page));
114010 }
114011@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
114012 __mod_zone_freepage_state(zone, (1 << order), migratetype);
114013 }
114014 #else
114015-struct page_ext_operations debug_guardpage_ops = { NULL, };
114016+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
114017 static inline void set_page_guard(struct zone *zone, struct page *page,
114018 unsigned int order, int migratetype) {}
114019 static inline void clear_page_guard(struct zone *zone, struct page *page,
114020@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
114021 bool compound = PageCompound(page);
114022 int i, bad = 0;
114023
114024+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114025+ unsigned long index = 1UL << order;
114026+#endif
114027+
114028 VM_BUG_ON_PAGE(PageTail(page), page);
114029 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
114030
114031@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
114032 debug_check_no_obj_freed(page_address(page),
114033 PAGE_SIZE << order);
114034 }
114035+
114036+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114037+ for (; index; --index)
114038+ sanitize_highpage(page + index - 1);
114039+#endif
114040+
114041 arch_free_page(page, order);
114042 kernel_map_pages(page, 1 << order, 0);
114043
114044@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
114045 local_irq_restore(flags);
114046 }
114047
114048+#ifdef CONFIG_PAX_LATENT_ENTROPY
114049+bool __meminitdata extra_latent_entropy;
114050+
114051+static int __init setup_pax_extra_latent_entropy(char *str)
114052+{
114053+ extra_latent_entropy = true;
114054+ return 0;
114055+}
114056+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
114057+
114058+volatile u64 latent_entropy __latent_entropy;
114059+EXPORT_SYMBOL(latent_entropy);
114060+#endif
114061+
114062 void __init __free_pages_bootmem(struct page *page, unsigned int order)
114063 {
114064 unsigned int nr_pages = 1 << order;
114065@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
114066 __ClearPageReserved(p);
114067 set_page_count(p, 0);
114068
114069+#ifdef CONFIG_PAX_LATENT_ENTROPY
114070+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
114071+ u64 hash = 0;
114072+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
114073+ const u64 *data = lowmem_page_address(page);
114074+
114075+ for (index = 0; index < end; index++)
114076+ hash ^= hash + data[index];
114077+ latent_entropy ^= hash;
114078+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
114079+ }
114080+#endif
114081+
114082 page_zone(page)->managed_pages += nr_pages;
114083 set_page_refcounted(page);
114084 __free_pages(page, order);
114085@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
114086 kernel_map_pages(page, 1 << order, 1);
114087 kasan_alloc_pages(page, order);
114088
114089+#ifndef CONFIG_PAX_MEMORY_SANITIZE
114090 if (gfp_flags & __GFP_ZERO)
114091 prep_zero_page(page, order, gfp_flags);
114092+#endif
114093
114094 if (order && (gfp_flags & __GFP_COMP))
114095 prep_compound_page(page, order);
114096@@ -1649,6 +1689,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
114097 zone->free_area[order].nr_free--;
114098 rmv_page_order(page);
114099
114100+ set_page_owner(page, order, 0);
114101+
114102 /* Set the pageblock if the isolated page is at least a pageblock */
114103 if (order >= pageblock_order - 1) {
114104 struct page *endpage = page + (1 << order) - 1;
114105@@ -1660,7 +1702,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
114106 }
114107 }
114108
114109- set_page_owner(page, order, 0);
114110+
114111 return 1UL << order;
114112 }
114113
114114@@ -1749,7 +1791,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
114115 }
114116
114117 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
114118- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
114119+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
114120 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
114121 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
114122
114123@@ -2068,7 +2110,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
114124 do {
114125 mod_zone_page_state(zone, NR_ALLOC_BATCH,
114126 high_wmark_pages(zone) - low_wmark_pages(zone) -
114127- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114128+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114129 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
114130 } while (zone++ != preferred_zone);
114131 }
114132@@ -5781,7 +5823,7 @@ static void __setup_per_zone_wmarks(void)
114133
114134 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
114135 high_wmark_pages(zone) - low_wmark_pages(zone) -
114136- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114137+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114138
114139 setup_zone_migrate_reserve(zone);
114140 spin_unlock_irqrestore(&zone->lock, flags);
114141diff --git a/mm/percpu.c b/mm/percpu.c
114142index 2dd7448..9bb6305 100644
114143--- a/mm/percpu.c
114144+++ b/mm/percpu.c
114145@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
114146 static unsigned int pcpu_high_unit_cpu __read_mostly;
114147
114148 /* the address of the first chunk which starts with the kernel static area */
114149-void *pcpu_base_addr __read_mostly;
114150+void *pcpu_base_addr __read_only;
114151 EXPORT_SYMBOL_GPL(pcpu_base_addr);
114152
114153 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
114154diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
114155index e88d071..d80e01a 100644
114156--- a/mm/process_vm_access.c
114157+++ b/mm/process_vm_access.c
114158@@ -13,6 +13,7 @@
114159 #include <linux/uio.h>
114160 #include <linux/sched.h>
114161 #include <linux/highmem.h>
114162+#include <linux/security.h>
114163 #include <linux/ptrace.h>
114164 #include <linux/slab.h>
114165 #include <linux/syscalls.h>
114166@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114167 ssize_t iov_len;
114168 size_t total_len = iov_iter_count(iter);
114169
114170+ return -ENOSYS; // PaX: until properly audited
114171+
114172 /*
114173 * Work out how many pages of struct pages we're going to need
114174 * when eventually calling get_user_pages
114175 */
114176 for (i = 0; i < riovcnt; i++) {
114177 iov_len = rvec[i].iov_len;
114178- if (iov_len > 0) {
114179- nr_pages_iov = ((unsigned long)rvec[i].iov_base
114180- + iov_len)
114181- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
114182- / PAGE_SIZE + 1;
114183- nr_pages = max(nr_pages, nr_pages_iov);
114184- }
114185+ if (iov_len <= 0)
114186+ continue;
114187+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
114188+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
114189+ nr_pages = max(nr_pages, nr_pages_iov);
114190 }
114191
114192 if (nr_pages == 0)
114193@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114194 goto free_proc_pages;
114195 }
114196
114197+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
114198+ rc = -EPERM;
114199+ goto put_task_struct;
114200+ }
114201+
114202 mm = mm_access(task, PTRACE_MODE_ATTACH);
114203 if (!mm || IS_ERR(mm)) {
114204 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
114205diff --git a/mm/rmap.c b/mm/rmap.c
114206index 24dd3f9..4eb43f4 100644
114207--- a/mm/rmap.c
114208+++ b/mm/rmap.c
114209@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114210 struct anon_vma *anon_vma = vma->anon_vma;
114211 struct anon_vma_chain *avc;
114212
114213+#ifdef CONFIG_PAX_SEGMEXEC
114214+ struct anon_vma_chain *avc_m = NULL;
114215+#endif
114216+
114217 might_sleep();
114218 if (unlikely(!anon_vma)) {
114219 struct mm_struct *mm = vma->vm_mm;
114220@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114221 if (!avc)
114222 goto out_enomem;
114223
114224+#ifdef CONFIG_PAX_SEGMEXEC
114225+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
114226+ if (!avc_m)
114227+ goto out_enomem_free_avc;
114228+#endif
114229+
114230 anon_vma = find_mergeable_anon_vma(vma);
114231 allocated = NULL;
114232 if (!anon_vma) {
114233@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114234 /* page_table_lock to protect against threads */
114235 spin_lock(&mm->page_table_lock);
114236 if (likely(!vma->anon_vma)) {
114237+
114238+#ifdef CONFIG_PAX_SEGMEXEC
114239+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
114240+
114241+ if (vma_m) {
114242+ BUG_ON(vma_m->anon_vma);
114243+ vma_m->anon_vma = anon_vma;
114244+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
114245+ anon_vma->degree++;
114246+ avc_m = NULL;
114247+ }
114248+#endif
114249+
114250 vma->anon_vma = anon_vma;
114251 anon_vma_chain_link(vma, avc, anon_vma);
114252 /* vma reference or self-parent link for new root */
114253@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114254
114255 if (unlikely(allocated))
114256 put_anon_vma(allocated);
114257+
114258+#ifdef CONFIG_PAX_SEGMEXEC
114259+ if (unlikely(avc_m))
114260+ anon_vma_chain_free(avc_m);
114261+#endif
114262+
114263 if (unlikely(avc))
114264 anon_vma_chain_free(avc);
114265 }
114266 return 0;
114267
114268 out_enomem_free_avc:
114269+
114270+#ifdef CONFIG_PAX_SEGMEXEC
114271+ if (avc_m)
114272+ anon_vma_chain_free(avc_m);
114273+#endif
114274+
114275 anon_vma_chain_free(avc);
114276 out_enomem:
114277 return -ENOMEM;
114278@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
114279 * good chance of avoiding scanning the whole hierarchy when it searches where
114280 * page is mapped.
114281 */
114282-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114283+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
114284 {
114285 struct anon_vma_chain *avc, *pavc;
114286 struct anon_vma *root = NULL;
114287@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114288 * the corresponding VMA in the parent process is attached to.
114289 * Returns 0 on success, non-zero on failure.
114290 */
114291-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
114292+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
114293 {
114294 struct anon_vma_chain *avc;
114295 struct anon_vma *anon_vma;
114296@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
114297 void __init anon_vma_init(void)
114298 {
114299 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
114300- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
114301- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
114302+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
114303+ anon_vma_ctor);
114304+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
114305+ SLAB_PANIC|SLAB_NO_SANITIZE);
114306 }
114307
114308 /*
114309diff --git a/mm/shmem.c b/mm/shmem.c
114310index 47d536e..8321b4e 100644
114311--- a/mm/shmem.c
114312+++ b/mm/shmem.c
114313@@ -33,7 +33,7 @@
114314 #include <linux/swap.h>
114315 #include <linux/uio.h>
114316
114317-static struct vfsmount *shm_mnt;
114318+struct vfsmount *shm_mnt;
114319
114320 #ifdef CONFIG_SHMEM
114321 /*
114322@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
114323 #define BOGO_DIRENT_SIZE 20
114324
114325 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
114326-#define SHORT_SYMLINK_LEN 128
114327+#define SHORT_SYMLINK_LEN 64
114328
114329 /*
114330 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
114331@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
114332 static int shmem_xattr_validate(const char *name)
114333 {
114334 struct { const char *prefix; size_t len; } arr[] = {
114335+
114336+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114337+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
114338+#endif
114339+
114340 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
114341 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
114342 };
114343@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
114344 if (err)
114345 return err;
114346
114347+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114348+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
114349+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
114350+ return -EOPNOTSUPP;
114351+ if (size > 8)
114352+ return -EINVAL;
114353+ }
114354+#endif
114355+
114356 return simple_xattr_set(&info->xattrs, name, value, size, flags);
114357 }
114358
114359@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
114360 int err = -ENOMEM;
114361
114362 /* Round up to L1_CACHE_BYTES to resist false sharing */
114363- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
114364- L1_CACHE_BYTES), GFP_KERNEL);
114365+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
114366 if (!sbinfo)
114367 return -ENOMEM;
114368
114369diff --git a/mm/slab.c b/mm/slab.c
114370index 7eb38dd..a5172b1 100644
114371--- a/mm/slab.c
114372+++ b/mm/slab.c
114373@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114374 if ((x)->max_freeable < i) \
114375 (x)->max_freeable = i; \
114376 } while (0)
114377-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
114378-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
114379-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
114380-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
114381+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
114382+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
114383+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
114384+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
114385+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
114386+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
114387 #else
114388 #define STATS_INC_ACTIVE(x) do { } while (0)
114389 #define STATS_DEC_ACTIVE(x) do { } while (0)
114390@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114391 #define STATS_INC_ALLOCMISS(x) do { } while (0)
114392 #define STATS_INC_FREEHIT(x) do { } while (0)
114393 #define STATS_INC_FREEMISS(x) do { } while (0)
114394+#define STATS_INC_SANITIZED(x) do { } while (0)
114395+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
114396 #endif
114397
114398 #if DEBUG
114399@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
114400 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
114401 */
114402 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
114403- const struct page *page, void *obj)
114404+ const struct page *page, const void *obj)
114405 {
114406 u32 offset = (obj - page->s_mem);
114407 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
114408@@ -1452,7 +1456,7 @@ void __init kmem_cache_init(void)
114409 * structures first. Without this, further allocations will bug.
114410 */
114411 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
114412- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
114413+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
114414 slab_state = PARTIAL_NODE;
114415
114416 slab_early_init = 0;
114417@@ -2073,7 +2077,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
114418
114419 cachep = find_mergeable(size, align, flags, name, ctor);
114420 if (cachep) {
114421- cachep->refcount++;
114422+ atomic_inc(&cachep->refcount);
114423
114424 /*
114425 * Adjust the object sizes so that we clear
114426@@ -3371,6 +3375,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
114427 struct array_cache *ac = cpu_cache_get(cachep);
114428
114429 check_irq_off();
114430+
114431+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114432+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
114433+ STATS_INC_NOT_SANITIZED(cachep);
114434+ else {
114435+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
114436+
114437+ if (cachep->ctor)
114438+ cachep->ctor(objp);
114439+
114440+ STATS_INC_SANITIZED(cachep);
114441+ }
114442+#endif
114443+
114444 kmemleak_free_recursive(objp, cachep->flags);
114445 objp = cache_free_debugcheck(cachep, objp, caller);
114446
114447@@ -3483,7 +3501,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
114448 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
114449 }
114450
114451-void *__kmalloc_node(size_t size, gfp_t flags, int node)
114452+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
114453 {
114454 return __do_kmalloc_node(size, flags, node, _RET_IP_);
114455 }
114456@@ -3503,7 +3521,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
114457 * @flags: the type of memory to allocate (see kmalloc).
114458 * @caller: function caller for debug tracking of the caller
114459 */
114460-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
114461+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
114462 unsigned long caller)
114463 {
114464 struct kmem_cache *cachep;
114465@@ -3576,6 +3594,7 @@ void kfree(const void *objp)
114466
114467 if (unlikely(ZERO_OR_NULL_PTR(objp)))
114468 return;
114469+ VM_BUG_ON(!virt_addr_valid(objp));
114470 local_irq_save(flags);
114471 kfree_debugcheck(objp);
114472 c = virt_to_cache(objp);
114473@@ -3995,14 +4014,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
114474 }
114475 /* cpu stats */
114476 {
114477- unsigned long allochit = atomic_read(&cachep->allochit);
114478- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
114479- unsigned long freehit = atomic_read(&cachep->freehit);
114480- unsigned long freemiss = atomic_read(&cachep->freemiss);
114481+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
114482+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
114483+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
114484+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
114485
114486 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
114487 allochit, allocmiss, freehit, freemiss);
114488 }
114489+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114490+ {
114491+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
114492+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
114493+
114494+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
114495+ }
114496+#endif
114497 #endif
114498 }
114499
114500@@ -4210,13 +4237,69 @@ static const struct file_operations proc_slabstats_operations = {
114501 static int __init slab_proc_init(void)
114502 {
114503 #ifdef CONFIG_DEBUG_SLAB_LEAK
114504- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
114505+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
114506 #endif
114507 return 0;
114508 }
114509 module_init(slab_proc_init);
114510 #endif
114511
114512+bool is_usercopy_object(const void *ptr)
114513+{
114514+ struct page *page;
114515+ struct kmem_cache *cachep;
114516+
114517+ if (ZERO_OR_NULL_PTR(ptr))
114518+ return false;
114519+
114520+ if (!slab_is_available())
114521+ return false;
114522+
114523+ if (!virt_addr_valid(ptr))
114524+ return false;
114525+
114526+ page = virt_to_head_page(ptr);
114527+
114528+ if (!PageSlab(page))
114529+ return false;
114530+
114531+ cachep = page->slab_cache;
114532+ return cachep->flags & SLAB_USERCOPY;
114533+}
114534+
114535+#ifdef CONFIG_PAX_USERCOPY
114536+const char *check_heap_object(const void *ptr, unsigned long n)
114537+{
114538+ struct page *page;
114539+ struct kmem_cache *cachep;
114540+ unsigned int objnr;
114541+ unsigned long offset;
114542+
114543+ if (ZERO_OR_NULL_PTR(ptr))
114544+ return "<null>";
114545+
114546+ if (!virt_addr_valid(ptr))
114547+ return NULL;
114548+
114549+ page = virt_to_head_page(ptr);
114550+
114551+ if (!PageSlab(page))
114552+ return NULL;
114553+
114554+ cachep = page->slab_cache;
114555+ if (!(cachep->flags & SLAB_USERCOPY))
114556+ return cachep->name;
114557+
114558+ objnr = obj_to_index(cachep, page, ptr);
114559+ BUG_ON(objnr >= cachep->num);
114560+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
114561+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
114562+ return NULL;
114563+
114564+ return cachep->name;
114565+}
114566+#endif
114567+
114568 /**
114569 * ksize - get the actual amount of memory allocated for a given object
114570 * @objp: Pointer to the object
114571diff --git a/mm/slab.h b/mm/slab.h
114572index 4c3ac12..7b2e470 100644
114573--- a/mm/slab.h
114574+++ b/mm/slab.h
114575@@ -22,7 +22,7 @@ struct kmem_cache {
114576 unsigned int align; /* Alignment as calculated */
114577 unsigned long flags; /* Active flags on the slab */
114578 const char *name; /* Slab name for sysfs */
114579- int refcount; /* Use counter */
114580+ atomic_t refcount; /* Use counter */
114581 void (*ctor)(void *); /* Called on object slot creation */
114582 struct list_head list; /* List of all slab caches on the system */
114583 };
114584@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
114585 /* The slab cache that manages slab cache information */
114586 extern struct kmem_cache *kmem_cache;
114587
114588+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114589+#ifdef CONFIG_X86_64
114590+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
114591+#else
114592+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
114593+#endif
114594+enum pax_sanitize_mode {
114595+ PAX_SANITIZE_SLAB_OFF = 0,
114596+ PAX_SANITIZE_SLAB_FAST,
114597+ PAX_SANITIZE_SLAB_FULL,
114598+};
114599+extern enum pax_sanitize_mode pax_sanitize_slab;
114600+#endif
114601+
114602 unsigned long calculate_alignment(unsigned long flags,
114603 unsigned long align, unsigned long size);
114604
114605@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
114606
114607 /* Legal flag mask for kmem_cache_create(), for various configurations */
114608 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
114609- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
114610+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
114611+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
114612
114613 #if defined(CONFIG_DEBUG_SLAB)
114614 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
114615@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
114616 return s;
114617
114618 page = virt_to_head_page(x);
114619+
114620+ BUG_ON(!PageSlab(page));
114621+
114622 cachep = page->slab_cache;
114623 if (slab_equal_or_root(cachep, s))
114624 return cachep;
114625diff --git a/mm/slab_common.c b/mm/slab_common.c
114626index 999bb34..9843aea 100644
114627--- a/mm/slab_common.c
114628+++ b/mm/slab_common.c
114629@@ -25,11 +25,35 @@
114630
114631 #include "slab.h"
114632
114633-enum slab_state slab_state;
114634+enum slab_state slab_state __read_only;
114635 LIST_HEAD(slab_caches);
114636 DEFINE_MUTEX(slab_mutex);
114637 struct kmem_cache *kmem_cache;
114638
114639+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114640+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
114641+static int __init pax_sanitize_slab_setup(char *str)
114642+{
114643+ if (!str)
114644+ return 0;
114645+
114646+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
114647+ pr_info("PaX slab sanitization: %s\n", "disabled");
114648+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
114649+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
114650+ pr_info("PaX slab sanitization: %s\n", "fast");
114651+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
114652+ } else if (!strcmp(str, "full")) {
114653+ pr_info("PaX slab sanitization: %s\n", "full");
114654+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
114655+ } else
114656+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
114657+
114658+ return 0;
114659+}
114660+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
114661+#endif
114662+
114663 /*
114664 * Set of flags that will prevent slab merging
114665 */
114666@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
114667 * Merge control. If this is set then no merging of slab caches will occur.
114668 * (Could be removed. This was introduced to pacify the merge skeptics.)
114669 */
114670-static int slab_nomerge;
114671+static int slab_nomerge = 1;
114672
114673 static int __init setup_slab_nomerge(char *str)
114674 {
114675@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
114676 /*
114677 * We may have set a slab to be unmergeable during bootstrap.
114678 */
114679- if (s->refcount < 0)
114680+ if (atomic_read(&s->refcount) < 0)
114681 return 1;
114682
114683 return 0;
114684@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
114685 if (err)
114686 goto out_free_cache;
114687
114688- s->refcount = 1;
114689+ atomic_set(&s->refcount, 1);
114690 list_add(&s->list, &slab_caches);
114691 out:
114692 if (err)
114693@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
114694 */
114695 flags &= CACHE_CREATE_MASK;
114696
114697+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114698+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
114699+ flags |= SLAB_NO_SANITIZE;
114700+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
114701+ flags &= ~SLAB_NO_SANITIZE;
114702+#endif
114703+
114704 s = __kmem_cache_alias(name, size, align, flags, ctor);
114705 if (s)
114706 goto out_unlock;
114707@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
114708 rcu_barrier();
114709
114710 list_for_each_entry_safe(s, s2, release, list) {
114711-#ifdef SLAB_SUPPORTS_SYSFS
114712+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
114713 sysfs_slab_remove(s);
114714 #else
114715 slab_kmem_cache_release(s);
114716@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
114717
114718 mutex_lock(&slab_mutex);
114719
114720- s->refcount--;
114721- if (s->refcount)
114722+ if (!atomic_dec_and_test(&s->refcount))
114723 goto out_unlock;
114724
114725 for_each_memcg_cache_safe(c, c2, s) {
114726@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
114727 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
114728 name, size, err);
114729
114730- s->refcount = -1; /* Exempt from merging for now */
114731+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
114732 }
114733
114734 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114735@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114736
114737 create_boot_cache(s, name, size, flags);
114738 list_add(&s->list, &slab_caches);
114739- s->refcount = 1;
114740+ atomic_set(&s->refcount, 1);
114741 return s;
114742 }
114743
114744@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
114745 EXPORT_SYMBOL(kmalloc_dma_caches);
114746 #endif
114747
114748+#ifdef CONFIG_PAX_USERCOPY_SLABS
114749+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
114750+EXPORT_SYMBOL(kmalloc_usercopy_caches);
114751+#endif
114752+
114753 /*
114754 * Conversion table for small slabs sizes / 8 to the index in the
114755 * kmalloc array. This is necessary for slabs < 192 since we have non power
114756@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
114757 return kmalloc_dma_caches[index];
114758
114759 #endif
114760+
114761+#ifdef CONFIG_PAX_USERCOPY_SLABS
114762+ if (unlikely((flags & GFP_USERCOPY)))
114763+ return kmalloc_usercopy_caches[index];
114764+
114765+#endif
114766+
114767 return kmalloc_caches[index];
114768 }
114769
114770@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
114771 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
114772 if (!kmalloc_caches[i]) {
114773 kmalloc_caches[i] = create_kmalloc_cache(NULL,
114774- 1 << i, flags);
114775+ 1 << i, SLAB_USERCOPY | flags);
114776 }
114777
114778 /*
114779@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
114780 * earlier power of two caches
114781 */
114782 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
114783- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
114784+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
114785
114786 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
114787- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
114788+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
114789 }
114790
114791 /* Kmalloc array is now usable */
114792@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
114793 }
114794 }
114795 #endif
114796+
114797+#ifdef CONFIG_PAX_USERCOPY_SLABS
114798+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
114799+ struct kmem_cache *s = kmalloc_caches[i];
114800+
114801+ if (s) {
114802+ int size = kmalloc_size(i);
114803+ char *n = kasprintf(GFP_NOWAIT,
114804+ "usercopy-kmalloc-%d", size);
114805+
114806+ BUG_ON(!n);
114807+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
114808+ size, SLAB_USERCOPY | flags);
114809+ }
114810+ }
114811+#endif
114812+
114813 }
114814 #endif /* !CONFIG_SLOB */
114815
114816@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
114817 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
114818 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
114819 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
114820+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114821+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
114822+#endif
114823 #endif
114824 seq_putc(m, '\n');
114825 }
114826@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
114827 module_init(slab_proc_init);
114828 #endif /* CONFIG_SLABINFO */
114829
114830-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
114831+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
114832 gfp_t flags)
114833 {
114834 void *ret;
114835diff --git a/mm/slob.c b/mm/slob.c
114836index 4765f65..fafa9d5 100644
114837--- a/mm/slob.c
114838+++ b/mm/slob.c
114839@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
114840 /*
114841 * Return the size of a slob block.
114842 */
114843-static slobidx_t slob_units(slob_t *s)
114844+static slobidx_t slob_units(const slob_t *s)
114845 {
114846 if (s->units > 0)
114847 return s->units;
114848@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
114849 /*
114850 * Return the next free slob block pointer after this one.
114851 */
114852-static slob_t *slob_next(slob_t *s)
114853+static slob_t *slob_next(const slob_t *s)
114854 {
114855 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
114856 slobidx_t next;
114857@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
114858 /*
114859 * Returns true if s is the last free block in its page.
114860 */
114861-static int slob_last(slob_t *s)
114862+static int slob_last(const slob_t *s)
114863 {
114864 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
114865 }
114866
114867-static void *slob_new_pages(gfp_t gfp, int order, int node)
114868+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
114869 {
114870- void *page;
114871+ struct page *page;
114872
114873 #ifdef CONFIG_NUMA
114874 if (node != NUMA_NO_NODE)
114875@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
114876 if (!page)
114877 return NULL;
114878
114879- return page_address(page);
114880+ __SetPageSlab(page);
114881+ return page;
114882 }
114883
114884-static void slob_free_pages(void *b, int order)
114885+static void slob_free_pages(struct page *sp, int order)
114886 {
114887 if (current->reclaim_state)
114888 current->reclaim_state->reclaimed_slab += 1 << order;
114889- free_pages((unsigned long)b, order);
114890+ __ClearPageSlab(sp);
114891+ page_mapcount_reset(sp);
114892+ sp->private = 0;
114893+ __free_pages(sp, order);
114894 }
114895
114896 /*
114897@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114898
114899 /* Not enough space: must allocate a new page */
114900 if (!b) {
114901- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114902- if (!b)
114903+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114904+ if (!sp)
114905 return NULL;
114906- sp = virt_to_page(b);
114907- __SetPageSlab(sp);
114908+ b = page_address(sp);
114909
114910 spin_lock_irqsave(&slob_lock, flags);
114911 sp->units = SLOB_UNITS(PAGE_SIZE);
114912 sp->freelist = b;
114913+ sp->private = 0;
114914 INIT_LIST_HEAD(&sp->lru);
114915 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
114916 set_slob_page_free(sp, slob_list);
114917@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114918 /*
114919 * slob_free: entry point into the slob allocator.
114920 */
114921-static void slob_free(void *block, int size)
114922+static void slob_free(struct kmem_cache *c, void *block, int size)
114923 {
114924 struct page *sp;
114925 slob_t *prev, *next, *b = (slob_t *)block;
114926@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
114927 if (slob_page_free(sp))
114928 clear_slob_page_free(sp);
114929 spin_unlock_irqrestore(&slob_lock, flags);
114930- __ClearPageSlab(sp);
114931- page_mapcount_reset(sp);
114932- slob_free_pages(b, 0);
114933+ slob_free_pages(sp, 0);
114934 return;
114935 }
114936
114937+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114938+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
114939+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
114940+#endif
114941+
114942 if (!slob_page_free(sp)) {
114943 /* This slob page is about to become partially free. Easy! */
114944 sp->units = units;
114945@@ -424,11 +431,10 @@ out:
114946 */
114947
114948 static __always_inline void *
114949-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114950+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
114951 {
114952- unsigned int *m;
114953- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114954- void *ret;
114955+ slob_t *m;
114956+ void *ret = NULL;
114957
114958 gfp &= gfp_allowed_mask;
114959
114960@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114961
114962 if (!m)
114963 return NULL;
114964- *m = size;
114965+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
114966+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
114967+ m[0].units = size;
114968+ m[1].units = align;
114969 ret = (void *)m + align;
114970
114971 trace_kmalloc_node(caller, ret,
114972 size, size + align, gfp, node);
114973 } else {
114974 unsigned int order = get_order(size);
114975+ struct page *page;
114976
114977 if (likely(order))
114978 gfp |= __GFP_COMP;
114979- ret = slob_new_pages(gfp, order, node);
114980+ page = slob_new_pages(gfp, order, node);
114981+ if (page) {
114982+ ret = page_address(page);
114983+ page->private = size;
114984+ }
114985
114986 trace_kmalloc_node(caller, ret,
114987 size, PAGE_SIZE << order, gfp, node);
114988 }
114989
114990- kmemleak_alloc(ret, size, 1, gfp);
114991 return ret;
114992 }
114993
114994-void *__kmalloc(size_t size, gfp_t gfp)
114995+static __always_inline void *
114996+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114997+{
114998+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114999+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
115000+
115001+ if (!ZERO_OR_NULL_PTR(ret))
115002+ kmemleak_alloc(ret, size, 1, gfp);
115003+ return ret;
115004+}
115005+
115006+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
115007 {
115008 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
115009 }
115010@@ -491,34 +515,112 @@ void kfree(const void *block)
115011 return;
115012 kmemleak_free(block);
115013
115014+ VM_BUG_ON(!virt_addr_valid(block));
115015 sp = virt_to_page(block);
115016- if (PageSlab(sp)) {
115017+ VM_BUG_ON(!PageSlab(sp));
115018+ if (!sp->private) {
115019 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
115020- unsigned int *m = (unsigned int *)(block - align);
115021- slob_free(m, *m + align);
115022- } else
115023+ slob_t *m = (slob_t *)(block - align);
115024+ slob_free(NULL, m, m[0].units + align);
115025+ } else {
115026+ __ClearPageSlab(sp);
115027+ page_mapcount_reset(sp);
115028+ sp->private = 0;
115029 __free_pages(sp, compound_order(sp));
115030+ }
115031 }
115032 EXPORT_SYMBOL(kfree);
115033
115034+bool is_usercopy_object(const void *ptr)
115035+{
115036+ if (!slab_is_available())
115037+ return false;
115038+
115039+ // PAX: TODO
115040+
115041+ return false;
115042+}
115043+
115044+#ifdef CONFIG_PAX_USERCOPY
115045+const char *check_heap_object(const void *ptr, unsigned long n)
115046+{
115047+ struct page *page;
115048+ const slob_t *free;
115049+ const void *base;
115050+ unsigned long flags;
115051+
115052+ if (ZERO_OR_NULL_PTR(ptr))
115053+ return "<null>";
115054+
115055+ if (!virt_addr_valid(ptr))
115056+ return NULL;
115057+
115058+ page = virt_to_head_page(ptr);
115059+ if (!PageSlab(page))
115060+ return NULL;
115061+
115062+ if (page->private) {
115063+ base = page;
115064+ if (base <= ptr && n <= page->private - (ptr - base))
115065+ return NULL;
115066+ return "<slob>";
115067+ }
115068+
115069+ /* some tricky double walking to find the chunk */
115070+ spin_lock_irqsave(&slob_lock, flags);
115071+ base = (void *)((unsigned long)ptr & PAGE_MASK);
115072+ free = page->freelist;
115073+
115074+ while (!slob_last(free) && (void *)free <= ptr) {
115075+ base = free + slob_units(free);
115076+ free = slob_next(free);
115077+ }
115078+
115079+ while (base < (void *)free) {
115080+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
115081+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
115082+ int offset;
115083+
115084+ if (ptr < base + align)
115085+ break;
115086+
115087+ offset = ptr - base - align;
115088+ if (offset >= m) {
115089+ base += size;
115090+ continue;
115091+ }
115092+
115093+ if (n > m - offset)
115094+ break;
115095+
115096+ spin_unlock_irqrestore(&slob_lock, flags);
115097+ return NULL;
115098+ }
115099+
115100+ spin_unlock_irqrestore(&slob_lock, flags);
115101+ return "<slob>";
115102+}
115103+#endif
115104+
115105 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
115106 size_t ksize(const void *block)
115107 {
115108 struct page *sp;
115109 int align;
115110- unsigned int *m;
115111+ slob_t *m;
115112
115113 BUG_ON(!block);
115114 if (unlikely(block == ZERO_SIZE_PTR))
115115 return 0;
115116
115117 sp = virt_to_page(block);
115118- if (unlikely(!PageSlab(sp)))
115119- return PAGE_SIZE << compound_order(sp);
115120+ VM_BUG_ON(!PageSlab(sp));
115121+ if (sp->private)
115122+ return sp->private;
115123
115124 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
115125- m = (unsigned int *)(block - align);
115126- return SLOB_UNITS(*m) * SLOB_UNIT;
115127+ m = (slob_t *)(block - align);
115128+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
115129 }
115130 EXPORT_SYMBOL(ksize);
115131
115132@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
115133
115134 static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
115135 {
115136- void *b;
115137+ void *b = NULL;
115138
115139 flags &= gfp_allowed_mask;
115140
115141 lockdep_trace_alloc(flags);
115142
115143+#ifdef CONFIG_PAX_USERCOPY_SLABS
115144+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
115145+#else
115146 if (c->size < PAGE_SIZE) {
115147 b = slob_alloc(c->size, flags, c->align, node);
115148 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115149 SLOB_UNITS(c->size) * SLOB_UNIT,
115150 flags, node);
115151 } else {
115152- b = slob_new_pages(flags, get_order(c->size), node);
115153+ struct page *sp;
115154+
115155+ sp = slob_new_pages(flags, get_order(c->size), node);
115156+ if (sp) {
115157+ b = page_address(sp);
115158+ sp->private = c->size;
115159+ }
115160 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115161 PAGE_SIZE << get_order(c->size),
115162 flags, node);
115163 }
115164+#endif
115165
115166 if (b && c->ctor)
115167 c->ctor(b);
115168@@ -566,7 +678,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
115169 EXPORT_SYMBOL(kmem_cache_alloc);
115170
115171 #ifdef CONFIG_NUMA
115172-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
115173+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
115174 {
115175 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
115176 }
115177@@ -579,12 +691,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
115178 EXPORT_SYMBOL(kmem_cache_alloc_node);
115179 #endif
115180
115181-static void __kmem_cache_free(void *b, int size)
115182+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
115183 {
115184- if (size < PAGE_SIZE)
115185- slob_free(b, size);
115186+ struct page *sp;
115187+
115188+ sp = virt_to_page(b);
115189+ BUG_ON(!PageSlab(sp));
115190+ if (!sp->private)
115191+ slob_free(c, b, size);
115192 else
115193- slob_free_pages(b, get_order(size));
115194+ slob_free_pages(sp, get_order(size));
115195 }
115196
115197 static void kmem_rcu_free(struct rcu_head *head)
115198@@ -592,22 +708,36 @@ static void kmem_rcu_free(struct rcu_head *head)
115199 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
115200 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
115201
115202- __kmem_cache_free(b, slob_rcu->size);
115203+ __kmem_cache_free(NULL, b, slob_rcu->size);
115204 }
115205
115206 void kmem_cache_free(struct kmem_cache *c, void *b)
115207 {
115208+ int size = c->size;
115209+
115210+#ifdef CONFIG_PAX_USERCOPY_SLABS
115211+ if (size + c->align < PAGE_SIZE) {
115212+ size += c->align;
115213+ b -= c->align;
115214+ }
115215+#endif
115216+
115217 kmemleak_free_recursive(b, c->flags);
115218 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
115219 struct slob_rcu *slob_rcu;
115220- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
115221- slob_rcu->size = c->size;
115222+ slob_rcu = b + (size - sizeof(struct slob_rcu));
115223+ slob_rcu->size = size;
115224 call_rcu(&slob_rcu->head, kmem_rcu_free);
115225 } else {
115226- __kmem_cache_free(b, c->size);
115227+ __kmem_cache_free(c, b, size);
115228 }
115229
115230+#ifdef CONFIG_PAX_USERCOPY_SLABS
115231+ trace_kfree(_RET_IP_, b);
115232+#else
115233 trace_kmem_cache_free(_RET_IP_, b);
115234+#endif
115235+
115236 }
115237 EXPORT_SYMBOL(kmem_cache_free);
115238
115239diff --git a/mm/slub.c b/mm/slub.c
115240index 54c0876..31383a1 100644
115241--- a/mm/slub.c
115242+++ b/mm/slub.c
115243@@ -198,7 +198,7 @@ struct track {
115244
115245 enum track_item { TRACK_ALLOC, TRACK_FREE };
115246
115247-#ifdef CONFIG_SYSFS
115248+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115249 static int sysfs_slab_add(struct kmem_cache *);
115250 static int sysfs_slab_alias(struct kmem_cache *, const char *);
115251 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
115252@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
115253 if (!t->addr)
115254 return;
115255
115256- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
115257+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
115258 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
115259 #ifdef CONFIG_STACKTRACE
115260 {
115261@@ -2707,6 +2707,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
115262
115263 slab_free_hook(s, x);
115264
115265+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115266+ if (!(s->flags & SLAB_NO_SANITIZE)) {
115267+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
115268+ if (s->ctor)
115269+ s->ctor(x);
115270+ }
115271+#endif
115272+
115273 redo:
115274 /*
115275 * Determine the currently cpus per cpu slab.
115276@@ -3048,6 +3056,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
115277 s->inuse = size;
115278
115279 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
115280+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115281+ (!(flags & SLAB_NO_SANITIZE)) ||
115282+#endif
115283 s->ctor)) {
115284 /*
115285 * Relocate free pointer after the object if it is not
115286@@ -3302,7 +3313,7 @@ static int __init setup_slub_min_objects(char *str)
115287
115288 __setup("slub_min_objects=", setup_slub_min_objects);
115289
115290-void *__kmalloc(size_t size, gfp_t flags)
115291+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
115292 {
115293 struct kmem_cache *s;
115294 void *ret;
115295@@ -3340,7 +3351,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
115296 return ptr;
115297 }
115298
115299-void *__kmalloc_node(size_t size, gfp_t flags, int node)
115300+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
115301 {
115302 struct kmem_cache *s;
115303 void *ret;
115304@@ -3388,6 +3399,59 @@ static size_t __ksize(const void *object)
115305 return slab_ksize(page->slab_cache);
115306 }
115307
115308+bool is_usercopy_object(const void *ptr)
115309+{
115310+ struct page *page;
115311+ struct kmem_cache *s;
115312+
115313+ if (ZERO_OR_NULL_PTR(ptr))
115314+ return false;
115315+
115316+ if (!slab_is_available())
115317+ return false;
115318+
115319+ if (!virt_addr_valid(ptr))
115320+ return false;
115321+
115322+ page = virt_to_head_page(ptr);
115323+
115324+ if (!PageSlab(page))
115325+ return false;
115326+
115327+ s = page->slab_cache;
115328+ return s->flags & SLAB_USERCOPY;
115329+}
115330+
115331+#ifdef CONFIG_PAX_USERCOPY
115332+const char *check_heap_object(const void *ptr, unsigned long n)
115333+{
115334+ struct page *page;
115335+ struct kmem_cache *s;
115336+ unsigned long offset;
115337+
115338+ if (ZERO_OR_NULL_PTR(ptr))
115339+ return "<null>";
115340+
115341+ if (!virt_addr_valid(ptr))
115342+ return NULL;
115343+
115344+ page = virt_to_head_page(ptr);
115345+
115346+ if (!PageSlab(page))
115347+ return NULL;
115348+
115349+ s = page->slab_cache;
115350+ if (!(s->flags & SLAB_USERCOPY))
115351+ return s->name;
115352+
115353+ offset = (ptr - page_address(page)) % s->size;
115354+ if (offset <= s->object_size && n <= s->object_size - offset)
115355+ return NULL;
115356+
115357+ return s->name;
115358+}
115359+#endif
115360+
115361 size_t ksize(const void *object)
115362 {
115363 size_t size = __ksize(object);
115364@@ -3408,6 +3472,7 @@ void kfree(const void *x)
115365 if (unlikely(ZERO_OR_NULL_PTR(x)))
115366 return;
115367
115368+ VM_BUG_ON(!virt_addr_valid(x));
115369 page = virt_to_head_page(x);
115370 if (unlikely(!PageSlab(page))) {
115371 BUG_ON(!PageCompound(page));
115372@@ -3724,7 +3789,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115373
115374 s = find_mergeable(size, align, flags, name, ctor);
115375 if (s) {
115376- s->refcount++;
115377+ atomic_inc(&s->refcount);
115378
115379 /*
115380 * Adjust the object sizes so that we clear
115381@@ -3740,7 +3805,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115382 }
115383
115384 if (sysfs_slab_alias(s, name)) {
115385- s->refcount--;
115386+ atomic_dec(&s->refcount);
115387 s = NULL;
115388 }
115389 }
115390@@ -3857,7 +3922,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
115391 }
115392 #endif
115393
115394-#ifdef CONFIG_SYSFS
115395+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115396 static int count_inuse(struct page *page)
115397 {
115398 return page->inuse;
115399@@ -4138,7 +4203,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
115400 len += sprintf(buf + len, "%7ld ", l->count);
115401
115402 if (l->addr)
115403+#ifdef CONFIG_GRKERNSEC_HIDESYM
115404+ len += sprintf(buf + len, "%pS", NULL);
115405+#else
115406 len += sprintf(buf + len, "%pS", (void *)l->addr);
115407+#endif
115408 else
115409 len += sprintf(buf + len, "<not-available>");
115410
115411@@ -4236,12 +4305,12 @@ static void __init resiliency_test(void)
115412 validate_slab_cache(kmalloc_caches[9]);
115413 }
115414 #else
115415-#ifdef CONFIG_SYSFS
115416+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115417 static void resiliency_test(void) {};
115418 #endif
115419 #endif
115420
115421-#ifdef CONFIG_SYSFS
115422+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115423 enum slab_stat_type {
115424 SL_ALL, /* All slabs */
115425 SL_PARTIAL, /* Only partially allocated slabs */
115426@@ -4478,13 +4547,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
115427 {
115428 if (!s->ctor)
115429 return 0;
115430+#ifdef CONFIG_GRKERNSEC_HIDESYM
115431+ return sprintf(buf, "%pS\n", NULL);
115432+#else
115433 return sprintf(buf, "%pS\n", s->ctor);
115434+#endif
115435 }
115436 SLAB_ATTR_RO(ctor);
115437
115438 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
115439 {
115440- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
115441+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
115442 }
115443 SLAB_ATTR_RO(aliases);
115444
115445@@ -4572,6 +4645,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
115446 SLAB_ATTR_RO(cache_dma);
115447 #endif
115448
115449+#ifdef CONFIG_PAX_USERCOPY_SLABS
115450+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
115451+{
115452+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
115453+}
115454+SLAB_ATTR_RO(usercopy);
115455+#endif
115456+
115457+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115458+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
115459+{
115460+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
115461+}
115462+SLAB_ATTR_RO(sanitize);
115463+#endif
115464+
115465 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
115466 {
115467 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
115468@@ -4627,7 +4716,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
115469 * as well as cause other issues like converting a mergeable
115470 * cache into an umergeable one.
115471 */
115472- if (s->refcount > 1)
115473+ if (atomic_read(&s->refcount) > 1)
115474 return -EINVAL;
115475
115476 s->flags &= ~SLAB_TRACE;
115477@@ -4747,7 +4836,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
115478 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
115479 size_t length)
115480 {
115481- if (s->refcount > 1)
115482+ if (atomic_read(&s->refcount) > 1)
115483 return -EINVAL;
115484
115485 s->flags &= ~SLAB_FAILSLAB;
115486@@ -4914,6 +5003,12 @@ static struct attribute *slab_attrs[] = {
115487 #ifdef CONFIG_ZONE_DMA
115488 &cache_dma_attr.attr,
115489 #endif
115490+#ifdef CONFIG_PAX_USERCOPY_SLABS
115491+ &usercopy_attr.attr,
115492+#endif
115493+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115494+ &sanitize_attr.attr,
115495+#endif
115496 #ifdef CONFIG_NUMA
115497 &remote_node_defrag_ratio_attr.attr,
115498 #endif
115499@@ -5155,6 +5250,7 @@ static char *create_unique_id(struct kmem_cache *s)
115500 return name;
115501 }
115502
115503+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115504 static int sysfs_slab_add(struct kmem_cache *s)
115505 {
115506 int err;
115507@@ -5228,6 +5324,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
115508 kobject_del(&s->kobj);
115509 kobject_put(&s->kobj);
115510 }
115511+#endif
115512
115513 /*
115514 * Need to buffer aliases during bootup until sysfs becomes
115515@@ -5241,6 +5338,7 @@ struct saved_alias {
115516
115517 static struct saved_alias *alias_list;
115518
115519+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115520 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115521 {
115522 struct saved_alias *al;
115523@@ -5263,6 +5361,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115524 alias_list = al;
115525 return 0;
115526 }
115527+#endif
115528
115529 static int __init slab_sysfs_init(void)
115530 {
115531diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
115532index 4cba9c2..b4f9fcc 100644
115533--- a/mm/sparse-vmemmap.c
115534+++ b/mm/sparse-vmemmap.c
115535@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
115536 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115537 if (!p)
115538 return NULL;
115539- pud_populate(&init_mm, pud, p);
115540+ pud_populate_kernel(&init_mm, pud, p);
115541 }
115542 return pud;
115543 }
115544@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
115545 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115546 if (!p)
115547 return NULL;
115548- pgd_populate(&init_mm, pgd, p);
115549+ pgd_populate_kernel(&init_mm, pgd, p);
115550 }
115551 return pgd;
115552 }
115553diff --git a/mm/sparse.c b/mm/sparse.c
115554index d1b48b6..6e8590e 100644
115555--- a/mm/sparse.c
115556+++ b/mm/sparse.c
115557@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
115558
115559 for (i = 0; i < PAGES_PER_SECTION; i++) {
115560 if (PageHWPoison(&memmap[i])) {
115561- atomic_long_sub(1, &num_poisoned_pages);
115562+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
115563 ClearPageHWPoison(&memmap[i]);
115564 }
115565 }
115566diff --git a/mm/swap.c b/mm/swap.c
115567index a7251a8..ac754a9 100644
115568--- a/mm/swap.c
115569+++ b/mm/swap.c
115570@@ -85,6 +85,8 @@ static void __put_compound_page(struct page *page)
115571 if (!PageHuge(page))
115572 __page_cache_release(page);
115573 dtor = get_compound_page_dtor(page);
115574+ if (!PageHuge(page))
115575+ BUG_ON(dtor != free_compound_page);
115576 (*dtor)(page);
115577 }
115578
115579diff --git a/mm/swapfile.c b/mm/swapfile.c
115580index a7e7210..b286e7d 100644
115581--- a/mm/swapfile.c
115582+++ b/mm/swapfile.c
115583@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
115584
115585 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
115586 /* Activity counter to indicate that a swapon or swapoff has occurred */
115587-static atomic_t proc_poll_event = ATOMIC_INIT(0);
115588+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
115589
115590 static inline unsigned char swap_count(unsigned char ent)
115591 {
115592@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
115593 spin_unlock(&swap_lock);
115594
115595 err = 0;
115596- atomic_inc(&proc_poll_event);
115597+ atomic_inc_unchecked(&proc_poll_event);
115598 wake_up_interruptible(&proc_poll_wait);
115599
115600 out_dput:
115601@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
115602
115603 poll_wait(file, &proc_poll_wait, wait);
115604
115605- if (seq->poll_event != atomic_read(&proc_poll_event)) {
115606- seq->poll_event = atomic_read(&proc_poll_event);
115607+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
115608+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115609 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
115610 }
115611
115612@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
115613 return ret;
115614
115615 seq = file->private_data;
115616- seq->poll_event = atomic_read(&proc_poll_event);
115617+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115618 return 0;
115619 }
115620
115621@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
115622 (frontswap_map) ? "FS" : "");
115623
115624 mutex_unlock(&swapon_mutex);
115625- atomic_inc(&proc_poll_event);
115626+ atomic_inc_unchecked(&proc_poll_event);
115627 wake_up_interruptible(&proc_poll_wait);
115628
115629 if (S_ISREG(inode->i_mode))
115630diff --git a/mm/util.c b/mm/util.c
115631index 68ff8a5..40c7a70 100644
115632--- a/mm/util.c
115633+++ b/mm/util.c
115634@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
115635 void arch_pick_mmap_layout(struct mm_struct *mm)
115636 {
115637 mm->mmap_base = TASK_UNMAPPED_BASE;
115638+
115639+#ifdef CONFIG_PAX_RANDMMAP
115640+ if (mm->pax_flags & MF_PAX_RANDMMAP)
115641+ mm->mmap_base += mm->delta_mmap;
115642+#endif
115643+
115644 mm->get_unmapped_area = arch_get_unmapped_area;
115645 }
115646 #endif
115647@@ -434,6 +440,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
115648 if (!mm->arg_end)
115649 goto out_mm; /* Shh! No looking before we're done */
115650
115651+ if (gr_acl_handle_procpidmem(task))
115652+ goto out_mm;
115653+
115654 len = mm->arg_end - mm->arg_start;
115655
115656 if (len > buflen)
115657diff --git a/mm/vmalloc.c b/mm/vmalloc.c
115658index 2faaa29..9744185 100644
115659--- a/mm/vmalloc.c
115660+++ b/mm/vmalloc.c
115661@@ -40,20 +40,65 @@ struct vfree_deferred {
115662 struct work_struct wq;
115663 };
115664 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
115665+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
115666+
115667+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115668+struct stack_deferred_llist {
115669+ struct llist_head list;
115670+ void *stack;
115671+ void *lowmem_stack;
115672+};
115673+
115674+struct stack_deferred {
115675+ struct stack_deferred_llist list;
115676+ struct work_struct wq;
115677+};
115678+
115679+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
115680+#endif
115681
115682 static void __vunmap(const void *, int);
115683
115684-static void free_work(struct work_struct *w)
115685+static void vfree_work(struct work_struct *w)
115686 {
115687 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115688 struct llist_node *llnode = llist_del_all(&p->list);
115689 while (llnode) {
115690- void *p = llnode;
115691+ void *x = llnode;
115692 llnode = llist_next(llnode);
115693- __vunmap(p, 1);
115694+ __vunmap(x, 1);
115695 }
115696 }
115697
115698+static void vunmap_work(struct work_struct *w)
115699+{
115700+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115701+ struct llist_node *llnode = llist_del_all(&p->list);
115702+ while (llnode) {
115703+ void *x = llnode;
115704+ llnode = llist_next(llnode);
115705+ __vunmap(x, 0);
115706+ }
115707+}
115708+
115709+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115710+static void unmap_work(struct work_struct *w)
115711+{
115712+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
115713+ struct llist_node *llnode = llist_del_all(&p->list.list);
115714+ while (llnode) {
115715+ struct stack_deferred_llist *x =
115716+ llist_entry((struct llist_head *)llnode,
115717+ struct stack_deferred_llist, list);
115718+ void *stack = ACCESS_ONCE(x->stack);
115719+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
115720+ llnode = llist_next(llnode);
115721+ __vunmap(stack, 0);
115722+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
115723+ }
115724+}
115725+#endif
115726+
115727 /*** Page table manipulation functions ***/
115728
115729 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115730@@ -62,8 +107,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115731
115732 pte = pte_offset_kernel(pmd, addr);
115733 do {
115734- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115735- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115736+
115737+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115738+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
115739+ BUG_ON(!pte_exec(*pte));
115740+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
115741+ continue;
115742+ }
115743+#endif
115744+
115745+ {
115746+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115747+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115748+ }
115749 } while (pte++, addr += PAGE_SIZE, addr != end);
115750 }
115751
115752@@ -127,16 +183,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
115753 pte = pte_alloc_kernel(pmd, addr);
115754 if (!pte)
115755 return -ENOMEM;
115756+
115757+ pax_open_kernel();
115758 do {
115759 struct page *page = pages[*nr];
115760
115761- if (WARN_ON(!pte_none(*pte)))
115762+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115763+ if (pgprot_val(prot) & _PAGE_NX)
115764+#endif
115765+
115766+ if (!pte_none(*pte)) {
115767+ pax_close_kernel();
115768+ WARN_ON(1);
115769 return -EBUSY;
115770- if (WARN_ON(!page))
115771+ }
115772+ if (!page) {
115773+ pax_close_kernel();
115774+ WARN_ON(1);
115775 return -ENOMEM;
115776+ }
115777 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
115778 (*nr)++;
115779 } while (pte++, addr += PAGE_SIZE, addr != end);
115780+ pax_close_kernel();
115781 return 0;
115782 }
115783
115784@@ -146,7 +215,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
115785 pmd_t *pmd;
115786 unsigned long next;
115787
115788- pmd = pmd_alloc(&init_mm, pud, addr);
115789+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
115790 if (!pmd)
115791 return -ENOMEM;
115792 do {
115793@@ -163,7 +232,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
115794 pud_t *pud;
115795 unsigned long next;
115796
115797- pud = pud_alloc(&init_mm, pgd, addr);
115798+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
115799 if (!pud)
115800 return -ENOMEM;
115801 do {
115802@@ -223,6 +292,12 @@ int is_vmalloc_or_module_addr(const void *x)
115803 if (addr >= MODULES_VADDR && addr < MODULES_END)
115804 return 1;
115805 #endif
115806+
115807+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115808+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
115809+ return 1;
115810+#endif
115811+
115812 return is_vmalloc_addr(x);
115813 }
115814
115815@@ -243,8 +318,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
115816
115817 if (!pgd_none(*pgd)) {
115818 pud_t *pud = pud_offset(pgd, addr);
115819+#ifdef CONFIG_X86
115820+ if (!pud_large(*pud))
115821+#endif
115822 if (!pud_none(*pud)) {
115823 pmd_t *pmd = pmd_offset(pud, addr);
115824+#ifdef CONFIG_X86
115825+ if (!pmd_large(*pmd))
115826+#endif
115827 if (!pmd_none(*pmd)) {
115828 pte_t *ptep, pte;
115829
115830@@ -346,7 +427,7 @@ static void purge_vmap_area_lazy(void);
115831 * Allocate a region of KVA of the specified size and alignment, within the
115832 * vstart and vend.
115833 */
115834-static struct vmap_area *alloc_vmap_area(unsigned long size,
115835+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
115836 unsigned long align,
115837 unsigned long vstart, unsigned long vend,
115838 int node, gfp_t gfp_mask)
115839@@ -1202,13 +1283,27 @@ void __init vmalloc_init(void)
115840 for_each_possible_cpu(i) {
115841 struct vmap_block_queue *vbq;
115842 struct vfree_deferred *p;
115843+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115844+ struct stack_deferred *p2;
115845+#endif
115846
115847 vbq = &per_cpu(vmap_block_queue, i);
115848 spin_lock_init(&vbq->lock);
115849 INIT_LIST_HEAD(&vbq->free);
115850+
115851 p = &per_cpu(vfree_deferred, i);
115852 init_llist_head(&p->list);
115853- INIT_WORK(&p->wq, free_work);
115854+ INIT_WORK(&p->wq, vfree_work);
115855+
115856+ p = &per_cpu(vunmap_deferred, i);
115857+ init_llist_head(&p->list);
115858+ INIT_WORK(&p->wq, vunmap_work);
115859+
115860+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115861+ p2 = &per_cpu(stack_deferred, i);
115862+ init_llist_head(&p2->list.list);
115863+ INIT_WORK(&p2->wq, unmap_work);
115864+#endif
115865 }
115866
115867 /* Import existing vmlist entries. */
115868@@ -1333,6 +1428,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
115869 struct vm_struct *area;
115870
115871 BUG_ON(in_interrupt());
115872+
115873+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115874+ if (flags & VM_KERNEXEC) {
115875+ if (start != VMALLOC_START || end != VMALLOC_END)
115876+ return NULL;
115877+ start = (unsigned long)MODULES_EXEC_VADDR;
115878+ end = (unsigned long)MODULES_EXEC_END;
115879+ }
115880+#endif
115881+
115882 if (flags & VM_IOREMAP)
115883 align = 1ul << clamp_t(int, fls_long(size),
115884 PAGE_SHIFT, IOREMAP_MAX_ORDER);
115885@@ -1531,13 +1636,36 @@ EXPORT_SYMBOL(vfree);
115886 */
115887 void vunmap(const void *addr)
115888 {
115889- BUG_ON(in_interrupt());
115890- might_sleep();
115891- if (addr)
115892+ if (!addr)
115893+ return;
115894+ if (unlikely(in_interrupt())) {
115895+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
115896+ if (llist_add((struct llist_node *)addr, &p->list))
115897+ schedule_work(&p->wq);
115898+ } else {
115899+ might_sleep();
115900 __vunmap(addr, 0);
115901+ }
115902 }
115903 EXPORT_SYMBOL(vunmap);
115904
115905+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115906+void unmap_process_stacks(struct task_struct *task)
115907+{
115908+ if (unlikely(in_interrupt())) {
115909+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
115910+ struct stack_deferred_llist *list = task->stack;
115911+ list->stack = task->stack;
115912+ list->lowmem_stack = task->lowmem_stack;
115913+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
115914+ schedule_work(&p->wq);
115915+ } else {
115916+ __vunmap(task->stack, 0);
115917+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
115918+ }
115919+}
115920+#endif
115921+
115922 /**
115923 * vmap - map an array of pages into virtually contiguous space
115924 * @pages: array of page pointers
115925@@ -1558,6 +1686,11 @@ void *vmap(struct page **pages, unsigned int count,
115926 if (count > totalram_pages)
115927 return NULL;
115928
115929+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115930+ if (!(pgprot_val(prot) & _PAGE_NX))
115931+ flags |= VM_KERNEXEC;
115932+#endif
115933+
115934 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
115935 __builtin_return_address(0));
115936 if (!area)
115937@@ -1662,6 +1795,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
115938 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
115939 goto fail;
115940
115941+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115942+ if (!(pgprot_val(prot) & _PAGE_NX)) {
115943+ vm_flags |= VM_KERNEXEC;
115944+ start = VMALLOC_START;
115945+ end = VMALLOC_END;
115946+ }
115947+#endif
115948+
115949 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
115950 vm_flags, start, end, node, gfp_mask, caller);
115951 if (!area)
115952@@ -1838,10 +1979,9 @@ EXPORT_SYMBOL(vzalloc_node);
115953 * For tight control over page level allocator and protection flags
115954 * use __vmalloc() instead.
115955 */
115956-
115957 void *vmalloc_exec(unsigned long size)
115958 {
115959- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
115960+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
115961 NUMA_NO_NODE, __builtin_return_address(0));
115962 }
115963
115964@@ -2148,6 +2288,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
115965 {
115966 struct vm_struct *area;
115967
115968+ BUG_ON(vma->vm_mirror);
115969+
115970 size = PAGE_ALIGN(size);
115971
115972 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
115973@@ -2630,7 +2772,11 @@ static int s_show(struct seq_file *m, void *p)
115974 v->addr, v->addr + v->size, v->size);
115975
115976 if (v->caller)
115977+#ifdef CONFIG_GRKERNSEC_HIDESYM
115978+ seq_printf(m, " %pK", v->caller);
115979+#else
115980 seq_printf(m, " %pS", v->caller);
115981+#endif
115982
115983 if (v->nr_pages)
115984 seq_printf(m, " pages=%d", v->nr_pages);
115985diff --git a/mm/vmstat.c b/mm/vmstat.c
115986index 4f5cd97..9fb715a 100644
115987--- a/mm/vmstat.c
115988+++ b/mm/vmstat.c
115989@@ -27,6 +27,7 @@
115990 #include <linux/mm_inline.h>
115991 #include <linux/page_ext.h>
115992 #include <linux/page_owner.h>
115993+#include <linux/grsecurity.h>
115994
115995 #include "internal.h"
115996
115997@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
115998 *
115999 * vm_stat contains the global counters
116000 */
116001-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
116002+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
116003 EXPORT_SYMBOL(vm_stat);
116004
116005 #ifdef CONFIG_SMP
116006@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
116007
116008 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
116009 if (diff[i]) {
116010- atomic_long_add(diff[i], &vm_stat[i]);
116011+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
116012 changes++;
116013 }
116014 return changes;
116015@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
116016 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
116017 if (v) {
116018
116019- atomic_long_add(v, &zone->vm_stat[i]);
116020+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116021 global_diff[i] += v;
116022 #ifdef CONFIG_NUMA
116023 /* 3 seconds idle till flush */
116024@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
116025
116026 v = p->vm_stat_diff[i];
116027 p->vm_stat_diff[i] = 0;
116028- atomic_long_add(v, &zone->vm_stat[i]);
116029+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116030 global_diff[i] += v;
116031 }
116032 }
116033@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
116034 if (pset->vm_stat_diff[i]) {
116035 int v = pset->vm_stat_diff[i];
116036 pset->vm_stat_diff[i] = 0;
116037- atomic_long_add(v, &zone->vm_stat[i]);
116038- atomic_long_add(v, &vm_stat[i]);
116039+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116040+ atomic_long_add_unchecked(v, &vm_stat[i]);
116041 }
116042 }
116043 #endif
116044@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
116045 stat_items_size += sizeof(struct vm_event_state);
116046 #endif
116047
116048- v = kmalloc(stat_items_size, GFP_KERNEL);
116049+ v = kzalloc(stat_items_size, GFP_KERNEL);
116050 m->private = v;
116051 if (!v)
116052 return ERR_PTR(-ENOMEM);
116053+
116054+#ifdef CONFIG_GRKERNSEC_PROC_ADD
116055+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
116056+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
116057+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
116058+ && !in_group_p(grsec_proc_gid)
116059+#endif
116060+ )
116061+ return (unsigned long *)m->private + *pos;
116062+#endif
116063+#endif
116064+
116065 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
116066 v[i] = global_page_state(i);
116067 v += NR_VM_ZONE_STAT_ITEMS;
116068@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
116069 cpu_notifier_register_done();
116070 #endif
116071 #ifdef CONFIG_PROC_FS
116072- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
116073- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
116074- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
116075- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
116076+ {
116077+ mode_t gr_mode = S_IRUGO;
116078+#ifdef CONFIG_GRKERNSEC_PROC_ADD
116079+ gr_mode = S_IRUSR;
116080+#endif
116081+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
116082+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
116083+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
116084+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
116085+ }
116086 #endif
116087 return 0;
116088 }
116089diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
116090index 59555f0..fd7ade9 100644
116091--- a/net/8021q/vlan.c
116092+++ b/net/8021q/vlan.c
116093@@ -491,7 +491,7 @@ out:
116094 return NOTIFY_DONE;
116095 }
116096
116097-static struct notifier_block vlan_notifier_block __read_mostly = {
116098+static struct notifier_block vlan_notifier_block = {
116099 .notifier_call = vlan_device_event,
116100 };
116101
116102@@ -566,8 +566,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
116103 err = -EPERM;
116104 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
116105 break;
116106- if ((args.u.name_type >= 0) &&
116107- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
116108+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
116109 struct vlan_net *vn;
116110
116111 vn = net_generic(net, vlan_net_id);
116112diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
116113index c92b52f..006c052 100644
116114--- a/net/8021q/vlan_netlink.c
116115+++ b/net/8021q/vlan_netlink.c
116116@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
116117 return dev_net(real_dev);
116118 }
116119
116120-struct rtnl_link_ops vlan_link_ops __read_mostly = {
116121+struct rtnl_link_ops vlan_link_ops = {
116122 .kind = "vlan",
116123 .maxtype = IFLA_VLAN_MAX,
116124 .policy = vlan_policy,
116125diff --git a/net/9p/mod.c b/net/9p/mod.c
116126index 6ab36ae..6f1841b 100644
116127--- a/net/9p/mod.c
116128+++ b/net/9p/mod.c
116129@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
116130 void v9fs_register_trans(struct p9_trans_module *m)
116131 {
116132 spin_lock(&v9fs_trans_lock);
116133- list_add_tail(&m->list, &v9fs_trans_list);
116134+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
116135 spin_unlock(&v9fs_trans_lock);
116136 }
116137 EXPORT_SYMBOL(v9fs_register_trans);
116138@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
116139 void v9fs_unregister_trans(struct p9_trans_module *m)
116140 {
116141 spin_lock(&v9fs_trans_lock);
116142- list_del_init(&m->list);
116143+ pax_list_del_init((struct list_head *)&m->list);
116144 spin_unlock(&v9fs_trans_lock);
116145 }
116146 EXPORT_SYMBOL(v9fs_unregister_trans);
116147diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
116148index bced8c0..ef253b7 100644
116149--- a/net/9p/trans_fd.c
116150+++ b/net/9p/trans_fd.c
116151@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
116152 oldfs = get_fs();
116153 set_fs(get_ds());
116154 /* The cast to a user pointer is valid due to the set_fs() */
116155- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
116156+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
116157 set_fs(oldfs);
116158
116159 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
116160diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
116161index af46bc4..f9adfcd 100644
116162--- a/net/appletalk/atalk_proc.c
116163+++ b/net/appletalk/atalk_proc.c
116164@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
116165 struct proc_dir_entry *p;
116166 int rc = -ENOMEM;
116167
116168- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
116169+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
116170 if (!atalk_proc_dir)
116171 goto out;
116172
116173diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
116174index 876fbe8..8bbea9f 100644
116175--- a/net/atm/atm_misc.c
116176+++ b/net/atm/atm_misc.c
116177@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
116178 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
116179 return 1;
116180 atm_return(vcc, truesize);
116181- atomic_inc(&vcc->stats->rx_drop);
116182+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116183 return 0;
116184 }
116185 EXPORT_SYMBOL(atm_charge);
116186@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
116187 }
116188 }
116189 atm_return(vcc, guess);
116190- atomic_inc(&vcc->stats->rx_drop);
116191+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116192 return NULL;
116193 }
116194 EXPORT_SYMBOL(atm_alloc_charge);
116195@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
116196
116197 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116198 {
116199-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116200+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116201 __SONET_ITEMS
116202 #undef __HANDLE_ITEM
116203 }
116204@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
116205
116206 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116207 {
116208-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116209+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
116210 __SONET_ITEMS
116211 #undef __HANDLE_ITEM
116212 }
116213diff --git a/net/atm/lec.c b/net/atm/lec.c
116214index cd3b379..977a3c9 100644
116215--- a/net/atm/lec.c
116216+++ b/net/atm/lec.c
116217@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
116218 }
116219
116220 static struct lane2_ops lane2_ops = {
116221- lane2_resolve, /* resolve, spec 3.1.3 */
116222- lane2_associate_req, /* associate_req, spec 3.1.4 */
116223- NULL /* associate indicator, spec 3.1.5 */
116224+ .resolve = lane2_resolve,
116225+ .associate_req = lane2_associate_req,
116226+ .associate_indicator = NULL
116227 };
116228
116229 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
116230diff --git a/net/atm/lec.h b/net/atm/lec.h
116231index 4149db1..f2ab682 100644
116232--- a/net/atm/lec.h
116233+++ b/net/atm/lec.h
116234@@ -48,7 +48,7 @@ struct lane2_ops {
116235 const u8 *tlvs, u32 sizeoftlvs);
116236 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
116237 const u8 *tlvs, u32 sizeoftlvs);
116238-};
116239+} __no_const;
116240
116241 /*
116242 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
116243diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
116244index d1b2d9a..d549f7f 100644
116245--- a/net/atm/mpoa_caches.c
116246+++ b/net/atm/mpoa_caches.c
116247@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
116248
116249
116250 static struct in_cache_ops ingress_ops = {
116251- in_cache_add_entry, /* add_entry */
116252- in_cache_get, /* get */
116253- in_cache_get_with_mask, /* get_with_mask */
116254- in_cache_get_by_vcc, /* get_by_vcc */
116255- in_cache_put, /* put */
116256- in_cache_remove_entry, /* remove_entry */
116257- cache_hit, /* cache_hit */
116258- clear_count_and_expired, /* clear_count */
116259- check_resolving_entries, /* check_resolving */
116260- refresh_entries, /* refresh */
116261- in_destroy_cache /* destroy_cache */
116262+ .add_entry = in_cache_add_entry,
116263+ .get = in_cache_get,
116264+ .get_with_mask = in_cache_get_with_mask,
116265+ .get_by_vcc = in_cache_get_by_vcc,
116266+ .put = in_cache_put,
116267+ .remove_entry = in_cache_remove_entry,
116268+ .cache_hit = cache_hit,
116269+ .clear_count = clear_count_and_expired,
116270+ .check_resolving = check_resolving_entries,
116271+ .refresh = refresh_entries,
116272+ .destroy_cache = in_destroy_cache
116273 };
116274
116275 static struct eg_cache_ops egress_ops = {
116276- eg_cache_add_entry, /* add_entry */
116277- eg_cache_get_by_cache_id, /* get_by_cache_id */
116278- eg_cache_get_by_tag, /* get_by_tag */
116279- eg_cache_get_by_vcc, /* get_by_vcc */
116280- eg_cache_get_by_src_ip, /* get_by_src_ip */
116281- eg_cache_put, /* put */
116282- eg_cache_remove_entry, /* remove_entry */
116283- update_eg_cache_entry, /* update */
116284- clear_expired, /* clear_expired */
116285- eg_destroy_cache /* destroy_cache */
116286+ .add_entry = eg_cache_add_entry,
116287+ .get_by_cache_id = eg_cache_get_by_cache_id,
116288+ .get_by_tag = eg_cache_get_by_tag,
116289+ .get_by_vcc = eg_cache_get_by_vcc,
116290+ .get_by_src_ip = eg_cache_get_by_src_ip,
116291+ .put = eg_cache_put,
116292+ .remove_entry = eg_cache_remove_entry,
116293+ .update = update_eg_cache_entry,
116294+ .clear_expired = clear_expired,
116295+ .destroy_cache = eg_destroy_cache
116296 };
116297
116298
116299diff --git a/net/atm/proc.c b/net/atm/proc.c
116300index bbb6461..cf04016 100644
116301--- a/net/atm/proc.c
116302+++ b/net/atm/proc.c
116303@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
116304 const struct k_atm_aal_stats *stats)
116305 {
116306 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
116307- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
116308- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
116309- atomic_read(&stats->rx_drop));
116310+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
116311+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
116312+ atomic_read_unchecked(&stats->rx_drop));
116313 }
116314
116315 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
116316diff --git a/net/atm/resources.c b/net/atm/resources.c
116317index 0447d5d..3cf4728 100644
116318--- a/net/atm/resources.c
116319+++ b/net/atm/resources.c
116320@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
116321 static void copy_aal_stats(struct k_atm_aal_stats *from,
116322 struct atm_aal_stats *to)
116323 {
116324-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116325+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116326 __AAL_STAT_ITEMS
116327 #undef __HANDLE_ITEM
116328 }
116329@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
116330 static void subtract_aal_stats(struct k_atm_aal_stats *from,
116331 struct atm_aal_stats *to)
116332 {
116333-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116334+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
116335 __AAL_STAT_ITEMS
116336 #undef __HANDLE_ITEM
116337 }
116338diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
116339index 1997538..3b78e84 100644
116340--- a/net/ax25/ax25_subr.c
116341+++ b/net/ax25/ax25_subr.c
116342@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
116343 {
116344 ax25_clear_queues(ax25);
116345
116346+ ax25_stop_heartbeat(ax25);
116347 ax25_stop_t1timer(ax25);
116348 ax25_stop_t2timer(ax25);
116349 ax25_stop_t3timer(ax25);
116350diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
116351index 919a5ce..cc6b444 100644
116352--- a/net/ax25/sysctl_net_ax25.c
116353+++ b/net/ax25/sysctl_net_ax25.c
116354@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
116355 {
116356 char path[sizeof("net/ax25/") + IFNAMSIZ];
116357 int k;
116358- struct ctl_table *table;
116359+ ctl_table_no_const *table;
116360
116361 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
116362 if (!table)
116363diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
116364index 00e00e0..710fcd2 100644
116365--- a/net/batman-adv/bat_iv_ogm.c
116366+++ b/net/batman-adv/bat_iv_ogm.c
116367@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
116368
116369 /* randomize initial seqno to avoid collision */
116370 get_random_bytes(&random_seqno, sizeof(random_seqno));
116371- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116372+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116373
116374 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
116375 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
116376@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
116377 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
116378
116379 /* change sequence number to network order */
116380- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
116381+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
116382 batadv_ogm_packet->seqno = htonl(seqno);
116383- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
116384+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
116385
116386 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
116387
116388@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
116389 return;
116390
116391 /* could be changed by schedule_own_packet() */
116392- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
116393+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
116394
116395 if (ogm_packet->flags & BATADV_DIRECTLINK)
116396 has_directlink_flag = true;
116397diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
116398index 3d1dcaa..4699f4e 100644
116399--- a/net/batman-adv/fragmentation.c
116400+++ b/net/batman-adv/fragmentation.c
116401@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
116402 frag_header.packet_type = BATADV_UNICAST_FRAG;
116403 frag_header.version = BATADV_COMPAT_VERSION;
116404 frag_header.ttl = BATADV_TTL;
116405- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
116406+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
116407 frag_header.reserved = 0;
116408 frag_header.no = 0;
116409 frag_header.total_size = htons(skb->len);
116410diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
116411index 5ec31d7..e371631 100644
116412--- a/net/batman-adv/soft-interface.c
116413+++ b/net/batman-adv/soft-interface.c
116414@@ -295,7 +295,7 @@ send:
116415 primary_if->net_dev->dev_addr);
116416
116417 /* set broadcast sequence number */
116418- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
116419+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
116420 bcast_packet->seqno = htonl(seqno);
116421
116422 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
116423@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116424 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
116425
116426 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
116427- atomic_set(&bat_priv->bcast_seqno, 1);
116428+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
116429 atomic_set(&bat_priv->tt.vn, 0);
116430 atomic_set(&bat_priv->tt.local_changes, 0);
116431 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
116432@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116433
116434 /* randomize initial seqno to avoid collision */
116435 get_random_bytes(&random_seqno, sizeof(random_seqno));
116436- atomic_set(&bat_priv->frag_seqno, random_seqno);
116437+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
116438
116439 bat_priv->primary_if = NULL;
116440 bat_priv->num_ifaces = 0;
116441@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
116442 return 0;
116443 }
116444
116445-struct rtnl_link_ops batadv_link_ops __read_mostly = {
116446+struct rtnl_link_ops batadv_link_ops = {
116447 .kind = "batadv",
116448 .priv_size = sizeof(struct batadv_priv),
116449 .setup = batadv_softif_init_early,
116450diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
116451index 9398c3f..0e79657 100644
116452--- a/net/batman-adv/types.h
116453+++ b/net/batman-adv/types.h
116454@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
116455 struct batadv_hard_iface_bat_iv {
116456 unsigned char *ogm_buff;
116457 int ogm_buff_len;
116458- atomic_t ogm_seqno;
116459+ atomic_unchecked_t ogm_seqno;
116460 };
116461
116462 /**
116463@@ -766,7 +766,7 @@ struct batadv_priv {
116464 atomic_t bonding;
116465 atomic_t fragmentation;
116466 atomic_t packet_size_max;
116467- atomic_t frag_seqno;
116468+ atomic_unchecked_t frag_seqno;
116469 #ifdef CONFIG_BATMAN_ADV_BLA
116470 atomic_t bridge_loop_avoidance;
116471 #endif
116472@@ -785,7 +785,7 @@ struct batadv_priv {
116473 #endif
116474 uint32_t isolation_mark;
116475 uint32_t isolation_mark_mask;
116476- atomic_t bcast_seqno;
116477+ atomic_unchecked_t bcast_seqno;
116478 atomic_t bcast_queue_left;
116479 atomic_t batman_queue_left;
116480 char num_ifaces;
116481diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
116482index 56f9edb..0a13cd1 100644
116483--- a/net/bluetooth/hci_sock.c
116484+++ b/net/bluetooth/hci_sock.c
116485@@ -1241,7 +1241,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
116486 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
116487 }
116488
116489- len = min_t(unsigned int, len, sizeof(uf));
116490+ len = min((size_t)len, sizeof(uf));
116491 if (copy_from_user(&uf, optval, len)) {
116492 err = -EFAULT;
116493 break;
116494diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
116495index dad4197..253bbdf 100644
116496--- a/net/bluetooth/l2cap_core.c
116497+++ b/net/bluetooth/l2cap_core.c
116498@@ -3541,8 +3541,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
116499 break;
116500
116501 case L2CAP_CONF_RFC:
116502- if (olen == sizeof(rfc))
116503- memcpy(&rfc, (void *)val, olen);
116504+ if (olen != sizeof(rfc))
116505+ break;
116506+
116507+ memcpy(&rfc, (void *)val, olen);
116508
116509 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
116510 rfc.mode != chan->mode)
116511diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
116512index a7278f0..3443626 100644
116513--- a/net/bluetooth/l2cap_sock.c
116514+++ b/net/bluetooth/l2cap_sock.c
116515@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116516 struct sock *sk = sock->sk;
116517 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
116518 struct l2cap_options opts;
116519- int len, err = 0;
116520+ int err = 0;
116521+ size_t len = optlen;
116522 u32 opt;
116523
116524 BT_DBG("sk %p", sk);
116525@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116526 opts.max_tx = chan->max_tx;
116527 opts.txwin_size = chan->tx_win;
116528
116529- len = min_t(unsigned int, sizeof(opts), optlen);
116530+ len = min(sizeof(opts), len);
116531 if (copy_from_user((char *) &opts, optval, len)) {
116532 err = -EFAULT;
116533 break;
116534@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116535 struct bt_security sec;
116536 struct bt_power pwr;
116537 struct l2cap_conn *conn;
116538- int len, err = 0;
116539+ int err = 0;
116540+ size_t len = optlen;
116541 u32 opt;
116542
116543 BT_DBG("sk %p", sk);
116544@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116545
116546 sec.level = BT_SECURITY_LOW;
116547
116548- len = min_t(unsigned int, sizeof(sec), optlen);
116549+ len = min(sizeof(sec), len);
116550 if (copy_from_user((char *) &sec, optval, len)) {
116551 err = -EFAULT;
116552 break;
116553@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116554
116555 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
116556
116557- len = min_t(unsigned int, sizeof(pwr), optlen);
116558+ len = min(sizeof(pwr), len);
116559 if (copy_from_user((char *) &pwr, optval, len)) {
116560 err = -EFAULT;
116561 break;
116562diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
116563index 825e8fb..efc24a4 100644
116564--- a/net/bluetooth/rfcomm/sock.c
116565+++ b/net/bluetooth/rfcomm/sock.c
116566@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116567 struct sock *sk = sock->sk;
116568 struct bt_security sec;
116569 int err = 0;
116570- size_t len;
116571+ size_t len = optlen;
116572 u32 opt;
116573
116574 BT_DBG("sk %p", sk);
116575@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116576
116577 sec.level = BT_SECURITY_LOW;
116578
116579- len = min_t(unsigned int, sizeof(sec), optlen);
116580+ len = min(sizeof(sec), len);
116581 if (copy_from_user((char *) &sec, optval, len)) {
116582 err = -EFAULT;
116583 break;
116584diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
116585index 8e385a0..a5bdd8e 100644
116586--- a/net/bluetooth/rfcomm/tty.c
116587+++ b/net/bluetooth/rfcomm/tty.c
116588@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
116589 BT_DBG("tty %p id %d", tty, tty->index);
116590
116591 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
116592- dev->channel, dev->port.count);
116593+ dev->channel, atomic_read(&dev->port.count));
116594
116595 err = tty_port_open(&dev->port, tty, filp);
116596 if (err)
116597@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
116598 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
116599
116600 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
116601- dev->port.count);
116602+ atomic_read(&dev->port.count));
116603
116604 tty_port_close(&dev->port, tty, filp);
116605 }
116606diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
116607index e29ad70b..cc00066 100644
116608--- a/net/bridge/br_mdb.c
116609+++ b/net/bridge/br_mdb.c
116610@@ -371,6 +371,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
116611 if (!p || p->br != br || p->state == BR_STATE_DISABLED)
116612 return -EINVAL;
116613
116614+ memset(&ip, 0, sizeof(ip));
116615 ip.proto = entry->addr.proto;
116616 if (ip.proto == htons(ETH_P_IP))
116617 ip.u.ip4 = entry->addr.u.ip4;
116618@@ -417,6 +418,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
116619 if (!netif_running(br->dev) || br->multicast_disabled)
116620 return -EINVAL;
116621
116622+ memset(&ip, 0, sizeof(ip));
116623 ip.proto = entry->addr.proto;
116624 if (ip.proto == htons(ETH_P_IP)) {
116625 if (timer_pending(&br->ip4_other_query.timer))
116626diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
116627index 4b5c236..0627070 100644
116628--- a/net/bridge/br_netlink.c
116629+++ b/net/bridge/br_netlink.c
116630@@ -841,7 +841,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
116631 .get_link_af_size = br_get_link_af_size,
116632 };
116633
116634-struct rtnl_link_ops br_link_ops __read_mostly = {
116635+struct rtnl_link_ops br_link_ops = {
116636 .kind = "bridge",
116637 .priv_size = sizeof(struct net_bridge),
116638 .setup = br_dev_setup,
116639diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
116640index 91180a7..1301daa 100644
116641--- a/net/bridge/netfilter/ebtables.c
116642+++ b/net/bridge/netfilter/ebtables.c
116643@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
116644 tmp.valid_hooks = t->table->valid_hooks;
116645 }
116646 mutex_unlock(&ebt_mutex);
116647- if (copy_to_user(user, &tmp, *len) != 0) {
116648+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116649 BUGPRINT("c2u Didn't work\n");
116650 ret = -EFAULT;
116651 break;
116652@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116653 goto out;
116654 tmp.valid_hooks = t->valid_hooks;
116655
116656- if (copy_to_user(user, &tmp, *len) != 0) {
116657+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116658 ret = -EFAULT;
116659 break;
116660 }
116661@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116662 tmp.entries_size = t->table->entries_size;
116663 tmp.valid_hooks = t->table->valid_hooks;
116664
116665- if (copy_to_user(user, &tmp, *len) != 0) {
116666+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116667 ret = -EFAULT;
116668 break;
116669 }
116670diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
116671index f5afda1..dcf770a 100644
116672--- a/net/caif/cfctrl.c
116673+++ b/net/caif/cfctrl.c
116674@@ -10,6 +10,7 @@
116675 #include <linux/spinlock.h>
116676 #include <linux/slab.h>
116677 #include <linux/pkt_sched.h>
116678+#include <linux/sched.h>
116679 #include <net/caif/caif_layer.h>
116680 #include <net/caif/cfpkt.h>
116681 #include <net/caif/cfctrl.h>
116682@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
116683 memset(&dev_info, 0, sizeof(dev_info));
116684 dev_info.id = 0xff;
116685 cfsrvl_init(&this->serv, 0, &dev_info, false);
116686- atomic_set(&this->req_seq_no, 1);
116687- atomic_set(&this->rsp_seq_no, 1);
116688+ atomic_set_unchecked(&this->req_seq_no, 1);
116689+ atomic_set_unchecked(&this->rsp_seq_no, 1);
116690 this->serv.layer.receive = cfctrl_recv;
116691 sprintf(this->serv.layer.name, "ctrl");
116692 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
116693@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
116694 struct cfctrl_request_info *req)
116695 {
116696 spin_lock_bh(&ctrl->info_list_lock);
116697- atomic_inc(&ctrl->req_seq_no);
116698- req->sequence_no = atomic_read(&ctrl->req_seq_no);
116699+ atomic_inc_unchecked(&ctrl->req_seq_no);
116700+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
116701 list_add_tail(&req->list, &ctrl->list);
116702 spin_unlock_bh(&ctrl->info_list_lock);
116703 }
116704@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
116705 if (p != first)
116706 pr_warn("Requests are not received in order\n");
116707
116708- atomic_set(&ctrl->rsp_seq_no,
116709+ atomic_set_unchecked(&ctrl->rsp_seq_no,
116710 p->sequence_no);
116711 list_del(&p->list);
116712 goto out;
116713diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
116714index 67a4a36..8d28068 100644
116715--- a/net/caif/chnl_net.c
116716+++ b/net/caif/chnl_net.c
116717@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
116718 };
116719
116720
116721-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
116722+static struct rtnl_link_ops ipcaif_link_ops = {
116723 .kind = "caif",
116724 .priv_size = sizeof(struct chnl_net),
116725 .setup = ipcaif_net_setup,
116726diff --git a/net/can/af_can.c b/net/can/af_can.c
116727index 689c818..6323851 100644
116728--- a/net/can/af_can.c
116729+++ b/net/can/af_can.c
116730@@ -888,7 +888,7 @@ static const struct net_proto_family can_family_ops = {
116731 };
116732
116733 /* notifier block for netdevice event */
116734-static struct notifier_block can_netdev_notifier __read_mostly = {
116735+static struct notifier_block can_netdev_notifier = {
116736 .notifier_call = can_notifier,
116737 };
116738
116739diff --git a/net/can/bcm.c b/net/can/bcm.c
116740index b523453..f96e639 100644
116741--- a/net/can/bcm.c
116742+++ b/net/can/bcm.c
116743@@ -1618,7 +1618,7 @@ static int __init bcm_module_init(void)
116744 }
116745
116746 /* create /proc/net/can-bcm directory */
116747- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
116748+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
116749 return 0;
116750 }
116751
116752diff --git a/net/can/gw.c b/net/can/gw.c
116753index a6f448e..5902171 100644
116754--- a/net/can/gw.c
116755+++ b/net/can/gw.c
116756@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
116757 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
116758
116759 static HLIST_HEAD(cgw_list);
116760-static struct notifier_block notifier;
116761
116762 static struct kmem_cache *cgw_cache __read_mostly;
116763
116764@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
116765 return err;
116766 }
116767
116768+static struct notifier_block notifier = {
116769+ .notifier_call = cgw_notifier
116770+};
116771+
116772 static __init int cgw_module_init(void)
116773 {
116774 /* sanitize given module parameter */
116775@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
116776 return -ENOMEM;
116777
116778 /* set notifier */
116779- notifier.notifier_call = cgw_notifier;
116780 register_netdevice_notifier(&notifier);
116781
116782 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
116783diff --git a/net/can/proc.c b/net/can/proc.c
116784index 1a19b98..df2b4ec 100644
116785--- a/net/can/proc.c
116786+++ b/net/can/proc.c
116787@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
116788 void can_init_proc(void)
116789 {
116790 /* create /proc/net/can directory */
116791- can_dir = proc_mkdir("can", init_net.proc_net);
116792+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
116793
116794 if (!can_dir) {
116795 printk(KERN_INFO "can: failed to create /proc/net/can . "
116796diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
116797index 967080a..5e75f04 100644
116798--- a/net/ceph/messenger.c
116799+++ b/net/ceph/messenger.c
116800@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
116801 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
116802
116803 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
116804-static atomic_t addr_str_seq = ATOMIC_INIT(0);
116805+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
116806
116807 static struct page *zero_page; /* used in certain error cases */
116808
116809@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
116810 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
116811 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
116812
116813- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116814+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116815 s = addr_str[i];
116816
116817 switch (ss->ss_family) {
116818diff --git a/net/compat.c b/net/compat.c
116819index 5cfd26a..7e43828 100644
116820--- a/net/compat.c
116821+++ b/net/compat.c
116822@@ -98,20 +98,20 @@ int get_compat_msghdr(struct msghdr *kmsg,
116823
116824 #define CMSG_COMPAT_FIRSTHDR(msg) \
116825 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
116826- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
116827+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
116828 (struct compat_cmsghdr __user *)NULL)
116829
116830 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
116831 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
116832 (ucmlen) <= (unsigned long) \
116833 ((mhdr)->msg_controllen - \
116834- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
116835+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
116836
116837 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
116838 struct compat_cmsghdr __user *cmsg, int cmsg_len)
116839 {
116840 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
116841- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
116842+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
116843 msg->msg_controllen)
116844 return NULL;
116845 return (struct compat_cmsghdr __user *)ptr;
116846@@ -201,7 +201,7 @@ Efault:
116847
116848 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
116849 {
116850- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116851+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116852 struct compat_cmsghdr cmhdr;
116853 struct compat_timeval ctv;
116854 struct compat_timespec cts[3];
116855@@ -257,7 +257,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
116856
116857 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
116858 {
116859- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116860+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116861 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
116862 int fdnum = scm->fp->count;
116863 struct file **fp = scm->fp->fp;
116864@@ -345,7 +345,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
116865 return -EFAULT;
116866 old_fs = get_fs();
116867 set_fs(KERNEL_DS);
116868- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
116869+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
116870 set_fs(old_fs);
116871
116872 return err;
116873@@ -406,7 +406,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
116874 len = sizeof(ktime);
116875 old_fs = get_fs();
116876 set_fs(KERNEL_DS);
116877- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
116878+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
116879 set_fs(old_fs);
116880
116881 if (!err) {
116882@@ -549,7 +549,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116883 case MCAST_JOIN_GROUP:
116884 case MCAST_LEAVE_GROUP:
116885 {
116886- struct compat_group_req __user *gr32 = (void *)optval;
116887+ struct compat_group_req __user *gr32 = (void __user *)optval;
116888 struct group_req __user *kgr =
116889 compat_alloc_user_space(sizeof(struct group_req));
116890 u32 interface;
116891@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116892 case MCAST_BLOCK_SOURCE:
116893 case MCAST_UNBLOCK_SOURCE:
116894 {
116895- struct compat_group_source_req __user *gsr32 = (void *)optval;
116896+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
116897 struct group_source_req __user *kgsr = compat_alloc_user_space(
116898 sizeof(struct group_source_req));
116899 u32 interface;
116900@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116901 }
116902 case MCAST_MSFILTER:
116903 {
116904- struct compat_group_filter __user *gf32 = (void *)optval;
116905+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116906 struct group_filter __user *kgf;
116907 u32 interface, fmode, numsrc;
116908
116909@@ -629,7 +629,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
116910 char __user *optval, int __user *optlen,
116911 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
116912 {
116913- struct compat_group_filter __user *gf32 = (void *)optval;
116914+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116915 struct group_filter __user *kgf;
116916 int __user *koptlen;
116917 u32 interface, fmode, numsrc;
116918@@ -773,7 +773,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
116919
116920 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
116921 return -EINVAL;
116922- if (copy_from_user(a, args, nas[call]))
116923+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
116924 return -EFAULT;
116925 a0 = a[0];
116926 a1 = a[1];
116927diff --git a/net/core/datagram.c b/net/core/datagram.c
116928index b80fb91..d9f4ea5 100644
116929--- a/net/core/datagram.c
116930+++ b/net/core/datagram.c
116931@@ -131,6 +131,35 @@ out_noerr:
116932 goto out;
116933 }
116934
116935+static int skb_set_peeked(struct sk_buff *skb)
116936+{
116937+ struct sk_buff *nskb;
116938+
116939+ if (skb->peeked)
116940+ return 0;
116941+
116942+ /* We have to unshare an skb before modifying it. */
116943+ if (!skb_shared(skb))
116944+ goto done;
116945+
116946+ nskb = skb_clone(skb, GFP_ATOMIC);
116947+ if (!nskb)
116948+ return -ENOMEM;
116949+
116950+ skb->prev->next = nskb;
116951+ skb->next->prev = nskb;
116952+ nskb->prev = skb->prev;
116953+ nskb->next = skb->next;
116954+
116955+ consume_skb(skb);
116956+ skb = nskb;
116957+
116958+done:
116959+ skb->peeked = 1;
116960+
116961+ return 0;
116962+}
116963+
116964 /**
116965 * __skb_recv_datagram - Receive a datagram skbuff
116966 * @sk: socket
116967@@ -165,7 +194,9 @@ out_noerr:
116968 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116969 int *peeked, int *off, int *err)
116970 {
116971+ struct sk_buff_head *queue = &sk->sk_receive_queue;
116972 struct sk_buff *skb, *last;
116973+ unsigned long cpu_flags;
116974 long timeo;
116975 /*
116976 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
116977@@ -184,8 +215,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116978 * Look at current nfs client by the way...
116979 * However, this function was correct in any case. 8)
116980 */
116981- unsigned long cpu_flags;
116982- struct sk_buff_head *queue = &sk->sk_receive_queue;
116983 int _off = *off;
116984
116985 last = (struct sk_buff *)queue;
116986@@ -199,7 +228,11 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116987 _off -= skb->len;
116988 continue;
116989 }
116990- skb->peeked = 1;
116991+
116992+ error = skb_set_peeked(skb);
116993+ if (error)
116994+ goto unlock_err;
116995+
116996 atomic_inc(&skb->users);
116997 } else
116998 __skb_unlink(skb, queue);
116999@@ -223,6 +256,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
117000
117001 return NULL;
117002
117003+unlock_err:
117004+ spin_unlock_irqrestore(&queue->lock, cpu_flags);
117005 no_packet:
117006 *err = error;
117007 return NULL;
117008@@ -302,7 +337,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
117009 }
117010
117011 kfree_skb(skb);
117012- atomic_inc(&sk->sk_drops);
117013+ atomic_inc_unchecked(&sk->sk_drops);
117014 sk_mem_reclaim_partial(sk);
117015
117016 return err;
117017@@ -622,7 +657,8 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
117018 !skb->csum_complete_sw)
117019 netdev_rx_csum_fault(skb->dev);
117020 }
117021- skb->csum_valid = !sum;
117022+ if (!skb_shared(skb))
117023+ skb->csum_valid = !sum;
117024 return sum;
117025 }
117026 EXPORT_SYMBOL(__skb_checksum_complete_head);
117027@@ -642,11 +678,13 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
117028 netdev_rx_csum_fault(skb->dev);
117029 }
117030
117031- /* Save full packet checksum */
117032- skb->csum = csum;
117033- skb->ip_summed = CHECKSUM_COMPLETE;
117034- skb->csum_complete_sw = 1;
117035- skb->csum_valid = !sum;
117036+ if (!skb_shared(skb)) {
117037+ /* Save full packet checksum */
117038+ skb->csum = csum;
117039+ skb->ip_summed = CHECKSUM_COMPLETE;
117040+ skb->csum_complete_sw = 1;
117041+ skb->csum_valid = !sum;
117042+ }
117043
117044 return sum;
117045 }
117046diff --git a/net/core/dev.c b/net/core/dev.c
117047index aa82f9a..f28b00e 100644
117048--- a/net/core/dev.c
117049+++ b/net/core/dev.c
117050@@ -1720,7 +1720,7 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
117051 {
117052 if (skb_orphan_frags(skb, GFP_ATOMIC) ||
117053 unlikely(!is_skb_forwardable(dev, skb))) {
117054- atomic_long_inc(&dev->rx_dropped);
117055+ atomic_long_inc_unchecked(&dev->rx_dropped);
117056 kfree_skb(skb);
117057 return NET_RX_DROP;
117058 }
117059@@ -3018,7 +3018,7 @@ recursion_alert:
117060 drop:
117061 rcu_read_unlock_bh();
117062
117063- atomic_long_inc(&dev->tx_dropped);
117064+ atomic_long_inc_unchecked(&dev->tx_dropped);
117065 kfree_skb_list(skb);
117066 return rc;
117067 out:
117068@@ -3367,7 +3367,7 @@ enqueue:
117069
117070 local_irq_restore(flags);
117071
117072- atomic_long_inc(&skb->dev->rx_dropped);
117073+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
117074 kfree_skb(skb);
117075 return NET_RX_DROP;
117076 }
117077@@ -3444,7 +3444,7 @@ int netif_rx_ni(struct sk_buff *skb)
117078 }
117079 EXPORT_SYMBOL(netif_rx_ni);
117080
117081-static void net_tx_action(struct softirq_action *h)
117082+static __latent_entropy void net_tx_action(void)
117083 {
117084 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
117085
117086@@ -3783,7 +3783,7 @@ ncls:
117087 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
117088 } else {
117089 drop:
117090- atomic_long_inc(&skb->dev->rx_dropped);
117091+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
117092 kfree_skb(skb);
117093 /* Jamal, now you will not able to escape explaining
117094 * me how you were going to use this. :-)
117095@@ -4672,7 +4672,7 @@ out_unlock:
117096 return work;
117097 }
117098
117099-static void net_rx_action(struct softirq_action *h)
117100+static __latent_entropy void net_rx_action(void)
117101 {
117102 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
117103 unsigned long time_limit = jiffies + 2;
117104@@ -6721,8 +6721,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
117105 } else {
117106 netdev_stats_to_stats64(storage, &dev->stats);
117107 }
117108- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
117109- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
117110+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
117111+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
117112 return storage;
117113 }
117114 EXPORT_SYMBOL(dev_get_stats);
117115diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
117116index b94b1d2..da3ed7c 100644
117117--- a/net/core/dev_ioctl.c
117118+++ b/net/core/dev_ioctl.c
117119@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
117120 no_module = !dev;
117121 if (no_module && capable(CAP_NET_ADMIN))
117122 no_module = request_module("netdev-%s", name);
117123- if (no_module && capable(CAP_SYS_MODULE))
117124+ if (no_module && capable(CAP_SYS_MODULE)) {
117125+#ifdef CONFIG_GRKERNSEC_MODHARDEN
117126+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
117127+#else
117128 request_module("%s", name);
117129+#endif
117130+ }
117131 }
117132 EXPORT_SYMBOL(dev_load);
117133
117134diff --git a/net/core/dst.c b/net/core/dst.c
117135index e956ce6..002144be 100644
117136--- a/net/core/dst.c
117137+++ b/net/core/dst.c
117138@@ -284,7 +284,9 @@ void dst_release(struct dst_entry *dst)
117139 int newrefcnt;
117140
117141 newrefcnt = atomic_dec_return(&dst->__refcnt);
117142- WARN_ON(newrefcnt < 0);
117143+ if (unlikely(newrefcnt < 0))
117144+ net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
117145+ __func__, dst, newrefcnt);
117146 if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
117147 call_rcu(&dst->rcu_head, dst_destroy_rcu);
117148 }
117149diff --git a/net/core/filter.c b/net/core/filter.c
117150index bf831a8..8d2c4c2 100644
117151--- a/net/core/filter.c
117152+++ b/net/core/filter.c
117153@@ -579,7 +579,11 @@ do_pass:
117154
117155 /* Unknown instruction. */
117156 default:
117157- goto err;
117158+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
117159+ fp->code, fp->jt, fp->jf, fp->k);
117160+ kfree(addrs);
117161+ BUG();
117162+ return -EINVAL;
117163 }
117164
117165 insn++;
117166@@ -623,7 +627,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
117167 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
117168 int pc, ret = 0;
117169
117170- BUILD_BUG_ON(BPF_MEMWORDS > 16);
117171+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
117172
117173 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
117174 if (!masks)
117175@@ -1038,7 +1042,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
117176 if (!fp)
117177 return -ENOMEM;
117178
117179- memcpy(fp->insns, fprog->filter, fsize);
117180+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
117181
117182 fp->len = fprog->len;
117183 /* Since unattached filters are not copied back to user
117184diff --git a/net/core/flow.c b/net/core/flow.c
117185index 1033725..340f65d 100644
117186--- a/net/core/flow.c
117187+++ b/net/core/flow.c
117188@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
117189 static int flow_entry_valid(struct flow_cache_entry *fle,
117190 struct netns_xfrm *xfrm)
117191 {
117192- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
117193+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
117194 return 0;
117195 if (fle->object && !fle->object->ops->check(fle->object))
117196 return 0;
117197@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
117198 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
117199 fcp->hash_count++;
117200 }
117201- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
117202+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
117203 flo = fle->object;
117204 if (!flo)
117205 goto ret_object;
117206@@ -263,7 +263,7 @@ nocache:
117207 }
117208 flo = resolver(net, key, family, dir, flo, ctx);
117209 if (fle) {
117210- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
117211+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
117212 if (!IS_ERR(flo))
117213 fle->object = flo;
117214 else
117215diff --git a/net/core/neighbour.c b/net/core/neighbour.c
117216index 2237c1b..c0c80ab 100644
117217--- a/net/core/neighbour.c
117218+++ b/net/core/neighbour.c
117219@@ -2818,7 +2818,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
117220 void __user *buffer, size_t *lenp, loff_t *ppos)
117221 {
117222 int size, ret;
117223- struct ctl_table tmp = *ctl;
117224+ ctl_table_no_const tmp = *ctl;
117225
117226 tmp.extra1 = &zero;
117227 tmp.extra2 = &unres_qlen_max;
117228@@ -2880,7 +2880,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
117229 void __user *buffer,
117230 size_t *lenp, loff_t *ppos)
117231 {
117232- struct ctl_table tmp = *ctl;
117233+ ctl_table_no_const tmp = *ctl;
117234 int ret;
117235
117236 tmp.extra1 = &zero;
117237diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
117238index 2bf8329..2eb1423 100644
117239--- a/net/core/net-procfs.c
117240+++ b/net/core/net-procfs.c
117241@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
117242 struct rtnl_link_stats64 temp;
117243 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
117244
117245- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117246+ if (gr_proc_is_restricted())
117247+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117248+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117249+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
117250+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
117251+ else
117252+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117253 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117254 dev->name, stats->rx_bytes, stats->rx_packets,
117255 stats->rx_errors,
117256@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
117257 return 0;
117258 }
117259
117260-static const struct seq_operations dev_seq_ops = {
117261+const struct seq_operations dev_seq_ops = {
117262 .start = dev_seq_start,
117263 .next = dev_seq_next,
117264 .stop = dev_seq_stop,
117265@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
117266
117267 static int softnet_seq_open(struct inode *inode, struct file *file)
117268 {
117269- return seq_open(file, &softnet_seq_ops);
117270+ return seq_open_restrict(file, &softnet_seq_ops);
117271 }
117272
117273 static const struct file_operations softnet_seq_fops = {
117274@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
117275 else
117276 seq_printf(seq, "%04x", ntohs(pt->type));
117277
117278+#ifdef CONFIG_GRKERNSEC_HIDESYM
117279+ seq_printf(seq, " %-8s %pf\n",
117280+ pt->dev ? pt->dev->name : "", NULL);
117281+#else
117282 seq_printf(seq, " %-8s %pf\n",
117283 pt->dev ? pt->dev->name : "", pt->func);
117284+#endif
117285 }
117286
117287 return 0;
117288diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
117289index 4238d6d..e6b605c 100644
117290--- a/net/core/net-sysfs.c
117291+++ b/net/core/net-sysfs.c
117292@@ -288,7 +288,7 @@ static ssize_t carrier_changes_show(struct device *dev,
117293 {
117294 struct net_device *netdev = to_net_dev(dev);
117295 return sprintf(buf, fmt_dec,
117296- atomic_read(&netdev->carrier_changes));
117297+ atomic_read_unchecked(&netdev->carrier_changes));
117298 }
117299 static DEVICE_ATTR_RO(carrier_changes);
117300
117301diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
117302index 572af00..5acf072 100644
117303--- a/net/core/net_namespace.c
117304+++ b/net/core/net_namespace.c
117305@@ -734,7 +734,7 @@ static int __register_pernet_operations(struct list_head *list,
117306 int error;
117307 LIST_HEAD(net_exit_list);
117308
117309- list_add_tail(&ops->list, list);
117310+ pax_list_add_tail((struct list_head *)&ops->list, list);
117311 if (ops->init || (ops->id && ops->size)) {
117312 for_each_net(net) {
117313 error = ops_init(ops, net);
117314@@ -747,7 +747,7 @@ static int __register_pernet_operations(struct list_head *list,
117315
117316 out_undo:
117317 /* If I have an error cleanup all namespaces I initialized */
117318- list_del(&ops->list);
117319+ pax_list_del((struct list_head *)&ops->list);
117320 ops_exit_list(ops, &net_exit_list);
117321 ops_free_list(ops, &net_exit_list);
117322 return error;
117323@@ -758,7 +758,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
117324 struct net *net;
117325 LIST_HEAD(net_exit_list);
117326
117327- list_del(&ops->list);
117328+ pax_list_del((struct list_head *)&ops->list);
117329 for_each_net(net)
117330 list_add_tail(&net->exit_list, &net_exit_list);
117331 ops_exit_list(ops, &net_exit_list);
117332@@ -892,7 +892,7 @@ int register_pernet_device(struct pernet_operations *ops)
117333 mutex_lock(&net_mutex);
117334 error = register_pernet_operations(&pernet_list, ops);
117335 if (!error && (first_device == &pernet_list))
117336- first_device = &ops->list;
117337+ first_device = (struct list_head *)&ops->list;
117338 mutex_unlock(&net_mutex);
117339 return error;
117340 }
117341diff --git a/net/core/netpoll.c b/net/core/netpoll.c
117342index c126a87..10ad89d 100644
117343--- a/net/core/netpoll.c
117344+++ b/net/core/netpoll.c
117345@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117346 struct udphdr *udph;
117347 struct iphdr *iph;
117348 struct ethhdr *eth;
117349- static atomic_t ip_ident;
117350+ static atomic_unchecked_t ip_ident;
117351 struct ipv6hdr *ip6h;
117352
117353 udp_len = len + sizeof(*udph);
117354@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117355 put_unaligned(0x45, (unsigned char *)iph);
117356 iph->tos = 0;
117357 put_unaligned(htons(ip_len), &(iph->tot_len));
117358- iph->id = htons(atomic_inc_return(&ip_ident));
117359+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
117360 iph->frag_off = 0;
117361 iph->ttl = 64;
117362 iph->protocol = IPPROTO_UDP;
117363diff --git a/net/core/pktgen.c b/net/core/pktgen.c
117364index 508155b..fad080f 100644
117365--- a/net/core/pktgen.c
117366+++ b/net/core/pktgen.c
117367@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
117368 pn->net = net;
117369 INIT_LIST_HEAD(&pn->pktgen_threads);
117370 pn->pktgen_exiting = false;
117371- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
117372+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
117373 if (!pn->proc_dir) {
117374 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
117375 return -ENODEV;
117376diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
117377index 8de3682..fcb8a5e 100644
117378--- a/net/core/rtnetlink.c
117379+++ b/net/core/rtnetlink.c
117380@@ -61,7 +61,7 @@ struct rtnl_link {
117381 rtnl_doit_func doit;
117382 rtnl_dumpit_func dumpit;
117383 rtnl_calcit_func calcit;
117384-};
117385+} __no_const;
117386
117387 static DEFINE_MUTEX(rtnl_mutex);
117388
117389@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
117390 * to use the ops for creating device. So do not
117391 * fill up dellink as well. That disables rtnl_dellink.
117392 */
117393- if (ops->setup && !ops->dellink)
117394- ops->dellink = unregister_netdevice_queue;
117395+ if (ops->setup && !ops->dellink) {
117396+ pax_open_kernel();
117397+ *(void **)&ops->dellink = unregister_netdevice_queue;
117398+ pax_close_kernel();
117399+ }
117400
117401- list_add_tail(&ops->list, &link_ops);
117402+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
117403 return 0;
117404 }
117405 EXPORT_SYMBOL_GPL(__rtnl_link_register);
117406@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
117407 for_each_net(net) {
117408 __rtnl_kill_links(net, ops);
117409 }
117410- list_del(&ops->list);
117411+ pax_list_del((struct list_head *)&ops->list);
117412 }
117413 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
117414
117415@@ -1066,7 +1069,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
117416 (dev->ifalias &&
117417 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
117418 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
117419- atomic_read(&dev->carrier_changes)))
117420+ atomic_read_unchecked(&dev->carrier_changes)))
117421 goto nla_put_failure;
117422
117423 if (1) {
117424@@ -1748,10 +1751,13 @@ static int do_setlink(const struct sk_buff *skb,
117425 goto errout;
117426
117427 nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
117428- if (nla_type(attr) != IFLA_VF_PORT)
117429- continue;
117430- err = nla_parse_nested(port, IFLA_PORT_MAX,
117431- attr, ifla_port_policy);
117432+ if (nla_type(attr) != IFLA_VF_PORT ||
117433+ nla_len(attr) < NLA_HDRLEN) {
117434+ err = -EINVAL;
117435+ goto errout;
117436+ }
117437+ err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
117438+ ifla_port_policy);
117439 if (err < 0)
117440 goto errout;
117441 if (!port[IFLA_PORT_VF]) {
117442diff --git a/net/core/scm.c b/net/core/scm.c
117443index 3b6899b..cf36238 100644
117444--- a/net/core/scm.c
117445+++ b/net/core/scm.c
117446@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
117447 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117448 {
117449 struct cmsghdr __user *cm
117450- = (__force struct cmsghdr __user *)msg->msg_control;
117451+ = (struct cmsghdr __force_user *)msg->msg_control;
117452 struct cmsghdr cmhdr;
117453 int cmlen = CMSG_LEN(len);
117454 int err;
117455@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117456 err = -EFAULT;
117457 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
117458 goto out;
117459- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
117460+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
117461 goto out;
117462 cmlen = CMSG_SPACE(len);
117463 if (msg->msg_controllen < cmlen)
117464@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
117465 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117466 {
117467 struct cmsghdr __user *cm
117468- = (__force struct cmsghdr __user*)msg->msg_control;
117469+ = (struct cmsghdr __force_user *)msg->msg_control;
117470
117471 int fdmax = 0;
117472 int fdnum = scm->fp->count;
117473@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117474 if (fdnum < fdmax)
117475 fdmax = fdnum;
117476
117477- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
117478+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
117479 i++, cmfptr++)
117480 {
117481 struct socket *sock;
117482diff --git a/net/core/skbuff.c b/net/core/skbuff.c
117483index 41ec022..3cc0a1c 100644
117484--- a/net/core/skbuff.c
117485+++ b/net/core/skbuff.c
117486@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
117487 __wsum skb_checksum(const struct sk_buff *skb, int offset,
117488 int len, __wsum csum)
117489 {
117490- const struct skb_checksum_ops ops = {
117491+ static const struct skb_checksum_ops ops = {
117492 .update = csum_partial_ext,
117493 .combine = csum_block_add_ext,
117494 };
117495@@ -3335,12 +3335,14 @@ void __init skb_init(void)
117496 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
117497 sizeof(struct sk_buff),
117498 0,
117499- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117500+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117501+ SLAB_NO_SANITIZE,
117502 NULL);
117503 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
117504 sizeof(struct sk_buff_fclones),
117505 0,
117506- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117507+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117508+ SLAB_NO_SANITIZE,
117509 NULL);
117510 }
117511
117512diff --git a/net/core/sock.c b/net/core/sock.c
117513index dc30dc5..8bb3ef3 100644
117514--- a/net/core/sock.c
117515+++ b/net/core/sock.c
117516@@ -440,7 +440,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117517 struct sk_buff_head *list = &sk->sk_receive_queue;
117518
117519 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
117520- atomic_inc(&sk->sk_drops);
117521+ atomic_inc_unchecked(&sk->sk_drops);
117522 trace_sock_rcvqueue_full(sk, skb);
117523 return -ENOMEM;
117524 }
117525@@ -450,7 +450,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117526 return err;
117527
117528 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
117529- atomic_inc(&sk->sk_drops);
117530+ atomic_inc_unchecked(&sk->sk_drops);
117531 return -ENOBUFS;
117532 }
117533
117534@@ -483,7 +483,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117535 skb->dev = NULL;
117536
117537 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
117538- atomic_inc(&sk->sk_drops);
117539+ atomic_inc_unchecked(&sk->sk_drops);
117540 goto discard_and_relse;
117541 }
117542 if (nested)
117543@@ -501,7 +501,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117544 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
117545 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
117546 bh_unlock_sock(sk);
117547- atomic_inc(&sk->sk_drops);
117548+ atomic_inc_unchecked(&sk->sk_drops);
117549 goto discard_and_relse;
117550 }
117551
117552@@ -907,6 +907,7 @@ set_rcvbuf:
117553 }
117554 break;
117555
117556+#ifndef GRKERNSEC_BPF_HARDEN
117557 case SO_ATTACH_BPF:
117558 ret = -EINVAL;
117559 if (optlen == sizeof(u32)) {
117560@@ -919,7 +920,7 @@ set_rcvbuf:
117561 ret = sk_attach_bpf(ufd, sk);
117562 }
117563 break;
117564-
117565+#endif
117566 case SO_DETACH_FILTER:
117567 ret = sk_detach_filter(sk);
117568 break;
117569@@ -1021,12 +1022,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117570 struct timeval tm;
117571 } v;
117572
117573- int lv = sizeof(int);
117574- int len;
117575+ unsigned int lv = sizeof(int);
117576+ unsigned int len;
117577
117578 if (get_user(len, optlen))
117579 return -EFAULT;
117580- if (len < 0)
117581+ if (len > INT_MAX)
117582 return -EINVAL;
117583
117584 memset(&v, 0, sizeof(v));
117585@@ -1164,11 +1165,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117586
117587 case SO_PEERNAME:
117588 {
117589- char address[128];
117590+ char address[_K_SS_MAXSIZE];
117591
117592 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
117593 return -ENOTCONN;
117594- if (lv < len)
117595+ if (lv < len || sizeof address < len)
117596 return -EINVAL;
117597 if (copy_to_user(optval, address, len))
117598 return -EFAULT;
117599@@ -1256,7 +1257,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117600
117601 if (len > lv)
117602 len = lv;
117603- if (copy_to_user(optval, &v, len))
117604+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
117605 return -EFAULT;
117606 lenout:
117607 if (put_user(len, optlen))
117608@@ -2359,7 +2360,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
117609 */
117610 smp_wmb();
117611 atomic_set(&sk->sk_refcnt, 1);
117612- atomic_set(&sk->sk_drops, 0);
117613+ atomic_set_unchecked(&sk->sk_drops, 0);
117614 }
117615 EXPORT_SYMBOL(sock_init_data);
117616
117617@@ -2487,6 +2488,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
117618 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117619 int level, int type)
117620 {
117621+ struct sock_extended_err ee;
117622 struct sock_exterr_skb *serr;
117623 struct sk_buff *skb;
117624 int copied, err;
117625@@ -2508,7 +2510,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117626 sock_recv_timestamp(msg, sk, skb);
117627
117628 serr = SKB_EXT_ERR(skb);
117629- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
117630+ ee = serr->ee;
117631+ put_cmsg(msg, level, type, sizeof ee, &ee);
117632
117633 msg->msg_flags |= MSG_ERRQUEUE;
117634 err = copied;
117635diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
117636index 74dddf8..7f4e77e 100644
117637--- a/net/core/sock_diag.c
117638+++ b/net/core/sock_diag.c
117639@@ -9,7 +9,7 @@
117640 #include <linux/inet_diag.h>
117641 #include <linux/sock_diag.h>
117642
117643-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
117644+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
117645 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
117646 static DEFINE_MUTEX(sock_diag_table_mutex);
117647
117648@@ -127,8 +127,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
117649 mutex_lock(&sock_diag_table_mutex);
117650 if (sock_diag_handlers[hndl->family])
117651 err = -EBUSY;
117652- else
117653+ else {
117654+ pax_open_kernel();
117655 sock_diag_handlers[hndl->family] = hndl;
117656+ pax_close_kernel();
117657+ }
117658 mutex_unlock(&sock_diag_table_mutex);
117659
117660 return err;
117661@@ -144,7 +147,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
117662
117663 mutex_lock(&sock_diag_table_mutex);
117664 BUG_ON(sock_diag_handlers[family] != hnld);
117665+ pax_open_kernel();
117666 sock_diag_handlers[family] = NULL;
117667+ pax_close_kernel();
117668 mutex_unlock(&sock_diag_table_mutex);
117669 }
117670 EXPORT_SYMBOL_GPL(sock_diag_unregister);
117671diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
117672index 95b6139..3048623 100644
117673--- a/net/core/sysctl_net_core.c
117674+++ b/net/core/sysctl_net_core.c
117675@@ -35,7 +35,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
117676 {
117677 unsigned int orig_size, size;
117678 int ret, i;
117679- struct ctl_table tmp = {
117680+ ctl_table_no_const tmp = {
117681 .data = &size,
117682 .maxlen = sizeof(size),
117683 .mode = table->mode
117684@@ -203,7 +203,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117685 void __user *buffer, size_t *lenp, loff_t *ppos)
117686 {
117687 char id[IFNAMSIZ];
117688- struct ctl_table tbl = {
117689+ ctl_table_no_const tbl = {
117690 .data = id,
117691 .maxlen = IFNAMSIZ,
117692 };
117693@@ -221,7 +221,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117694 static int proc_do_rss_key(struct ctl_table *table, int write,
117695 void __user *buffer, size_t *lenp, loff_t *ppos)
117696 {
117697- struct ctl_table fake_table;
117698+ ctl_table_no_const fake_table;
117699 char buf[NETDEV_RSS_KEY_LEN * 3];
117700
117701 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
117702@@ -285,7 +285,7 @@ static struct ctl_table net_core_table[] = {
117703 .mode = 0444,
117704 .proc_handler = proc_do_rss_key,
117705 },
117706-#ifdef CONFIG_BPF_JIT
117707+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
117708 {
117709 .procname = "bpf_jit_enable",
117710 .data = &bpf_jit_enable,
117711@@ -409,13 +409,12 @@ static struct ctl_table netns_core_table[] = {
117712
117713 static __net_init int sysctl_core_net_init(struct net *net)
117714 {
117715- struct ctl_table *tbl;
117716+ ctl_table_no_const *tbl = NULL;
117717
117718 net->core.sysctl_somaxconn = SOMAXCONN;
117719
117720- tbl = netns_core_table;
117721 if (!net_eq(net, &init_net)) {
117722- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
117723+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
117724 if (tbl == NULL)
117725 goto err_dup;
117726
117727@@ -425,17 +424,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
117728 if (net->user_ns != &init_user_ns) {
117729 tbl[0].procname = NULL;
117730 }
117731- }
117732-
117733- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117734+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117735+ } else
117736+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
117737 if (net->core.sysctl_hdr == NULL)
117738 goto err_reg;
117739
117740 return 0;
117741
117742 err_reg:
117743- if (tbl != netns_core_table)
117744- kfree(tbl);
117745+ kfree(tbl);
117746 err_dup:
117747 return -ENOMEM;
117748 }
117749@@ -450,7 +448,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
117750 kfree(tbl);
117751 }
117752
117753-static __net_initdata struct pernet_operations sysctl_core_ops = {
117754+static __net_initconst struct pernet_operations sysctl_core_ops = {
117755 .init = sysctl_core_net_init,
117756 .exit = sysctl_core_net_exit,
117757 };
117758diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
117759index 754484b..4f4b894 100644
117760--- a/net/decnet/af_decnet.c
117761+++ b/net/decnet/af_decnet.c
117762@@ -466,6 +466,7 @@ static struct proto dn_proto = {
117763 .sysctl_rmem = sysctl_decnet_rmem,
117764 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
117765 .obj_size = sizeof(struct dn_sock),
117766+ .slab_flags = SLAB_USERCOPY,
117767 };
117768
117769 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
117770diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
117771index b2c26b0..41f803e 100644
117772--- a/net/decnet/dn_dev.c
117773+++ b/net/decnet/dn_dev.c
117774@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
117775 .extra1 = &min_t3,
117776 .extra2 = &max_t3
117777 },
117778- {0}
117779+ { }
117780 },
117781 };
117782
117783diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
117784index 5325b54..a0d4d69 100644
117785--- a/net/decnet/sysctl_net_decnet.c
117786+++ b/net/decnet/sysctl_net_decnet.c
117787@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
117788
117789 if (len > *lenp) len = *lenp;
117790
117791- if (copy_to_user(buffer, addr, len))
117792+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
117793 return -EFAULT;
117794
117795 *lenp = len;
117796@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
117797
117798 if (len > *lenp) len = *lenp;
117799
117800- if (copy_to_user(buffer, devname, len))
117801+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
117802 return -EFAULT;
117803
117804 *lenp = len;
117805diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
117806index 392e29a..da953a2 100644
117807--- a/net/dsa/dsa.c
117808+++ b/net/dsa/dsa.c
117809@@ -851,7 +851,7 @@ static struct packet_type dsa_pack_type __read_mostly = {
117810 .func = dsa_switch_rcv,
117811 };
117812
117813-static struct notifier_block dsa_netdevice_nb __read_mostly = {
117814+static struct notifier_block dsa_netdevice_nb = {
117815 .notifier_call = dsa_slave_netdevice_event,
117816 };
117817
117818diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
117819index a2c7e4c..3dc9f67 100644
117820--- a/net/hsr/hsr_netlink.c
117821+++ b/net/hsr/hsr_netlink.c
117822@@ -102,7 +102,7 @@ nla_put_failure:
117823 return -EMSGSIZE;
117824 }
117825
117826-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
117827+static struct rtnl_link_ops hsr_link_ops = {
117828 .kind = "hsr",
117829 .maxtype = IFLA_HSR_MAX,
117830 .policy = hsr_policy,
117831diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
117832index 0ae5822..3fe3627 100644
117833--- a/net/ieee802154/6lowpan/core.c
117834+++ b/net/ieee802154/6lowpan/core.c
117835@@ -219,7 +219,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
117836 dev_put(real_dev);
117837 }
117838
117839-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
117840+static struct rtnl_link_ops lowpan_link_ops = {
117841 .kind = "lowpan",
117842 .priv_size = sizeof(struct lowpan_dev_info),
117843 .setup = lowpan_setup,
117844diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
117845index f46e4d1..30231f1 100644
117846--- a/net/ieee802154/6lowpan/reassembly.c
117847+++ b/net/ieee802154/6lowpan/reassembly.c
117848@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
117849
117850 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117851 {
117852- struct ctl_table *table;
117853+ ctl_table_no_const *table = NULL;
117854 struct ctl_table_header *hdr;
117855 struct netns_ieee802154_lowpan *ieee802154_lowpan =
117856 net_ieee802154_lowpan(net);
117857
117858- table = lowpan_frags_ns_ctl_table;
117859 if (!net_eq(net, &init_net)) {
117860- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
117861+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
117862 GFP_KERNEL);
117863 if (table == NULL)
117864 goto err_alloc;
117865@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117866 /* Don't export sysctls to unprivileged users */
117867 if (net->user_ns != &init_user_ns)
117868 table[0].procname = NULL;
117869- }
117870-
117871- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117872+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117873+ } else
117874+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
117875 if (hdr == NULL)
117876 goto err_reg;
117877
117878@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117879 return 0;
117880
117881 err_reg:
117882- if (!net_eq(net, &init_net))
117883- kfree(table);
117884+ kfree(table);
117885 err_alloc:
117886 return -ENOMEM;
117887 }
117888diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
117889index a5aa54e..3bd5f9f 100644
117890--- a/net/ipv4/af_inet.c
117891+++ b/net/ipv4/af_inet.c
117892@@ -1391,7 +1391,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
117893 return ip_recv_error(sk, msg, len, addr_len);
117894 #if IS_ENABLED(CONFIG_IPV6)
117895 if (sk->sk_family == AF_INET6)
117896- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
117897+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
117898 #endif
117899 return -EINVAL;
117900 }
117901diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
117902index 419d23c..2084616 100644
117903--- a/net/ipv4/devinet.c
117904+++ b/net/ipv4/devinet.c
117905@@ -69,7 +69,8 @@
117906
117907 static struct ipv4_devconf ipv4_devconf = {
117908 .data = {
117909- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117910+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117911+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117912 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117913 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117914 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117915@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
117916
117917 static struct ipv4_devconf ipv4_devconf_dflt = {
117918 .data = {
117919- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117920+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117921+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117922 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117923 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117924 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117925@@ -1580,7 +1582,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
117926 idx = 0;
117927 head = &net->dev_index_head[h];
117928 rcu_read_lock();
117929- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117930+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117931 net->dev_base_seq;
117932 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117933 if (idx < s_idx)
117934@@ -1899,7 +1901,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
117935 idx = 0;
117936 head = &net->dev_index_head[h];
117937 rcu_read_lock();
117938- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117939+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117940 net->dev_base_seq;
117941 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117942 if (idx < s_idx)
117943@@ -2134,7 +2136,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
117944 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
117945 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
117946
117947-static struct devinet_sysctl_table {
117948+static const struct devinet_sysctl_table {
117949 struct ctl_table_header *sysctl_header;
117950 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
117951 } devinet_sysctl = {
117952@@ -2266,7 +2268,7 @@ static __net_init int devinet_init_net(struct net *net)
117953 int err;
117954 struct ipv4_devconf *all, *dflt;
117955 #ifdef CONFIG_SYSCTL
117956- struct ctl_table *tbl = ctl_forward_entry;
117957+ ctl_table_no_const *tbl = NULL;
117958 struct ctl_table_header *forw_hdr;
117959 #endif
117960
117961@@ -2284,7 +2286,7 @@ static __net_init int devinet_init_net(struct net *net)
117962 goto err_alloc_dflt;
117963
117964 #ifdef CONFIG_SYSCTL
117965- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
117966+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
117967 if (!tbl)
117968 goto err_alloc_ctl;
117969
117970@@ -2304,7 +2306,10 @@ static __net_init int devinet_init_net(struct net *net)
117971 goto err_reg_dflt;
117972
117973 err = -ENOMEM;
117974- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117975+ if (!net_eq(net, &init_net))
117976+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117977+ else
117978+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
117979 if (!forw_hdr)
117980 goto err_reg_ctl;
117981 net->ipv4.forw_hdr = forw_hdr;
117982@@ -2320,8 +2325,7 @@ err_reg_ctl:
117983 err_reg_dflt:
117984 __devinet_sysctl_unregister(all);
117985 err_reg_all:
117986- if (tbl != ctl_forward_entry)
117987- kfree(tbl);
117988+ kfree(tbl);
117989 err_alloc_ctl:
117990 #endif
117991 if (dflt != &ipv4_devconf_dflt)
117992diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
117993index 872494e..8e0b4d1 100644
117994--- a/net/ipv4/fib_frontend.c
117995+++ b/net/ipv4/fib_frontend.c
117996@@ -1083,12 +1083,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
117997 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117998 fib_sync_up(dev);
117999 #endif
118000- atomic_inc(&net->ipv4.dev_addr_genid);
118001+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118002 rt_cache_flush(dev_net(dev));
118003 break;
118004 case NETDEV_DOWN:
118005 fib_del_ifaddr(ifa, NULL);
118006- atomic_inc(&net->ipv4.dev_addr_genid);
118007+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118008 if (!ifa->ifa_dev->ifa_list) {
118009 /* Last address was deleted from this interface.
118010 * Disable IP.
118011@@ -1126,7 +1126,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
118012 #ifdef CONFIG_IP_ROUTE_MULTIPATH
118013 fib_sync_up(dev);
118014 #endif
118015- atomic_inc(&net->ipv4.dev_addr_genid);
118016+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118017 rt_cache_flush(net);
118018 break;
118019 case NETDEV_DOWN:
118020diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
118021index 8d695b6..752d427a 100644
118022--- a/net/ipv4/fib_semantics.c
118023+++ b/net/ipv4/fib_semantics.c
118024@@ -752,7 +752,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
118025 nh->nh_saddr = inet_select_addr(nh->nh_dev,
118026 nh->nh_gw,
118027 nh->nh_parent->fib_scope);
118028- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
118029+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
118030
118031 return nh->nh_saddr;
118032 }
118033diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
118034index c6fb80b..8705495 100644
118035--- a/net/ipv4/inet_hashtables.c
118036+++ b/net/ipv4/inet_hashtables.c
118037@@ -18,6 +18,7 @@
118038 #include <linux/sched.h>
118039 #include <linux/slab.h>
118040 #include <linux/wait.h>
118041+#include <linux/security.h>
118042
118043 #include <net/inet_connection_sock.h>
118044 #include <net/inet_hashtables.h>
118045@@ -53,6 +54,8 @@ u32 sk_ehashfn(const struct sock *sk)
118046 sk->sk_daddr, sk->sk_dport);
118047 }
118048
118049+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
118050+
118051 /*
118052 * Allocate and initialize a new local port bind bucket.
118053 * The bindhash mutex for snum's hash chain must be held here.
118054@@ -564,6 +567,8 @@ ok:
118055 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
118056 spin_unlock(&head->lock);
118057
118058+ gr_update_task_in_ip_table(inet_sk(sk));
118059+
118060 if (tw) {
118061 inet_twsk_deschedule(tw);
118062 while (twrefcnt) {
118063diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
118064index 241afd7..31b95d5 100644
118065--- a/net/ipv4/inetpeer.c
118066+++ b/net/ipv4/inetpeer.c
118067@@ -461,7 +461,7 @@ relookup:
118068 if (p) {
118069 p->daddr = *daddr;
118070 atomic_set(&p->refcnt, 1);
118071- atomic_set(&p->rid, 0);
118072+ atomic_set_unchecked(&p->rid, 0);
118073 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
118074 p->rate_tokens = 0;
118075 /* 60*HZ is arbitrary, but chosen enough high so that the first
118076diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
118077index cc1da6d..64b1534 100644
118078--- a/net/ipv4/ip_fragment.c
118079+++ b/net/ipv4/ip_fragment.c
118080@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
118081 return 0;
118082
118083 start = qp->rid;
118084- end = atomic_inc_return(&peer->rid);
118085+ end = atomic_inc_return_unchecked(&peer->rid);
118086 qp->rid = end;
118087
118088 rc = qp->q.fragments && (end - start) > max;
118089@@ -750,12 +750,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
118090
118091 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118092 {
118093- struct ctl_table *table;
118094+ ctl_table_no_const *table = NULL;
118095 struct ctl_table_header *hdr;
118096
118097- table = ip4_frags_ns_ctl_table;
118098 if (!net_eq(net, &init_net)) {
118099- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118100+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118101 if (!table)
118102 goto err_alloc;
118103
118104@@ -769,9 +768,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118105 /* Don't export sysctls to unprivileged users */
118106 if (net->user_ns != &init_user_ns)
118107 table[0].procname = NULL;
118108- }
118109+ hdr = register_net_sysctl(net, "net/ipv4", table);
118110+ } else
118111+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
118112
118113- hdr = register_net_sysctl(net, "net/ipv4", table);
118114 if (!hdr)
118115 goto err_reg;
118116
118117@@ -779,8 +779,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118118 return 0;
118119
118120 err_reg:
118121- if (!net_eq(net, &init_net))
118122- kfree(table);
118123+ kfree(table);
118124 err_alloc:
118125 return -ENOMEM;
118126 }
118127diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
118128index 5fd7064..d13d75f 100644
118129--- a/net/ipv4/ip_gre.c
118130+++ b/net/ipv4/ip_gre.c
118131@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
118132 module_param(log_ecn_error, bool, 0644);
118133 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118134
118135-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
118136+static struct rtnl_link_ops ipgre_link_ops;
118137 static int ipgre_tunnel_init(struct net_device *dev);
118138
118139 static int ipgre_net_id __read_mostly;
118140@@ -819,7 +819,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
118141 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
118142 };
118143
118144-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118145+static struct rtnl_link_ops ipgre_link_ops = {
118146 .kind = "gre",
118147 .maxtype = IFLA_GRE_MAX,
118148 .policy = ipgre_policy,
118149@@ -834,7 +834,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118150 .get_link_net = ip_tunnel_get_link_net,
118151 };
118152
118153-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
118154+static struct rtnl_link_ops ipgre_tap_ops = {
118155 .kind = "gretap",
118156 .maxtype = IFLA_GRE_MAX,
118157 .policy = ipgre_policy,
118158diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
118159index 2db4c87..4db9282 100644
118160--- a/net/ipv4/ip_input.c
118161+++ b/net/ipv4/ip_input.c
118162@@ -147,6 +147,10 @@
118163 #include <linux/mroute.h>
118164 #include <linux/netlink.h>
118165
118166+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118167+extern int grsec_enable_blackhole;
118168+#endif
118169+
118170 /*
118171 * Process Router Attention IP option (RFC 2113)
118172 */
118173@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
118174 if (!raw) {
118175 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
118176 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
118177+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118178+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118179+#endif
118180 icmp_send(skb, ICMP_DEST_UNREACH,
118181 ICMP_PROT_UNREACH, 0);
118182 }
118183diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
118184index 6ddde89..653e224 100644
118185--- a/net/ipv4/ip_sockglue.c
118186+++ b/net/ipv4/ip_sockglue.c
118187@@ -1291,7 +1291,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118188 len = min_t(unsigned int, len, opt->optlen);
118189 if (put_user(len, optlen))
118190 return -EFAULT;
118191- if (copy_to_user(optval, opt->__data, len))
118192+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
118193+ copy_to_user(optval, opt->__data, len))
118194 return -EFAULT;
118195 return 0;
118196 }
118197@@ -1425,7 +1426,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118198 if (sk->sk_type != SOCK_STREAM)
118199 return -ENOPROTOOPT;
118200
118201- msg.msg_control = (__force void *) optval;
118202+ msg.msg_control = (__force_kernel void *) optval;
118203 msg.msg_controllen = len;
118204 msg.msg_flags = flags;
118205
118206diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
118207index 0c15208..a3a76c5 100644
118208--- a/net/ipv4/ip_vti.c
118209+++ b/net/ipv4/ip_vti.c
118210@@ -45,7 +45,7 @@
118211 #include <net/net_namespace.h>
118212 #include <net/netns/generic.h>
118213
118214-static struct rtnl_link_ops vti_link_ops __read_mostly;
118215+static struct rtnl_link_ops vti_link_ops;
118216
118217 static int vti_net_id __read_mostly;
118218 static int vti_tunnel_init(struct net_device *dev);
118219@@ -525,7 +525,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
118220 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
118221 };
118222
118223-static struct rtnl_link_ops vti_link_ops __read_mostly = {
118224+static struct rtnl_link_ops vti_link_ops = {
118225 .kind = "vti",
118226 .maxtype = IFLA_VTI_MAX,
118227 .policy = vti_policy,
118228diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
118229index 8e7328c..9bd7ed3 100644
118230--- a/net/ipv4/ipconfig.c
118231+++ b/net/ipv4/ipconfig.c
118232@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
118233
118234 mm_segment_t oldfs = get_fs();
118235 set_fs(get_ds());
118236- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118237+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118238 set_fs(oldfs);
118239 return res;
118240 }
118241@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
118242
118243 mm_segment_t oldfs = get_fs();
118244 set_fs(get_ds());
118245- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118246+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118247 set_fs(oldfs);
118248 return res;
118249 }
118250@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
118251
118252 mm_segment_t oldfs = get_fs();
118253 set_fs(get_ds());
118254- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
118255+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
118256 set_fs(oldfs);
118257 return res;
118258 }
118259diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
118260index ff96396..2e928ba 100644
118261--- a/net/ipv4/ipip.c
118262+++ b/net/ipv4/ipip.c
118263@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118264 static int ipip_net_id __read_mostly;
118265
118266 static int ipip_tunnel_init(struct net_device *dev);
118267-static struct rtnl_link_ops ipip_link_ops __read_mostly;
118268+static struct rtnl_link_ops ipip_link_ops;
118269
118270 static int ipip_err(struct sk_buff *skb, u32 info)
118271 {
118272@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
118273 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
118274 };
118275
118276-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
118277+static struct rtnl_link_ops ipip_link_ops = {
118278 .kind = "ipip",
118279 .maxtype = IFLA_IPTUN_MAX,
118280 .policy = ipip_policy,
118281diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
118282index a612007..99ac4bc5 100644
118283--- a/net/ipv4/netfilter/arp_tables.c
118284+++ b/net/ipv4/netfilter/arp_tables.c
118285@@ -884,14 +884,14 @@ static int compat_table_info(const struct xt_table_info *info,
118286 #endif
118287
118288 static int get_info(struct net *net, void __user *user,
118289- const int *len, int compat)
118290+ int len, int compat)
118291 {
118292 char name[XT_TABLE_MAXNAMELEN];
118293 struct xt_table *t;
118294 int ret;
118295
118296- if (*len != sizeof(struct arpt_getinfo)) {
118297- duprintf("length %u != %Zu\n", *len,
118298+ if (len != sizeof(struct arpt_getinfo)) {
118299+ duprintf("length %u != %Zu\n", len,
118300 sizeof(struct arpt_getinfo));
118301 return -EINVAL;
118302 }
118303@@ -928,7 +928,7 @@ static int get_info(struct net *net, void __user *user,
118304 info.size = private->size;
118305 strcpy(info.name, name);
118306
118307- if (copy_to_user(user, &info, *len) != 0)
118308+ if (copy_to_user(user, &info, len) != 0)
118309 ret = -EFAULT;
118310 else
118311 ret = 0;
118312@@ -1695,7 +1695,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
118313
118314 switch (cmd) {
118315 case ARPT_SO_GET_INFO:
118316- ret = get_info(sock_net(sk), user, len, 1);
118317+ ret = get_info(sock_net(sk), user, *len, 1);
118318 break;
118319 case ARPT_SO_GET_ENTRIES:
118320 ret = compat_get_entries(sock_net(sk), user, len);
118321@@ -1740,7 +1740,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
118322
118323 switch (cmd) {
118324 case ARPT_SO_GET_INFO:
118325- ret = get_info(sock_net(sk), user, len, 0);
118326+ ret = get_info(sock_net(sk), user, *len, 0);
118327 break;
118328
118329 case ARPT_SO_GET_ENTRIES:
118330diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
118331index 2d0e265..67e5b8d 100644
118332--- a/net/ipv4/netfilter/ip_tables.c
118333+++ b/net/ipv4/netfilter/ip_tables.c
118334@@ -1072,14 +1072,14 @@ static int compat_table_info(const struct xt_table_info *info,
118335 #endif
118336
118337 static int get_info(struct net *net, void __user *user,
118338- const int *len, int compat)
118339+ int len, int compat)
118340 {
118341 char name[XT_TABLE_MAXNAMELEN];
118342 struct xt_table *t;
118343 int ret;
118344
118345- if (*len != sizeof(struct ipt_getinfo)) {
118346- duprintf("length %u != %zu\n", *len,
118347+ if (len != sizeof(struct ipt_getinfo)) {
118348+ duprintf("length %u != %zu\n", len,
118349 sizeof(struct ipt_getinfo));
118350 return -EINVAL;
118351 }
118352@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user,
118353 info.size = private->size;
118354 strcpy(info.name, name);
118355
118356- if (copy_to_user(user, &info, *len) != 0)
118357+ if (copy_to_user(user, &info, len) != 0)
118358 ret = -EFAULT;
118359 else
118360 ret = 0;
118361@@ -1978,7 +1978,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118362
118363 switch (cmd) {
118364 case IPT_SO_GET_INFO:
118365- ret = get_info(sock_net(sk), user, len, 1);
118366+ ret = get_info(sock_net(sk), user, *len, 1);
118367 break;
118368 case IPT_SO_GET_ENTRIES:
118369 ret = compat_get_entries(sock_net(sk), user, len);
118370@@ -2025,7 +2025,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118371
118372 switch (cmd) {
118373 case IPT_SO_GET_INFO:
118374- ret = get_info(sock_net(sk), user, len, 0);
118375+ ret = get_info(sock_net(sk), user, *len, 0);
118376 break;
118377
118378 case IPT_SO_GET_ENTRIES:
118379diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118380index 771ab3d..5b99b18 100644
118381--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
118382+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118383@@ -725,7 +725,7 @@ static int clusterip_net_init(struct net *net)
118384 spin_lock_init(&cn->lock);
118385
118386 #ifdef CONFIG_PROC_FS
118387- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
118388+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
118389 if (!cn->procdir) {
118390 pr_err("Unable to proc dir entry\n");
118391 return -ENOMEM;
118392diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
118393index 05ff44b..da00000 100644
118394--- a/net/ipv4/ping.c
118395+++ b/net/ipv4/ping.c
118396@@ -59,7 +59,7 @@ struct ping_table {
118397 };
118398
118399 static struct ping_table ping_table;
118400-struct pingv6_ops pingv6_ops;
118401+struct pingv6_ops *pingv6_ops;
118402 EXPORT_SYMBOL_GPL(pingv6_ops);
118403
118404 static u16 ping_port_rover;
118405@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
118406 return -ENODEV;
118407 }
118408 }
118409- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
118410+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
118411 scoped);
118412 rcu_read_unlock();
118413
118414@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118415 }
118416 #if IS_ENABLED(CONFIG_IPV6)
118417 } else if (skb->protocol == htons(ETH_P_IPV6)) {
118418- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
118419+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
118420 #endif
118421 }
118422
118423@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118424 info, (u8 *)icmph);
118425 #if IS_ENABLED(CONFIG_IPV6)
118426 } else if (family == AF_INET6) {
118427- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
118428+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
118429 info, (u8 *)icmph);
118430 #endif
118431 }
118432@@ -918,10 +918,10 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
118433 }
118434
118435 if (inet6_sk(sk)->rxopt.all)
118436- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
118437+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
118438 if (skb->protocol == htons(ETH_P_IPV6) &&
118439 inet6_sk(sk)->rxopt.all)
118440- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
118441+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
118442 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
118443 ip_cmsg_recv(msg, skb);
118444 #endif
118445@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
118446 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118447 0, sock_i_ino(sp),
118448 atomic_read(&sp->sk_refcnt), sp,
118449- atomic_read(&sp->sk_drops));
118450+ atomic_read_unchecked(&sp->sk_drops));
118451 }
118452
118453 static int ping_v4_seq_show(struct seq_file *seq, void *v)
118454diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
118455index 561cd4b..a32a155 100644
118456--- a/net/ipv4/raw.c
118457+++ b/net/ipv4/raw.c
118458@@ -323,7 +323,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
118459 int raw_rcv(struct sock *sk, struct sk_buff *skb)
118460 {
118461 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
118462- atomic_inc(&sk->sk_drops);
118463+ atomic_inc_unchecked(&sk->sk_drops);
118464 kfree_skb(skb);
118465 return NET_RX_DROP;
118466 }
118467@@ -771,16 +771,20 @@ static int raw_init(struct sock *sk)
118468
118469 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
118470 {
118471+ struct icmp_filter filter;
118472+
118473 if (optlen > sizeof(struct icmp_filter))
118474 optlen = sizeof(struct icmp_filter);
118475- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
118476+ if (copy_from_user(&filter, optval, optlen))
118477 return -EFAULT;
118478+ raw_sk(sk)->filter = filter;
118479 return 0;
118480 }
118481
118482 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
118483 {
118484 int len, ret = -EFAULT;
118485+ struct icmp_filter filter;
118486
118487 if (get_user(len, optlen))
118488 goto out;
118489@@ -790,8 +794,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
118490 if (len > sizeof(struct icmp_filter))
118491 len = sizeof(struct icmp_filter);
118492 ret = -EFAULT;
118493- if (put_user(len, optlen) ||
118494- copy_to_user(optval, &raw_sk(sk)->filter, len))
118495+ filter = raw_sk(sk)->filter;
118496+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
118497 goto out;
118498 ret = 0;
118499 out: return ret;
118500@@ -1020,7 +1024,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
118501 0, 0L, 0,
118502 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
118503 0, sock_i_ino(sp),
118504- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
118505+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
118506 }
118507
118508 static int raw_seq_show(struct seq_file *seq, void *v)
118509diff --git a/net/ipv4/route.c b/net/ipv4/route.c
118510index f45f2a1..e7d47a3 100644
118511--- a/net/ipv4/route.c
118512+++ b/net/ipv4/route.c
118513@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
118514
118515 static int rt_cache_seq_open(struct inode *inode, struct file *file)
118516 {
118517- return seq_open(file, &rt_cache_seq_ops);
118518+ return seq_open_restrict(file, &rt_cache_seq_ops);
118519 }
118520
118521 static const struct file_operations rt_cache_seq_fops = {
118522@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
118523
118524 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
118525 {
118526- return seq_open(file, &rt_cpu_seq_ops);
118527+ return seq_open_restrict(file, &rt_cpu_seq_ops);
118528 }
118529
118530 static const struct file_operations rt_cpu_seq_fops = {
118531@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
118532
118533 static int rt_acct_proc_open(struct inode *inode, struct file *file)
118534 {
118535- return single_open(file, rt_acct_proc_show, NULL);
118536+ return single_open_restrict(file, rt_acct_proc_show, NULL);
118537 }
118538
118539 static const struct file_operations rt_acct_proc_fops = {
118540@@ -458,11 +458,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
118541
118542 #define IP_IDENTS_SZ 2048u
118543 struct ip_ident_bucket {
118544- atomic_t id;
118545+ atomic_unchecked_t id;
118546 u32 stamp32;
118547 };
118548
118549-static struct ip_ident_bucket *ip_idents __read_mostly;
118550+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
118551
118552 /* In order to protect privacy, we add a perturbation to identifiers
118553 * if one generator is seldom used. This makes hard for an attacker
118554@@ -478,7 +478,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
118555 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
118556 delta = prandom_u32_max(now - old);
118557
118558- return atomic_add_return(segs + delta, &bucket->id) - segs;
118559+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
118560 }
118561 EXPORT_SYMBOL(ip_idents_reserve);
118562
118563@@ -2641,34 +2641,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
118564 .maxlen = sizeof(int),
118565 .mode = 0200,
118566 .proc_handler = ipv4_sysctl_rtcache_flush,
118567+ .extra1 = &init_net,
118568 },
118569 { },
118570 };
118571
118572 static __net_init int sysctl_route_net_init(struct net *net)
118573 {
118574- struct ctl_table *tbl;
118575+ ctl_table_no_const *tbl = NULL;
118576
118577- tbl = ipv4_route_flush_table;
118578 if (!net_eq(net, &init_net)) {
118579- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118580+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118581 if (!tbl)
118582 goto err_dup;
118583
118584 /* Don't export sysctls to unprivileged users */
118585 if (net->user_ns != &init_user_ns)
118586 tbl[0].procname = NULL;
118587- }
118588- tbl[0].extra1 = net;
118589+ tbl[0].extra1 = net;
118590+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118591+ } else
118592+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
118593
118594- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118595 if (!net->ipv4.route_hdr)
118596 goto err_reg;
118597 return 0;
118598
118599 err_reg:
118600- if (tbl != ipv4_route_flush_table)
118601- kfree(tbl);
118602+ kfree(tbl);
118603 err_dup:
118604 return -ENOMEM;
118605 }
118606@@ -2691,8 +2691,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
118607
118608 static __net_init int rt_genid_init(struct net *net)
118609 {
118610- atomic_set(&net->ipv4.rt_genid, 0);
118611- atomic_set(&net->fnhe_genid, 0);
118612+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
118613+ atomic_set_unchecked(&net->fnhe_genid, 0);
118614 get_random_bytes(&net->ipv4.dev_addr_genid,
118615 sizeof(net->ipv4.dev_addr_genid));
118616 return 0;
118617@@ -2736,11 +2736,7 @@ int __init ip_rt_init(void)
118618 int rc = 0;
118619 int cpu;
118620
118621- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
118622- if (!ip_idents)
118623- panic("IP: failed to allocate ip_idents\n");
118624-
118625- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
118626+ prandom_bytes(ip_idents, sizeof(ip_idents));
118627
118628 for_each_possible_cpu(cpu) {
118629 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
118630diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
118631index c3852a7..7bdbde7 100644
118632--- a/net/ipv4/sysctl_net_ipv4.c
118633+++ b/net/ipv4/sysctl_net_ipv4.c
118634@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
118635 container_of(table->data, struct net, ipv4.ip_local_ports.range);
118636 int ret;
118637 int range[2];
118638- struct ctl_table tmp = {
118639+ ctl_table_no_const tmp = {
118640 .data = &range,
118641 .maxlen = sizeof(range),
118642 .mode = table->mode,
118643@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
118644 int ret;
118645 gid_t urange[2];
118646 kgid_t low, high;
118647- struct ctl_table tmp = {
118648+ ctl_table_no_const tmp = {
118649 .data = &urange,
118650 .maxlen = sizeof(urange),
118651 .mode = table->mode,
118652@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
118653 void __user *buffer, size_t *lenp, loff_t *ppos)
118654 {
118655 char val[TCP_CA_NAME_MAX];
118656- struct ctl_table tbl = {
118657+ ctl_table_no_const tbl = {
118658 .data = val,
118659 .maxlen = TCP_CA_NAME_MAX,
118660 };
118661@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
118662 void __user *buffer, size_t *lenp,
118663 loff_t *ppos)
118664 {
118665- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
118666+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
118667 int ret;
118668
118669 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118670@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
118671 void __user *buffer, size_t *lenp,
118672 loff_t *ppos)
118673 {
118674- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
118675+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
118676 int ret;
118677
118678 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118679@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
118680 void __user *buffer, size_t *lenp,
118681 loff_t *ppos)
118682 {
118683- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118684+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118685 struct tcp_fastopen_context *ctxt;
118686 int ret;
118687 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
118688@@ -902,13 +902,12 @@ static struct ctl_table ipv4_net_table[] = {
118689
118690 static __net_init int ipv4_sysctl_init_net(struct net *net)
118691 {
118692- struct ctl_table *table;
118693+ ctl_table_no_const *table = NULL;
118694
118695- table = ipv4_net_table;
118696 if (!net_eq(net, &init_net)) {
118697 int i;
118698
118699- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
118700+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
118701 if (!table)
118702 goto err_alloc;
118703
118704@@ -917,7 +916,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
118705 table[i].data += (void *)net - (void *)&init_net;
118706 }
118707
118708- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118709+ if (!net_eq(net, &init_net))
118710+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118711+ else
118712+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
118713 if (!net->ipv4.ipv4_hdr)
118714 goto err_reg;
118715
118716diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
118717index c9ab964..607d9f7 100644
118718--- a/net/ipv4/tcp_input.c
118719+++ b/net/ipv4/tcp_input.c
118720@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
118721 * without any lock. We want to make sure compiler wont store
118722 * intermediate values in this location.
118723 */
118724- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
118725+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
118726 sk->sk_max_pacing_rate);
118727 }
118728
118729@@ -4610,7 +4610,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
118730 * simplifies code)
118731 */
118732 static void
118733-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118734+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118735 struct sk_buff *head, struct sk_buff *tail,
118736 u32 start, u32 end)
118737 {
118738@@ -5605,6 +5605,7 @@ discard:
118739 tcp_paws_reject(&tp->rx_opt, 0))
118740 goto discard_and_undo;
118741
118742+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
118743 if (th->syn) {
118744 /* We see SYN without ACK. It is attempt of
118745 * simultaneous connect with crossed SYNs.
118746@@ -5655,6 +5656,7 @@ discard:
118747 goto discard;
118748 #endif
118749 }
118750+#endif
118751 /* "fifth, if neither of the SYN or RST bits is set then
118752 * drop the segment and return."
118753 */
118754@@ -5701,7 +5703,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
118755 goto discard;
118756
118757 if (th->syn) {
118758- if (th->fin)
118759+ if (th->fin || th->urg || th->psh)
118760 goto discard;
118761 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
118762 return 1;
118763diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
118764index fc1c658..42a8d34 100644
118765--- a/net/ipv4/tcp_ipv4.c
118766+++ b/net/ipv4/tcp_ipv4.c
118767@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
118768 int sysctl_tcp_low_latency __read_mostly;
118769 EXPORT_SYMBOL(sysctl_tcp_low_latency);
118770
118771+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118772+extern int grsec_enable_blackhole;
118773+#endif
118774+
118775 #ifdef CONFIG_TCP_MD5SIG
118776 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
118777 __be32 daddr, __be32 saddr, const struct tcphdr *th);
118778@@ -1427,6 +1431,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
118779 return 0;
118780
118781 reset:
118782+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118783+ if (!grsec_enable_blackhole)
118784+#endif
118785 tcp_v4_send_reset(rsk, skb);
118786 discard:
118787 kfree_skb(skb);
118788@@ -1591,12 +1598,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
118789 TCP_SKB_CB(skb)->sacked = 0;
118790
118791 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
118792- if (!sk)
118793+ if (!sk) {
118794+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118795+ ret = 1;
118796+#endif
118797 goto no_tcp_socket;
118798-
118799+ }
118800 process:
118801- if (sk->sk_state == TCP_TIME_WAIT)
118802+ if (sk->sk_state == TCP_TIME_WAIT) {
118803+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118804+ ret = 2;
118805+#endif
118806 goto do_time_wait;
118807+ }
118808
118809 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
118810 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
118811@@ -1652,6 +1666,10 @@ csum_error:
118812 bad_packet:
118813 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
118814 } else {
118815+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118816+ if (!grsec_enable_blackhole || (ret == 1 &&
118817+ (skb->dev->flags & IFF_LOOPBACK)))
118818+#endif
118819 tcp_v4_send_reset(NULL, skb);
118820 }
118821
118822diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
118823index 17e7339..c72ff6c 100644
118824--- a/net/ipv4/tcp_minisocks.c
118825+++ b/net/ipv4/tcp_minisocks.c
118826@@ -27,6 +27,10 @@
118827 #include <net/inet_common.h>
118828 #include <net/xfrm.h>
118829
118830+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118831+extern int grsec_enable_blackhole;
118832+#endif
118833+
118834 int sysctl_tcp_syncookies __read_mostly = 1;
118835 EXPORT_SYMBOL(sysctl_tcp_syncookies);
118836
118837@@ -778,7 +782,10 @@ embryonic_reset:
118838 * avoid becoming vulnerable to outside attack aiming at
118839 * resetting legit local connections.
118840 */
118841- req->rsk_ops->send_reset(sk, skb);
118842+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118843+ if (!grsec_enable_blackhole)
118844+#endif
118845+ req->rsk_ops->send_reset(sk, skb);
118846 } else if (fastopen) { /* received a valid RST pkt */
118847 reqsk_fastopen_remove(sk, req, true);
118848 tcp_reset(sk);
118849diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
118850index ebf5ff5..4d1ff32 100644
118851--- a/net/ipv4/tcp_probe.c
118852+++ b/net/ipv4/tcp_probe.c
118853@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
118854 if (cnt + width >= len)
118855 break;
118856
118857- if (copy_to_user(buf + cnt, tbuf, width))
118858+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
118859 return -EFAULT;
118860 cnt += width;
118861 }
118862diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
118863index 8c65dc1..55fd1ba 100644
118864--- a/net/ipv4/tcp_timer.c
118865+++ b/net/ipv4/tcp_timer.c
118866@@ -22,6 +22,10 @@
118867 #include <linux/gfp.h>
118868 #include <net/tcp.h>
118869
118870+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118871+extern int grsec_lastack_retries;
118872+#endif
118873+
118874 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
118875 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
118876 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
118877@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock *sk)
118878 }
118879 }
118880
118881+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118882+ if ((sk->sk_state == TCP_LAST_ACK) &&
118883+ (grsec_lastack_retries > 0) &&
118884+ (grsec_lastack_retries < retry_until))
118885+ retry_until = grsec_lastack_retries;
118886+#endif
118887+
118888 if (retransmits_timed_out(sk, retry_until,
118889 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
118890 /* Has it gone just too far? */
118891diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
118892index 83aa604..dbfddf5 100644
118893--- a/net/ipv4/udp.c
118894+++ b/net/ipv4/udp.c
118895@@ -87,6 +87,7 @@
118896 #include <linux/types.h>
118897 #include <linux/fcntl.h>
118898 #include <linux/module.h>
118899+#include <linux/security.h>
118900 #include <linux/socket.h>
118901 #include <linux/sockios.h>
118902 #include <linux/igmp.h>
118903@@ -115,6 +116,10 @@
118904 #include <net/busy_poll.h>
118905 #include "udp_impl.h"
118906
118907+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118908+extern int grsec_enable_blackhole;
118909+#endif
118910+
118911 struct udp_table udp_table __read_mostly;
118912 EXPORT_SYMBOL(udp_table);
118913
118914@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
118915 return true;
118916 }
118917
118918+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
118919+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
118920+
118921 /*
118922 * This routine is called by the ICMP module when it gets some
118923 * sort of error condition. If err < 0 then the socket should
118924@@ -944,9 +952,18 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
118925 dport = usin->sin_port;
118926 if (dport == 0)
118927 return -EINVAL;
118928+
118929+ err = gr_search_udp_sendmsg(sk, usin);
118930+ if (err)
118931+ return err;
118932 } else {
118933 if (sk->sk_state != TCP_ESTABLISHED)
118934 return -EDESTADDRREQ;
118935+
118936+ err = gr_search_udp_sendmsg(sk, NULL);
118937+ if (err)
118938+ return err;
118939+
118940 daddr = inet->inet_daddr;
118941 dport = inet->inet_dport;
118942 /* Open fast path for connected socket.
118943@@ -1193,7 +1210,7 @@ static unsigned int first_packet_length(struct sock *sk)
118944 IS_UDPLITE(sk));
118945 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
118946 IS_UDPLITE(sk));
118947- atomic_inc(&sk->sk_drops);
118948+ atomic_inc_unchecked(&sk->sk_drops);
118949 __skb_unlink(skb, rcvq);
118950 __skb_queue_tail(&list_kill, skb);
118951 }
118952@@ -1273,6 +1290,10 @@ try_again:
118953 if (!skb)
118954 goto out;
118955
118956+ err = gr_search_udp_recvmsg(sk, skb);
118957+ if (err)
118958+ goto out_free;
118959+
118960 ulen = skb->len - sizeof(struct udphdr);
118961 copied = len;
118962 if (copied > ulen)
118963@@ -1305,7 +1326,7 @@ try_again:
118964 if (unlikely(err)) {
118965 trace_kfree_skb(skb, udp_recvmsg);
118966 if (!peeked) {
118967- atomic_inc(&sk->sk_drops);
118968+ atomic_inc_unchecked(&sk->sk_drops);
118969 UDP_INC_STATS_USER(sock_net(sk),
118970 UDP_MIB_INERRORS, is_udplite);
118971 }
118972@@ -1599,7 +1620,7 @@ csum_error:
118973 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
118974 drop:
118975 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
118976- atomic_inc(&sk->sk_drops);
118977+ atomic_inc_unchecked(&sk->sk_drops);
118978 kfree_skb(skb);
118979 return -1;
118980 }
118981@@ -1617,7 +1638,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
118982 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
118983
118984 if (!skb1) {
118985- atomic_inc(&sk->sk_drops);
118986+ atomic_inc_unchecked(&sk->sk_drops);
118987 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
118988 IS_UDPLITE(sk));
118989 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
118990@@ -1823,6 +1844,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
118991 goto csum_error;
118992
118993 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
118994+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118995+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118996+#endif
118997 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
118998
118999 /*
119000@@ -2420,7 +2444,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
119001 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
119002 0, sock_i_ino(sp),
119003 atomic_read(&sp->sk_refcnt), sp,
119004- atomic_read(&sp->sk_drops));
119005+ atomic_read_unchecked(&sp->sk_drops));
119006 }
119007
119008 int udp4_seq_show(struct seq_file *seq, void *v)
119009diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
119010index bff6974..c63736c 100644
119011--- a/net/ipv4/xfrm4_policy.c
119012+++ b/net/ipv4/xfrm4_policy.c
119013@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
119014 fl4->flowi4_tos = iph->tos;
119015 }
119016
119017-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
119018+static int xfrm4_garbage_collect(struct dst_ops *ops)
119019 {
119020 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
119021
119022- xfrm4_policy_afinfo.garbage_collect(net);
119023+ xfrm_garbage_collect_deferred(net);
119024 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
119025 }
119026
119027@@ -268,19 +268,18 @@ static struct ctl_table xfrm4_policy_table[] = {
119028
119029 static int __net_init xfrm4_net_init(struct net *net)
119030 {
119031- struct ctl_table *table;
119032+ ctl_table_no_const *table = NULL;
119033 struct ctl_table_header *hdr;
119034
119035- table = xfrm4_policy_table;
119036 if (!net_eq(net, &init_net)) {
119037- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119038+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119039 if (!table)
119040 goto err_alloc;
119041
119042 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
119043- }
119044-
119045- hdr = register_net_sysctl(net, "net/ipv4", table);
119046+ hdr = register_net_sysctl(net, "net/ipv4", table);
119047+ } else
119048+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
119049 if (!hdr)
119050 goto err_reg;
119051
119052@@ -288,8 +287,7 @@ static int __net_init xfrm4_net_init(struct net *net)
119053 return 0;
119054
119055 err_reg:
119056- if (!net_eq(net, &init_net))
119057- kfree(table);
119058+ kfree(table);
119059 err_alloc:
119060 return -ENOMEM;
119061 }
119062diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
119063index 37b70e8..1475ab7 100644
119064--- a/net/ipv6/addrconf.c
119065+++ b/net/ipv6/addrconf.c
119066@@ -178,7 +178,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
119067 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119068 .mtu6 = IPV6_MIN_MTU,
119069 .accept_ra = 1,
119070- .accept_redirects = 1,
119071+ .accept_redirects = 0,
119072 .autoconf = 1,
119073 .force_mld_version = 0,
119074 .mldv1_unsolicited_report_interval = 10 * HZ,
119075@@ -219,7 +219,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
119076 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119077 .mtu6 = IPV6_MIN_MTU,
119078 .accept_ra = 1,
119079- .accept_redirects = 1,
119080+ .accept_redirects = 0,
119081 .autoconf = 1,
119082 .force_mld_version = 0,
119083 .mldv1_unsolicited_report_interval = 10 * HZ,
119084@@ -620,7 +620,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
119085 idx = 0;
119086 head = &net->dev_index_head[h];
119087 rcu_read_lock();
119088- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
119089+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
119090 net->dev_base_seq;
119091 hlist_for_each_entry_rcu(dev, head, index_hlist) {
119092 if (idx < s_idx)
119093@@ -2506,7 +2506,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
119094 p.iph.ihl = 5;
119095 p.iph.protocol = IPPROTO_IPV6;
119096 p.iph.ttl = 64;
119097- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
119098+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
119099
119100 if (ops->ndo_do_ioctl) {
119101 mm_segment_t oldfs = get_fs();
119102@@ -3772,16 +3772,23 @@ static const struct file_operations if6_fops = {
119103 .release = seq_release_net,
119104 };
119105
119106+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
119107+extern void unregister_ipv6_seq_ops_addr(void);
119108+
119109 static int __net_init if6_proc_net_init(struct net *net)
119110 {
119111- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
119112+ register_ipv6_seq_ops_addr(&if6_seq_ops);
119113+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
119114+ unregister_ipv6_seq_ops_addr();
119115 return -ENOMEM;
119116+ }
119117 return 0;
119118 }
119119
119120 static void __net_exit if6_proc_net_exit(struct net *net)
119121 {
119122 remove_proc_entry("if_inet6", net->proc_net);
119123+ unregister_ipv6_seq_ops_addr();
119124 }
119125
119126 static struct pernet_operations if6_proc_net_ops = {
119127@@ -4400,7 +4407,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
119128 s_ip_idx = ip_idx = cb->args[2];
119129
119130 rcu_read_lock();
119131- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119132+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119133 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
119134 idx = 0;
119135 head = &net->dev_index_head[h];
119136@@ -5057,7 +5064,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119137 rt_genid_bump_ipv6(net);
119138 break;
119139 }
119140- atomic_inc(&net->ipv6.dev_addr_genid);
119141+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
119142 }
119143
119144 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119145@@ -5077,7 +5084,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
119146 int *valp = ctl->data;
119147 int val = *valp;
119148 loff_t pos = *ppos;
119149- struct ctl_table lctl;
119150+ ctl_table_no_const lctl;
119151 int ret;
119152
119153 /*
119154@@ -5102,7 +5109,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
119155 {
119156 struct inet6_dev *idev = ctl->extra1;
119157 int min_mtu = IPV6_MIN_MTU;
119158- struct ctl_table lctl;
119159+ ctl_table_no_const lctl;
119160
119161 lctl = *ctl;
119162 lctl.extra1 = &min_mtu;
119163@@ -5177,7 +5184,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
119164 int *valp = ctl->data;
119165 int val = *valp;
119166 loff_t pos = *ppos;
119167- struct ctl_table lctl;
119168+ ctl_table_no_const lctl;
119169 int ret;
119170
119171 /*
119172@@ -5242,7 +5249,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
119173 int err;
119174 struct in6_addr addr;
119175 char str[IPV6_MAX_STRLEN];
119176- struct ctl_table lctl = *ctl;
119177+ ctl_table_no_const lctl = *ctl;
119178 struct net *net = ctl->extra2;
119179 struct ipv6_stable_secret *secret = ctl->data;
119180
119181diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
119182index eef63b3..d68f5da 100644
119183--- a/net/ipv6/af_inet6.c
119184+++ b/net/ipv6/af_inet6.c
119185@@ -768,7 +768,7 @@ static int __net_init inet6_net_init(struct net *net)
119186 net->ipv6.sysctl.auto_flowlabels = 0;
119187 net->ipv6.sysctl.idgen_retries = 3;
119188 net->ipv6.sysctl.idgen_delay = 1 * HZ;
119189- atomic_set(&net->ipv6.fib6_sernum, 1);
119190+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
119191
119192 err = ipv6_init_mibs(net);
119193 if (err)
119194diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
119195index 62d908e..bac79a9 100644
119196--- a/net/ipv6/datagram.c
119197+++ b/net/ipv6/datagram.c
119198@@ -967,5 +967,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
119199 0,
119200 sock_i_ino(sp),
119201 atomic_read(&sp->sk_refcnt), sp,
119202- atomic_read(&sp->sk_drops));
119203+ atomic_read_unchecked(&sp->sk_drops));
119204 }
119205diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
119206index 2c2b5d5..cc01abd 100644
119207--- a/net/ipv6/icmp.c
119208+++ b/net/ipv6/icmp.c
119209@@ -1004,7 +1004,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
119210
119211 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
119212 {
119213- struct ctl_table *table;
119214+ ctl_table_no_const *table;
119215
119216 table = kmemdup(ipv6_icmp_table_template,
119217 sizeof(ipv6_icmp_table_template),
119218diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
119219index bde57b1..5b45dbb 100644
119220--- a/net/ipv6/ip6_fib.c
119221+++ b/net/ipv6/ip6_fib.c
119222@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
119223 int new, old;
119224
119225 do {
119226- old = atomic_read(&net->ipv6.fib6_sernum);
119227+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
119228 new = old < INT_MAX ? old + 1 : 1;
119229- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
119230+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
119231 old, new) != old);
119232 return new;
119233 }
119234diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
119235index a38d3ac..d02e37d 100644
119236--- a/net/ipv6/ip6_gre.c
119237+++ b/net/ipv6/ip6_gre.c
119238@@ -71,8 +71,8 @@ struct ip6gre_net {
119239 struct net_device *fb_tunnel_dev;
119240 };
119241
119242-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
119243-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
119244+static struct rtnl_link_ops ip6gre_link_ops;
119245+static struct rtnl_link_ops ip6gre_tap_ops;
119246 static int ip6gre_tunnel_init(struct net_device *dev);
119247 static void ip6gre_tunnel_setup(struct net_device *dev);
119248 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
119249@@ -1280,7 +1280,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
119250 }
119251
119252
119253-static struct inet6_protocol ip6gre_protocol __read_mostly = {
119254+static struct inet6_protocol ip6gre_protocol = {
119255 .handler = ip6gre_rcv,
119256 .err_handler = ip6gre_err,
119257 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
119258@@ -1639,7 +1639,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
119259 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
119260 };
119261
119262-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119263+static struct rtnl_link_ops ip6gre_link_ops = {
119264 .kind = "ip6gre",
119265 .maxtype = IFLA_GRE_MAX,
119266 .policy = ip6gre_policy,
119267@@ -1654,7 +1654,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119268 .get_link_net = ip6_tnl_get_link_net,
119269 };
119270
119271-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
119272+static struct rtnl_link_ops ip6gre_tap_ops = {
119273 .kind = "ip6gretap",
119274 .maxtype = IFLA_GRE_MAX,
119275 .policy = ip6gre_policy,
119276diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
119277index 5cafd92..d5aead4 100644
119278--- a/net/ipv6/ip6_tunnel.c
119279+++ b/net/ipv6/ip6_tunnel.c
119280@@ -80,7 +80,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119281
119282 static int ip6_tnl_dev_init(struct net_device *dev);
119283 static void ip6_tnl_dev_setup(struct net_device *dev);
119284-static struct rtnl_link_ops ip6_link_ops __read_mostly;
119285+static struct rtnl_link_ops ip6_link_ops;
119286
119287 static int ip6_tnl_net_id __read_mostly;
119288 struct ip6_tnl_net {
119289@@ -1776,7 +1776,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
119290 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
119291 };
119292
119293-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
119294+static struct rtnl_link_ops ip6_link_ops = {
119295 .kind = "ip6tnl",
119296 .maxtype = IFLA_IPTUN_MAX,
119297 .policy = ip6_tnl_policy,
119298diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
119299index 0224c03..c5ec3d9 100644
119300--- a/net/ipv6/ip6_vti.c
119301+++ b/net/ipv6/ip6_vti.c
119302@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119303
119304 static int vti6_dev_init(struct net_device *dev);
119305 static void vti6_dev_setup(struct net_device *dev);
119306-static struct rtnl_link_ops vti6_link_ops __read_mostly;
119307+static struct rtnl_link_ops vti6_link_ops;
119308
119309 static int vti6_net_id __read_mostly;
119310 struct vti6_net {
119311@@ -1019,7 +1019,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
119312 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
119313 };
119314
119315-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
119316+static struct rtnl_link_ops vti6_link_ops = {
119317 .kind = "vti6",
119318 .maxtype = IFLA_VTI_MAX,
119319 .policy = vti6_policy,
119320diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
119321index 63e6956..ebbbcf6 100644
119322--- a/net/ipv6/ipv6_sockglue.c
119323+++ b/net/ipv6/ipv6_sockglue.c
119324@@ -1015,7 +1015,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
119325 if (sk->sk_type != SOCK_STREAM)
119326 return -ENOPROTOOPT;
119327
119328- msg.msg_control = optval;
119329+ msg.msg_control = (void __force_kernel *)optval;
119330 msg.msg_controllen = len;
119331 msg.msg_flags = flags;
119332
119333diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
119334index 62f5b0d..331fdb1 100644
119335--- a/net/ipv6/netfilter/ip6_tables.c
119336+++ b/net/ipv6/netfilter/ip6_tables.c
119337@@ -1085,14 +1085,14 @@ static int compat_table_info(const struct xt_table_info *info,
119338 #endif
119339
119340 static int get_info(struct net *net, void __user *user,
119341- const int *len, int compat)
119342+ int len, int compat)
119343 {
119344 char name[XT_TABLE_MAXNAMELEN];
119345 struct xt_table *t;
119346 int ret;
119347
119348- if (*len != sizeof(struct ip6t_getinfo)) {
119349- duprintf("length %u != %zu\n", *len,
119350+ if (len != sizeof(struct ip6t_getinfo)) {
119351+ duprintf("length %u != %zu\n", len,
119352 sizeof(struct ip6t_getinfo));
119353 return -EINVAL;
119354 }
119355@@ -1129,7 +1129,7 @@ static int get_info(struct net *net, void __user *user,
119356 info.size = private->size;
119357 strcpy(info.name, name);
119358
119359- if (copy_to_user(user, &info, *len) != 0)
119360+ if (copy_to_user(user, &info, len) != 0)
119361 ret = -EFAULT;
119362 else
119363 ret = 0;
119364@@ -1991,7 +1991,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119365
119366 switch (cmd) {
119367 case IP6T_SO_GET_INFO:
119368- ret = get_info(sock_net(sk), user, len, 1);
119369+ ret = get_info(sock_net(sk), user, *len, 1);
119370 break;
119371 case IP6T_SO_GET_ENTRIES:
119372 ret = compat_get_entries(sock_net(sk), user, len);
119373@@ -2038,7 +2038,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119374
119375 switch (cmd) {
119376 case IP6T_SO_GET_INFO:
119377- ret = get_info(sock_net(sk), user, len, 0);
119378+ ret = get_info(sock_net(sk), user, *len, 0);
119379 break;
119380
119381 case IP6T_SO_GET_ENTRIES:
119382diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
119383index 6f187c8..34b367f 100644
119384--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
119385+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
119386@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
119387
119388 static int nf_ct_frag6_sysctl_register(struct net *net)
119389 {
119390- struct ctl_table *table;
119391+ ctl_table_no_const *table = NULL;
119392 struct ctl_table_header *hdr;
119393
119394- table = nf_ct_frag6_sysctl_table;
119395 if (!net_eq(net, &init_net)) {
119396- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
119397+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
119398 GFP_KERNEL);
119399 if (table == NULL)
119400 goto err_alloc;
119401@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119402 table[2].data = &net->nf_frag.frags.high_thresh;
119403 table[2].extra1 = &net->nf_frag.frags.low_thresh;
119404 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
119405- }
119406-
119407- hdr = register_net_sysctl(net, "net/netfilter", table);
119408+ hdr = register_net_sysctl(net, "net/netfilter", table);
119409+ } else
119410+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
119411 if (hdr == NULL)
119412 goto err_reg;
119413
119414@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119415 return 0;
119416
119417 err_reg:
119418- if (!net_eq(net, &init_net))
119419- kfree(table);
119420+ kfree(table);
119421 err_alloc:
119422 return -ENOMEM;
119423 }
119424diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
119425index 263a516..692f738 100644
119426--- a/net/ipv6/ping.c
119427+++ b/net/ipv6/ping.c
119428@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
119429 };
119430 #endif
119431
119432+static struct pingv6_ops real_pingv6_ops = {
119433+ .ipv6_recv_error = ipv6_recv_error,
119434+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
119435+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
119436+ .icmpv6_err_convert = icmpv6_err_convert,
119437+ .ipv6_icmp_error = ipv6_icmp_error,
119438+ .ipv6_chk_addr = ipv6_chk_addr,
119439+};
119440+
119441+static struct pingv6_ops dummy_pingv6_ops = {
119442+ .ipv6_recv_error = dummy_ipv6_recv_error,
119443+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
119444+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
119445+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
119446+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
119447+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
119448+};
119449+
119450 int __init pingv6_init(void)
119451 {
119452 #ifdef CONFIG_PROC_FS
119453@@ -247,13 +265,7 @@ int __init pingv6_init(void)
119454 if (ret)
119455 return ret;
119456 #endif
119457- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
119458- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
119459- pingv6_ops.ip6_datagram_recv_specific_ctl =
119460- ip6_datagram_recv_specific_ctl;
119461- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
119462- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
119463- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
119464+ pingv6_ops = &real_pingv6_ops;
119465 return inet6_register_protosw(&pingv6_protosw);
119466 }
119467
119468@@ -262,14 +274,9 @@ int __init pingv6_init(void)
119469 */
119470 void pingv6_exit(void)
119471 {
119472- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
119473- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
119474- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
119475- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
119476- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
119477- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
119478 #ifdef CONFIG_PROC_FS
119479 unregister_pernet_subsys(&ping_v6_net_ops);
119480 #endif
119481+ pingv6_ops = &dummy_pingv6_ops;
119482 inet6_unregister_protosw(&pingv6_protosw);
119483 }
119484diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
119485index 679253d0..70b653c 100644
119486--- a/net/ipv6/proc.c
119487+++ b/net/ipv6/proc.c
119488@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
119489 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
119490 goto proc_snmp6_fail;
119491
119492- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
119493+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
119494 if (!net->mib.proc_net_devsnmp6)
119495 goto proc_dev_snmp6_fail;
119496 return 0;
119497diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
119498index 8072bd4..1629245 100644
119499--- a/net/ipv6/raw.c
119500+++ b/net/ipv6/raw.c
119501@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
119502 {
119503 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
119504 skb_checksum_complete(skb)) {
119505- atomic_inc(&sk->sk_drops);
119506+ atomic_inc_unchecked(&sk->sk_drops);
119507 kfree_skb(skb);
119508 return NET_RX_DROP;
119509 }
119510@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119511 struct raw6_sock *rp = raw6_sk(sk);
119512
119513 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
119514- atomic_inc(&sk->sk_drops);
119515+ atomic_inc_unchecked(&sk->sk_drops);
119516 kfree_skb(skb);
119517 return NET_RX_DROP;
119518 }
119519@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119520
119521 if (inet->hdrincl) {
119522 if (skb_checksum_complete(skb)) {
119523- atomic_inc(&sk->sk_drops);
119524+ atomic_inc_unchecked(&sk->sk_drops);
119525 kfree_skb(skb);
119526 return NET_RX_DROP;
119527 }
119528@@ -608,7 +608,7 @@ out:
119529 return err;
119530 }
119531
119532-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
119533+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
119534 struct flowi6 *fl6, struct dst_entry **dstp,
119535 unsigned int flags)
119536 {
119537@@ -913,12 +913,15 @@ do_confirm:
119538 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
119539 char __user *optval, int optlen)
119540 {
119541+ struct icmp6_filter filter;
119542+
119543 switch (optname) {
119544 case ICMPV6_FILTER:
119545 if (optlen > sizeof(struct icmp6_filter))
119546 optlen = sizeof(struct icmp6_filter);
119547- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
119548+ if (copy_from_user(&filter, optval, optlen))
119549 return -EFAULT;
119550+ raw6_sk(sk)->filter = filter;
119551 return 0;
119552 default:
119553 return -ENOPROTOOPT;
119554@@ -931,6 +934,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119555 char __user *optval, int __user *optlen)
119556 {
119557 int len;
119558+ struct icmp6_filter filter;
119559
119560 switch (optname) {
119561 case ICMPV6_FILTER:
119562@@ -942,7 +946,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119563 len = sizeof(struct icmp6_filter);
119564 if (put_user(len, optlen))
119565 return -EFAULT;
119566- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
119567+ filter = raw6_sk(sk)->filter;
119568+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
119569 return -EFAULT;
119570 return 0;
119571 default:
119572diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
119573index 8ffa2c8..5968612 100644
119574--- a/net/ipv6/reassembly.c
119575+++ b/net/ipv6/reassembly.c
119576@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
119577
119578 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119579 {
119580- struct ctl_table *table;
119581+ ctl_table_no_const *table = NULL;
119582 struct ctl_table_header *hdr;
119583
119584- table = ip6_frags_ns_ctl_table;
119585 if (!net_eq(net, &init_net)) {
119586- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119587+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119588 if (!table)
119589 goto err_alloc;
119590
119591@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119592 /* Don't export sysctls to unprivileged users */
119593 if (net->user_ns != &init_user_ns)
119594 table[0].procname = NULL;
119595- }
119596+ hdr = register_net_sysctl(net, "net/ipv6", table);
119597+ } else
119598+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
119599
119600- hdr = register_net_sysctl(net, "net/ipv6", table);
119601 if (!hdr)
119602 goto err_reg;
119603
119604@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119605 return 0;
119606
119607 err_reg:
119608- if (!net_eq(net, &init_net))
119609- kfree(table);
119610+ kfree(table);
119611 err_alloc:
119612 return -ENOMEM;
119613 }
119614diff --git a/net/ipv6/route.c b/net/ipv6/route.c
119615index c73ae50..aa55e00 100644
119616--- a/net/ipv6/route.c
119617+++ b/net/ipv6/route.c
119618@@ -3046,7 +3046,7 @@ struct ctl_table ipv6_route_table_template[] = {
119619
119620 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
119621 {
119622- struct ctl_table *table;
119623+ ctl_table_no_const *table;
119624
119625 table = kmemdup(ipv6_route_table_template,
119626 sizeof(ipv6_route_table_template),
119627diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
119628index ac35a28..070cc8c 100644
119629--- a/net/ipv6/sit.c
119630+++ b/net/ipv6/sit.c
119631@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
119632 static void ipip6_dev_free(struct net_device *dev);
119633 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
119634 __be32 *v4dst);
119635-static struct rtnl_link_ops sit_link_ops __read_mostly;
119636+static struct rtnl_link_ops sit_link_ops;
119637
119638 static int sit_net_id __read_mostly;
119639 struct sit_net {
119640@@ -1749,7 +1749,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
119641 unregister_netdevice_queue(dev, head);
119642 }
119643
119644-static struct rtnl_link_ops sit_link_ops __read_mostly = {
119645+static struct rtnl_link_ops sit_link_ops = {
119646 .kind = "sit",
119647 .maxtype = IFLA_IPTUN_MAX,
119648 .policy = ipip6_policy,
119649diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
119650index abcc79f..3b2d2d5 100644
119651--- a/net/ipv6/sysctl_net_ipv6.c
119652+++ b/net/ipv6/sysctl_net_ipv6.c
119653@@ -92,7 +92,7 @@ static struct ctl_table ipv6_rotable[] = {
119654
119655 static int __net_init ipv6_sysctl_net_init(struct net *net)
119656 {
119657- struct ctl_table *ipv6_table;
119658+ ctl_table_no_const *ipv6_table;
119659 struct ctl_table *ipv6_route_table;
119660 struct ctl_table *ipv6_icmp_table;
119661 int err;
119662diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
119663index 3adffb3..a67e4d1 100644
119664--- a/net/ipv6/tcp_ipv6.c
119665+++ b/net/ipv6/tcp_ipv6.c
119666@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
119667 }
119668 }
119669
119670+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119671+extern int grsec_enable_blackhole;
119672+#endif
119673+
119674 static __u32 tcp_v6_init_sequence(const struct sk_buff *skb)
119675 {
119676 return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
119677@@ -1283,6 +1287,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
119678 return 0;
119679
119680 reset:
119681+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119682+ if (!grsec_enable_blackhole)
119683+#endif
119684 tcp_v6_send_reset(sk, skb);
119685 discard:
119686 if (opt_skb)
119687@@ -1392,12 +1399,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
119688
119689 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
119690 inet6_iif(skb));
119691- if (!sk)
119692+ if (!sk) {
119693+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119694+ ret = 1;
119695+#endif
119696 goto no_tcp_socket;
119697+ }
119698
119699 process:
119700- if (sk->sk_state == TCP_TIME_WAIT)
119701+ if (sk->sk_state == TCP_TIME_WAIT) {
119702+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119703+ ret = 2;
119704+#endif
119705 goto do_time_wait;
119706+ }
119707
119708 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
119709 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
119710@@ -1448,6 +1463,10 @@ csum_error:
119711 bad_packet:
119712 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
119713 } else {
119714+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119715+ if (!grsec_enable_blackhole || (ret == 1 &&
119716+ (skb->dev->flags & IFF_LOOPBACK)))
119717+#endif
119718 tcp_v6_send_reset(NULL, skb);
119719 }
119720
119721diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
119722index e51fc3e..8f04229 100644
119723--- a/net/ipv6/udp.c
119724+++ b/net/ipv6/udp.c
119725@@ -76,6 +76,10 @@ static u32 udp6_ehashfn(const struct net *net,
119726 udp_ipv6_hash_secret + net_hash_mix(net));
119727 }
119728
119729+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119730+extern int grsec_enable_blackhole;
119731+#endif
119732+
119733 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
119734 {
119735 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
119736@@ -445,7 +449,7 @@ try_again:
119737 if (unlikely(err)) {
119738 trace_kfree_skb(skb, udpv6_recvmsg);
119739 if (!peeked) {
119740- atomic_inc(&sk->sk_drops);
119741+ atomic_inc_unchecked(&sk->sk_drops);
119742 if (is_udp4)
119743 UDP_INC_STATS_USER(sock_net(sk),
119744 UDP_MIB_INERRORS,
119745@@ -709,7 +713,7 @@ csum_error:
119746 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119747 drop:
119748 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119749- atomic_inc(&sk->sk_drops);
119750+ atomic_inc_unchecked(&sk->sk_drops);
119751 kfree_skb(skb);
119752 return -1;
119753 }
119754@@ -750,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119755 if (likely(!skb1))
119756 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119757 if (!skb1) {
119758- atomic_inc(&sk->sk_drops);
119759+ atomic_inc_unchecked(&sk->sk_drops);
119760 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119761 IS_UDPLITE(sk));
119762 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119763@@ -934,6 +938,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119764 goto csum_error;
119765
119766 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119767+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119768+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119769+#endif
119770 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
119771
119772 kfree_skb(skb);
119773diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
119774index f337a90..2a9a9db 100644
119775--- a/net/ipv6/xfrm6_policy.c
119776+++ b/net/ipv6/xfrm6_policy.c
119777@@ -222,11 +222,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
119778 }
119779 }
119780
119781-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
119782+static int xfrm6_garbage_collect(struct dst_ops *ops)
119783 {
119784 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
119785
119786- xfrm6_policy_afinfo.garbage_collect(net);
119787+ xfrm_garbage_collect_deferred(net);
119788 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
119789 }
119790
119791@@ -338,19 +338,19 @@ static struct ctl_table xfrm6_policy_table[] = {
119792
119793 static int __net_init xfrm6_net_init(struct net *net)
119794 {
119795- struct ctl_table *table;
119796+ ctl_table_no_const *table = NULL;
119797 struct ctl_table_header *hdr;
119798
119799- table = xfrm6_policy_table;
119800 if (!net_eq(net, &init_net)) {
119801- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119802+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119803 if (!table)
119804 goto err_alloc;
119805
119806 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
119807- }
119808+ hdr = register_net_sysctl(net, "net/ipv6", table);
119809+ } else
119810+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
119811
119812- hdr = register_net_sysctl(net, "net/ipv6", table);
119813 if (!hdr)
119814 goto err_reg;
119815
119816@@ -358,8 +358,7 @@ static int __net_init xfrm6_net_init(struct net *net)
119817 return 0;
119818
119819 err_reg:
119820- if (!net_eq(net, &init_net))
119821- kfree(table);
119822+ kfree(table);
119823 err_alloc:
119824 return -ENOMEM;
119825 }
119826diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
119827index c1d247e..9e5949d 100644
119828--- a/net/ipx/ipx_proc.c
119829+++ b/net/ipx/ipx_proc.c
119830@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
119831 struct proc_dir_entry *p;
119832 int rc = -ENOMEM;
119833
119834- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
119835+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
119836
119837 if (!ipx_proc_dir)
119838 goto out;
119839diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
119840index 683346d..cb0e12d 100644
119841--- a/net/irda/ircomm/ircomm_tty.c
119842+++ b/net/irda/ircomm/ircomm_tty.c
119843@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119844 add_wait_queue(&port->open_wait, &wait);
119845
119846 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
119847- __FILE__, __LINE__, tty->driver->name, port->count);
119848+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119849
119850 spin_lock_irqsave(&port->lock, flags);
119851- port->count--;
119852+ atomic_dec(&port->count);
119853 port->blocked_open++;
119854 spin_unlock_irqrestore(&port->lock, flags);
119855
119856@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119857 }
119858
119859 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
119860- __FILE__, __LINE__, tty->driver->name, port->count);
119861+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119862
119863 schedule();
119864 }
119865@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119866
119867 spin_lock_irqsave(&port->lock, flags);
119868 if (!tty_hung_up_p(filp))
119869- port->count++;
119870+ atomic_inc(&port->count);
119871 port->blocked_open--;
119872 spin_unlock_irqrestore(&port->lock, flags);
119873
119874 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
119875- __FILE__, __LINE__, tty->driver->name, port->count);
119876+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119877
119878 if (!retval)
119879 port->flags |= ASYNC_NORMAL_ACTIVE;
119880@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
119881
119882 /* ++ is not atomic, so this should be protected - Jean II */
119883 spin_lock_irqsave(&self->port.lock, flags);
119884- self->port.count++;
119885+ atomic_inc(&self->port.count);
119886 spin_unlock_irqrestore(&self->port.lock, flags);
119887 tty_port_tty_set(&self->port, tty);
119888
119889 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
119890- self->line, self->port.count);
119891+ self->line, atomic_read(&self->port.count));
119892
119893 /* Not really used by us, but lets do it anyway */
119894 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
119895@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
119896 tty_kref_put(port->tty);
119897 }
119898 port->tty = NULL;
119899- port->count = 0;
119900+ atomic_set(&port->count, 0);
119901 spin_unlock_irqrestore(&port->lock, flags);
119902
119903 wake_up_interruptible(&port->open_wait);
119904@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
119905 seq_putc(m, '\n');
119906
119907 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
119908- seq_printf(m, "Open count: %d\n", self->port.count);
119909+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
119910 seq_printf(m, "Max data size: %d\n", self->max_data_size);
119911 seq_printf(m, "Max header size: %d\n", self->max_header_size);
119912
119913diff --git a/net/irda/irproc.c b/net/irda/irproc.c
119914index b9ac598..f88cc56 100644
119915--- a/net/irda/irproc.c
119916+++ b/net/irda/irproc.c
119917@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
119918 {
119919 int i;
119920
119921- proc_irda = proc_mkdir("irda", init_net.proc_net);
119922+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
119923 if (proc_irda == NULL)
119924 return;
119925
119926diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
119927index 6daa52a..786aa2b 100644
119928--- a/net/iucv/af_iucv.c
119929+++ b/net/iucv/af_iucv.c
119930@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
119931 {
119932 char name[12];
119933
119934- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
119935+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
119936 while (__iucv_get_sock_by_name(name)) {
119937 sprintf(name, "%08x",
119938- atomic_inc_return(&iucv_sk_list.autobind_name));
119939+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
119940 }
119941 memcpy(iucv->src_name, name, 8);
119942 }
119943diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
119944index 2a6a1fd..6c112b0 100644
119945--- a/net/iucv/iucv.c
119946+++ b/net/iucv/iucv.c
119947@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
119948 return NOTIFY_OK;
119949 }
119950
119951-static struct notifier_block __refdata iucv_cpu_notifier = {
119952+static struct notifier_block iucv_cpu_notifier = {
119953 .notifier_call = iucv_cpu_notify,
119954 };
119955
119956diff --git a/net/key/af_key.c b/net/key/af_key.c
119957index f0d52d7..9c9af38 100644
119958--- a/net/key/af_key.c
119959+++ b/net/key/af_key.c
119960@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
119961 static u32 get_acqseq(void)
119962 {
119963 u32 res;
119964- static atomic_t acqseq;
119965+ static atomic_unchecked_t acqseq;
119966
119967 do {
119968- res = atomic_inc_return(&acqseq);
119969+ res = atomic_inc_return_unchecked(&acqseq);
119970 } while (!res);
119971 return res;
119972 }
119973diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
119974index 4b55287..bd247f7 100644
119975--- a/net/l2tp/l2tp_eth.c
119976+++ b/net/l2tp/l2tp_eth.c
119977@@ -42,12 +42,12 @@ struct l2tp_eth {
119978 struct sock *tunnel_sock;
119979 struct l2tp_session *session;
119980 struct list_head list;
119981- atomic_long_t tx_bytes;
119982- atomic_long_t tx_packets;
119983- atomic_long_t tx_dropped;
119984- atomic_long_t rx_bytes;
119985- atomic_long_t rx_packets;
119986- atomic_long_t rx_errors;
119987+ atomic_long_unchecked_t tx_bytes;
119988+ atomic_long_unchecked_t tx_packets;
119989+ atomic_long_unchecked_t tx_dropped;
119990+ atomic_long_unchecked_t rx_bytes;
119991+ atomic_long_unchecked_t rx_packets;
119992+ atomic_long_unchecked_t rx_errors;
119993 };
119994
119995 /* via l2tp_session_priv() */
119996@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
119997 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
119998
119999 if (likely(ret == NET_XMIT_SUCCESS)) {
120000- atomic_long_add(len, &priv->tx_bytes);
120001- atomic_long_inc(&priv->tx_packets);
120002+ atomic_long_add_unchecked(len, &priv->tx_bytes);
120003+ atomic_long_inc_unchecked(&priv->tx_packets);
120004 } else {
120005- atomic_long_inc(&priv->tx_dropped);
120006+ atomic_long_inc_unchecked(&priv->tx_dropped);
120007 }
120008 return NETDEV_TX_OK;
120009 }
120010@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
120011 {
120012 struct l2tp_eth *priv = netdev_priv(dev);
120013
120014- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
120015- stats->tx_packets = atomic_long_read(&priv->tx_packets);
120016- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
120017- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
120018- stats->rx_packets = atomic_long_read(&priv->rx_packets);
120019- stats->rx_errors = atomic_long_read(&priv->rx_errors);
120020+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
120021+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
120022+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
120023+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
120024+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
120025+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
120026 return stats;
120027 }
120028
120029@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
120030 nf_reset(skb);
120031
120032 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
120033- atomic_long_inc(&priv->rx_packets);
120034- atomic_long_add(data_len, &priv->rx_bytes);
120035+ atomic_long_inc_unchecked(&priv->rx_packets);
120036+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
120037 } else {
120038- atomic_long_inc(&priv->rx_errors);
120039+ atomic_long_inc_unchecked(&priv->rx_errors);
120040 }
120041 return;
120042
120043 error:
120044- atomic_long_inc(&priv->rx_errors);
120045+ atomic_long_inc_unchecked(&priv->rx_errors);
120046 kfree_skb(skb);
120047 }
120048
120049diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
120050index 7964993..2c48a3a 100644
120051--- a/net/l2tp/l2tp_ip.c
120052+++ b/net/l2tp/l2tp_ip.c
120053@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
120054 .ops = &l2tp_ip_ops,
120055 };
120056
120057-static struct net_protocol l2tp_ip_protocol __read_mostly = {
120058+static const struct net_protocol l2tp_ip_protocol = {
120059 .handler = l2tp_ip_recv,
120060 .netns_ok = 1,
120061 };
120062diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
120063index d1ded37..c0d1e49 100644
120064--- a/net/l2tp/l2tp_ip6.c
120065+++ b/net/l2tp/l2tp_ip6.c
120066@@ -755,7 +755,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
120067 .ops = &l2tp_ip6_ops,
120068 };
120069
120070-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
120071+static const struct inet6_protocol l2tp_ip6_protocol = {
120072 .handler = l2tp_ip6_recv,
120073 };
120074
120075diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
120076index 1a3c7e0..80f8b0c 100644
120077--- a/net/llc/llc_proc.c
120078+++ b/net/llc/llc_proc.c
120079@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
120080 int rc = -ENOMEM;
120081 struct proc_dir_entry *p;
120082
120083- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
120084+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
120085 if (!llc_proc_dir)
120086 goto out;
120087
120088diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
120089index ff347a0..6ea4923 100644
120090--- a/net/mac80211/cfg.c
120091+++ b/net/mac80211/cfg.c
120092@@ -582,7 +582,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
120093 ret = ieee80211_vif_use_channel(sdata, chandef,
120094 IEEE80211_CHANCTX_EXCLUSIVE);
120095 }
120096- } else if (local->open_count == local->monitors) {
120097+ } else if (local_read(&local->open_count) == local->monitors) {
120098 local->_oper_chandef = *chandef;
120099 ieee80211_hw_config(local, 0);
120100 }
120101@@ -3428,7 +3428,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
120102 else
120103 local->probe_req_reg--;
120104
120105- if (!local->open_count)
120106+ if (!local_read(&local->open_count))
120107 break;
120108
120109 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
120110@@ -3563,8 +3563,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
120111 if (chanctx_conf) {
120112 *chandef = sdata->vif.bss_conf.chandef;
120113 ret = 0;
120114- } else if (local->open_count > 0 &&
120115- local->open_count == local->monitors &&
120116+ } else if (local_read(&local->open_count) > 0 &&
120117+ local_read(&local->open_count) == local->monitors &&
120118 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
120119 if (local->use_chanctx)
120120 *chandef = local->monitor_chandef;
120121diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
120122index c0a9187..2a13300 100644
120123--- a/net/mac80211/ieee80211_i.h
120124+++ b/net/mac80211/ieee80211_i.h
120125@@ -30,6 +30,7 @@
120126 #include <net/ieee80211_radiotap.h>
120127 #include <net/cfg80211.h>
120128 #include <net/mac80211.h>
120129+#include <asm/local.h>
120130 #include "key.h"
120131 #include "sta_info.h"
120132 #include "debug.h"
120133@@ -1118,7 +1119,7 @@ struct ieee80211_local {
120134 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
120135 spinlock_t queue_stop_reason_lock;
120136
120137- int open_count;
120138+ local_t open_count;
120139 int monitors, cooked_mntrs;
120140 /* number of interfaces with corresponding FIF_ flags */
120141 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
120142diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
120143index 84cef60..53ec813 100644
120144--- a/net/mac80211/iface.c
120145+++ b/net/mac80211/iface.c
120146@@ -550,7 +550,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120147 break;
120148 }
120149
120150- if (local->open_count == 0) {
120151+ if (local_read(&local->open_count) == 0) {
120152 res = drv_start(local);
120153 if (res)
120154 goto err_del_bss;
120155@@ -597,7 +597,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120156 res = drv_add_interface(local, sdata);
120157 if (res)
120158 goto err_stop;
120159- } else if (local->monitors == 0 && local->open_count == 0) {
120160+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
120161 res = ieee80211_add_virtual_monitor(local);
120162 if (res)
120163 goto err_stop;
120164@@ -707,7 +707,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120165 atomic_inc(&local->iff_promiscs);
120166
120167 if (coming_up)
120168- local->open_count++;
120169+ local_inc(&local->open_count);
120170
120171 if (hw_reconf_flags)
120172 ieee80211_hw_config(local, hw_reconf_flags);
120173@@ -745,7 +745,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120174 err_del_interface:
120175 drv_remove_interface(local, sdata);
120176 err_stop:
120177- if (!local->open_count)
120178+ if (!local_read(&local->open_count))
120179 drv_stop(local);
120180 err_del_bss:
120181 sdata->bss = NULL;
120182@@ -915,7 +915,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120183 }
120184
120185 if (going_down)
120186- local->open_count--;
120187+ local_dec(&local->open_count);
120188
120189 switch (sdata->vif.type) {
120190 case NL80211_IFTYPE_AP_VLAN:
120191@@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120192 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
120193 }
120194
120195- if (local->open_count == 0)
120196+ if (local_read(&local->open_count) == 0)
120197 ieee80211_clear_tx_pending(local);
120198
120199 /*
120200@@ -1027,7 +1027,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120201 if (cancel_scan)
120202 flush_delayed_work(&local->scan_work);
120203
120204- if (local->open_count == 0) {
120205+ if (local_read(&local->open_count) == 0) {
120206 ieee80211_stop_device(local);
120207
120208 /* no reconfiguring after stop! */
120209@@ -1038,7 +1038,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120210 ieee80211_configure_filter(local);
120211 ieee80211_hw_config(local, hw_reconf_flags);
120212
120213- if (local->monitors == local->open_count)
120214+ if (local->monitors == local_read(&local->open_count))
120215 ieee80211_add_virtual_monitor(local);
120216 }
120217
120218diff --git a/net/mac80211/main.c b/net/mac80211/main.c
120219index df3051d..359d2f4 100644
120220--- a/net/mac80211/main.c
120221+++ b/net/mac80211/main.c
120222@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
120223 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
120224 IEEE80211_CONF_CHANGE_POWER);
120225
120226- if (changed && local->open_count) {
120227+ if (changed && local_read(&local->open_count)) {
120228 ret = drv_config(local, changed);
120229 /*
120230 * Goal:
120231diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
120232index ac6ad62..77dbac5 100644
120233--- a/net/mac80211/pm.c
120234+++ b/net/mac80211/pm.c
120235@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120236 struct ieee80211_sub_if_data *sdata;
120237 struct sta_info *sta;
120238
120239- if (!local->open_count)
120240+ if (!local_read(&local->open_count))
120241 goto suspend;
120242
120243 ieee80211_scan_cancel(local);
120244@@ -150,7 +150,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120245 WARN_ON(!list_empty(&local->chanctx_list));
120246
120247 /* stop hardware - this must stop RX */
120248- if (local->open_count)
120249+ if (local_read(&local->open_count))
120250 ieee80211_stop_device(local);
120251
120252 suspend:
120253diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
120254index d53355b..21f583a 100644
120255--- a/net/mac80211/rate.c
120256+++ b/net/mac80211/rate.c
120257@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
120258
120259 ASSERT_RTNL();
120260
120261- if (local->open_count)
120262+ if (local_read(&local->open_count))
120263 return -EBUSY;
120264
120265 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
120266diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
120267index 2880f2a..3085cec 100644
120268--- a/net/mac80211/sta_info.c
120269+++ b/net/mac80211/sta_info.c
120270@@ -339,7 +339,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
120271 int size = sizeof(struct txq_info) +
120272 ALIGN(hw->txq_data_size, sizeof(void *));
120273
120274- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
120275+ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
120276 if (!txq_data)
120277 goto free;
120278
120279diff --git a/net/mac80211/util.c b/net/mac80211/util.c
120280index b864ebc..17326ff 100644
120281--- a/net/mac80211/util.c
120282+++ b/net/mac80211/util.c
120283@@ -1761,7 +1761,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120284 bool sched_scan_stopped = false;
120285
120286 /* nothing to do if HW shouldn't run */
120287- if (!local->open_count)
120288+ if (!local_read(&local->open_count))
120289 goto wake_up;
120290
120291 #ifdef CONFIG_PM
120292@@ -2033,7 +2033,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120293 local->in_reconfig = false;
120294 barrier();
120295
120296- if (local->monitors == local->open_count && local->monitors > 0)
120297+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
120298 ieee80211_add_virtual_monitor(local);
120299
120300 /*
120301@@ -2088,7 +2088,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120302 * If this is for hw restart things are still running.
120303 * We may want to change that later, however.
120304 */
120305- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
120306+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
120307 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
120308
120309 if (!local->suspended)
120310@@ -2112,7 +2112,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120311 flush_delayed_work(&local->scan_work);
120312 }
120313
120314- if (local->open_count && !reconfig_due_to_wowlan)
120315+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
120316 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
120317
120318 list_for_each_entry(sdata, &local->interfaces, list) {
120319diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
120320index 1f93a59..96faa29 100644
120321--- a/net/mpls/af_mpls.c
120322+++ b/net/mpls/af_mpls.c
120323@@ -456,7 +456,7 @@ static int mpls_dev_sysctl_register(struct net_device *dev,
120324 struct mpls_dev *mdev)
120325 {
120326 char path[sizeof("net/mpls/conf/") + IFNAMSIZ];
120327- struct ctl_table *table;
120328+ ctl_table_no_const *table;
120329 int i;
120330
120331 table = kmemdup(&mpls_dev_table, sizeof(mpls_dev_table), GFP_KERNEL);
120332@@ -1025,7 +1025,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
120333 struct net *net = table->data;
120334 int platform_labels = net->mpls.platform_labels;
120335 int ret;
120336- struct ctl_table tmp = {
120337+ ctl_table_no_const tmp = {
120338 .procname = table->procname,
120339 .data = &platform_labels,
120340 .maxlen = sizeof(int),
120341@@ -1055,7 +1055,7 @@ static const struct ctl_table mpls_table[] = {
120342
120343 static int mpls_net_init(struct net *net)
120344 {
120345- struct ctl_table *table;
120346+ ctl_table_no_const *table;
120347
120348 net->mpls.platform_labels = 0;
120349 net->mpls.platform_label = NULL;
120350diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
120351index a0f3e6a3..b026fe2 100644
120352--- a/net/netfilter/Kconfig
120353+++ b/net/netfilter/Kconfig
120354@@ -1112,6 +1112,16 @@ config NETFILTER_XT_MATCH_ESP
120355
120356 To compile it as a module, choose M here. If unsure, say N.
120357
120358+config NETFILTER_XT_MATCH_GRADM
120359+ tristate '"gradm" match support'
120360+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
120361+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
120362+ ---help---
120363+ The gradm match allows to match on grsecurity RBAC being enabled.
120364+ It is useful when iptables rules are applied early on bootup to
120365+ prevent connections to the machine (except from a trusted host)
120366+ while the RBAC system is disabled.
120367+
120368 config NETFILTER_XT_MATCH_HASHLIMIT
120369 tristate '"hashlimit" match support'
120370 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
120371diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
120372index a87d8b8..d43183c 100644
120373--- a/net/netfilter/Makefile
120374+++ b/net/netfilter/Makefile
120375@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
120376 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
120377 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
120378 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
120379+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
120380 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
120381 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
120382 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
120383diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
120384index d259da3..6a32b2c 100644
120385--- a/net/netfilter/ipset/ip_set_core.c
120386+++ b/net/netfilter/ipset/ip_set_core.c
120387@@ -1952,7 +1952,7 @@ done:
120388 return ret;
120389 }
120390
120391-static struct nf_sockopt_ops so_set __read_mostly = {
120392+static struct nf_sockopt_ops so_set = {
120393 .pf = PF_INET,
120394 .get_optmin = SO_IP_SET,
120395 .get_optmax = SO_IP_SET + 1,
120396diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
120397index b0f7b62..0541842 100644
120398--- a/net/netfilter/ipvs/ip_vs_conn.c
120399+++ b/net/netfilter/ipvs/ip_vs_conn.c
120400@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
120401 /* Increase the refcnt counter of the dest */
120402 ip_vs_dest_hold(dest);
120403
120404- conn_flags = atomic_read(&dest->conn_flags);
120405+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
120406 if (cp->protocol != IPPROTO_UDP)
120407 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
120408 flags = cp->flags;
120409@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
120410
120411 cp->control = NULL;
120412 atomic_set(&cp->n_control, 0);
120413- atomic_set(&cp->in_pkts, 0);
120414+ atomic_set_unchecked(&cp->in_pkts, 0);
120415
120416 cp->packet_xmit = NULL;
120417 cp->app = NULL;
120418@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
120419
120420 /* Don't drop the entry if its number of incoming packets is not
120421 located in [0, 8] */
120422- i = atomic_read(&cp->in_pkts);
120423+ i = atomic_read_unchecked(&cp->in_pkts);
120424 if (i > 8 || i < 0) return 0;
120425
120426 if (!todrop_rate[i]) return 0;
120427diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
120428index 5d2b806..9005b29 100644
120429--- a/net/netfilter/ipvs/ip_vs_core.c
120430+++ b/net/netfilter/ipvs/ip_vs_core.c
120431@@ -574,7 +574,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
120432 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
120433 /* do not touch skb anymore */
120434
120435- atomic_inc(&cp->in_pkts);
120436+ atomic_inc_unchecked(&cp->in_pkts);
120437 ip_vs_conn_put(cp);
120438 return ret;
120439 }
120440@@ -1750,7 +1750,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
120441 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
120442 pkts = sysctl_sync_threshold(ipvs);
120443 else
120444- pkts = atomic_add_return(1, &cp->in_pkts);
120445+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120446
120447 if (ipvs->sync_state & IP_VS_STATE_MASTER)
120448 ip_vs_sync_conn(net, cp, pkts);
120449diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
120450index 285eae3..226f4a7 100644
120451--- a/net/netfilter/ipvs/ip_vs_ctl.c
120452+++ b/net/netfilter/ipvs/ip_vs_ctl.c
120453@@ -814,7 +814,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
120454 */
120455 ip_vs_rs_hash(ipvs, dest);
120456 }
120457- atomic_set(&dest->conn_flags, conn_flags);
120458+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
120459
120460 /* bind the service */
120461 old_svc = rcu_dereference_protected(dest->svc, 1);
120462@@ -1679,7 +1679,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
120463 * align with netns init in ip_vs_control_net_init()
120464 */
120465
120466-static struct ctl_table vs_vars[] = {
120467+static ctl_table_no_const vs_vars[] __read_only = {
120468 {
120469 .procname = "amemthresh",
120470 .maxlen = sizeof(int),
120471@@ -2020,7 +2020,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120472 " %-7s %-6d %-10d %-10d\n",
120473 &dest->addr.in6,
120474 ntohs(dest->port),
120475- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120476+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120477 atomic_read(&dest->weight),
120478 atomic_read(&dest->activeconns),
120479 atomic_read(&dest->inactconns));
120480@@ -2031,7 +2031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120481 "%-7s %-6d %-10d %-10d\n",
120482 ntohl(dest->addr.ip),
120483 ntohs(dest->port),
120484- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120485+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120486 atomic_read(&dest->weight),
120487 atomic_read(&dest->activeconns),
120488 atomic_read(&dest->inactconns));
120489@@ -2528,7 +2528,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
120490
120491 entry.addr = dest->addr.ip;
120492 entry.port = dest->port;
120493- entry.conn_flags = atomic_read(&dest->conn_flags);
120494+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
120495 entry.weight = atomic_read(&dest->weight);
120496 entry.u_threshold = dest->u_threshold;
120497 entry.l_threshold = dest->l_threshold;
120498@@ -3101,7 +3101,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
120499 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
120500 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
120501 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
120502- (atomic_read(&dest->conn_flags) &
120503+ (atomic_read_unchecked(&dest->conn_flags) &
120504 IP_VS_CONN_F_FWD_MASK)) ||
120505 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
120506 atomic_read(&dest->weight)) ||
120507@@ -3739,7 +3739,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
120508 {
120509 int idx;
120510 struct netns_ipvs *ipvs = net_ipvs(net);
120511- struct ctl_table *tbl;
120512+ ctl_table_no_const *tbl;
120513
120514 atomic_set(&ipvs->dropentry, 0);
120515 spin_lock_init(&ipvs->dropentry_lock);
120516diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
120517index 127f140..553d652 100644
120518--- a/net/netfilter/ipvs/ip_vs_lblc.c
120519+++ b/net/netfilter/ipvs/ip_vs_lblc.c
120520@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
120521 * IPVS LBLC sysctl table
120522 */
120523 #ifdef CONFIG_SYSCTL
120524-static struct ctl_table vs_vars_table[] = {
120525+static ctl_table_no_const vs_vars_table[] __read_only = {
120526 {
120527 .procname = "lblc_expiration",
120528 .data = NULL,
120529diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
120530index 2229d2d..b32b785 100644
120531--- a/net/netfilter/ipvs/ip_vs_lblcr.c
120532+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
120533@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
120534 * IPVS LBLCR sysctl table
120535 */
120536
120537-static struct ctl_table vs_vars_table[] = {
120538+static ctl_table_no_const vs_vars_table[] __read_only = {
120539 {
120540 .procname = "lblcr_expiration",
120541 .data = NULL,
120542diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
120543index 19b9cce..e4f3112 100644
120544--- a/net/netfilter/ipvs/ip_vs_sync.c
120545+++ b/net/netfilter/ipvs/ip_vs_sync.c
120546@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
120547 cp = cp->control;
120548 if (cp) {
120549 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120550- pkts = atomic_add_return(1, &cp->in_pkts);
120551+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120552 else
120553 pkts = sysctl_sync_threshold(ipvs);
120554 ip_vs_sync_conn(net, cp->control, pkts);
120555@@ -771,7 +771,7 @@ control:
120556 if (!cp)
120557 return;
120558 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120559- pkts = atomic_add_return(1, &cp->in_pkts);
120560+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120561 else
120562 pkts = sysctl_sync_threshold(ipvs);
120563 goto sloop;
120564@@ -919,7 +919,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
120565
120566 if (opt)
120567 memcpy(&cp->in_seq, opt, sizeof(*opt));
120568- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120569+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120570 cp->state = state;
120571 cp->old_state = cp->state;
120572 /*
120573diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
120574index 19986ec..416dbc5 100644
120575--- a/net/netfilter/ipvs/ip_vs_xmit.c
120576+++ b/net/netfilter/ipvs/ip_vs_xmit.c
120577@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
120578 else
120579 rc = NF_ACCEPT;
120580 /* do not touch skb anymore */
120581- atomic_inc(&cp->in_pkts);
120582+ atomic_inc_unchecked(&cp->in_pkts);
120583 goto out;
120584 }
120585
120586@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
120587 else
120588 rc = NF_ACCEPT;
120589 /* do not touch skb anymore */
120590- atomic_inc(&cp->in_pkts);
120591+ atomic_inc_unchecked(&cp->in_pkts);
120592 goto out;
120593 }
120594
120595diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
120596index 45da11a..ef3e5dc 100644
120597--- a/net/netfilter/nf_conntrack_acct.c
120598+++ b/net/netfilter/nf_conntrack_acct.c
120599@@ -64,7 +64,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
120600 #ifdef CONFIG_SYSCTL
120601 static int nf_conntrack_acct_init_sysctl(struct net *net)
120602 {
120603- struct ctl_table *table;
120604+ ctl_table_no_const *table;
120605
120606 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
120607 GFP_KERNEL);
120608diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
120609index 13fad86..18c984c 100644
120610--- a/net/netfilter/nf_conntrack_core.c
120611+++ b/net/netfilter/nf_conntrack_core.c
120612@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
120613 #define DYING_NULLS_VAL ((1<<30)+1)
120614 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
120615
120616+#ifdef CONFIG_GRKERNSEC_HIDESYM
120617+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
120618+#endif
120619+
120620 int nf_conntrack_init_net(struct net *net)
120621 {
120622 int ret = -ENOMEM;
120623@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
120624 if (!net->ct.stat)
120625 goto err_pcpu_lists;
120626
120627+#ifdef CONFIG_GRKERNSEC_HIDESYM
120628+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
120629+#else
120630 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
120631+#endif
120632 if (!net->ct.slabname)
120633 goto err_slabname;
120634
120635diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
120636index 4e78c57..ec8fb74 100644
120637--- a/net/netfilter/nf_conntrack_ecache.c
120638+++ b/net/netfilter/nf_conntrack_ecache.c
120639@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
120640 #ifdef CONFIG_SYSCTL
120641 static int nf_conntrack_event_init_sysctl(struct net *net)
120642 {
120643- struct ctl_table *table;
120644+ ctl_table_no_const *table;
120645
120646 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
120647 GFP_KERNEL);
120648diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
120649index bd9d315..989947e 100644
120650--- a/net/netfilter/nf_conntrack_helper.c
120651+++ b/net/netfilter/nf_conntrack_helper.c
120652@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
120653
120654 static int nf_conntrack_helper_init_sysctl(struct net *net)
120655 {
120656- struct ctl_table *table;
120657+ ctl_table_no_const *table;
120658
120659 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
120660 GFP_KERNEL);
120661diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
120662index b65d586..beec902 100644
120663--- a/net/netfilter/nf_conntrack_proto.c
120664+++ b/net/netfilter/nf_conntrack_proto.c
120665@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
120666
120667 static void
120668 nf_ct_unregister_sysctl(struct ctl_table_header **header,
120669- struct ctl_table **table,
120670+ ctl_table_no_const **table,
120671 unsigned int users)
120672 {
120673 if (users > 0)
120674diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
120675index fc823fa..8311af3 100644
120676--- a/net/netfilter/nf_conntrack_standalone.c
120677+++ b/net/netfilter/nf_conntrack_standalone.c
120678@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
120679
120680 static int nf_conntrack_standalone_init_sysctl(struct net *net)
120681 {
120682- struct ctl_table *table;
120683+ ctl_table_no_const *table;
120684
120685 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
120686 GFP_KERNEL);
120687diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
120688index 7a394df..bd91a8a 100644
120689--- a/net/netfilter/nf_conntrack_timestamp.c
120690+++ b/net/netfilter/nf_conntrack_timestamp.c
120691@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
120692 #ifdef CONFIG_SYSCTL
120693 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
120694 {
120695- struct ctl_table *table;
120696+ ctl_table_no_const *table;
120697
120698 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
120699 GFP_KERNEL);
120700diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
120701index 675d12c..b36e825 100644
120702--- a/net/netfilter/nf_log.c
120703+++ b/net/netfilter/nf_log.c
120704@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
120705
120706 #ifdef CONFIG_SYSCTL
120707 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
120708-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
120709+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
120710
120711 static int nf_log_proc_dostring(struct ctl_table *table, int write,
120712 void __user *buffer, size_t *lenp, loff_t *ppos)
120713@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
120714 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
120715 mutex_unlock(&nf_log_mutex);
120716 } else {
120717+ ctl_table_no_const nf_log_table = *table;
120718+
120719 mutex_lock(&nf_log_mutex);
120720 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
120721 if (!logger)
120722- table->data = "NONE";
120723+ nf_log_table.data = "NONE";
120724 else
120725- table->data = logger->name;
120726- r = proc_dostring(table, write, buffer, lenp, ppos);
120727+ nf_log_table.data = logger->name;
120728+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
120729 mutex_unlock(&nf_log_mutex);
120730 }
120731
120732diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
120733index c68c1e5..8b5d670 100644
120734--- a/net/netfilter/nf_sockopt.c
120735+++ b/net/netfilter/nf_sockopt.c
120736@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
120737 }
120738 }
120739
120740- list_add(&reg->list, &nf_sockopts);
120741+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
120742 out:
120743 mutex_unlock(&nf_sockopt_mutex);
120744 return ret;
120745@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
120746 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
120747 {
120748 mutex_lock(&nf_sockopt_mutex);
120749- list_del(&reg->list);
120750+ pax_list_del((struct list_head *)&reg->list);
120751 mutex_unlock(&nf_sockopt_mutex);
120752 }
120753 EXPORT_SYMBOL(nf_unregister_sockopt);
120754diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
120755index 4ef1fae..f72f08b 100644
120756--- a/net/netfilter/nfnetlink_log.c
120757+++ b/net/netfilter/nfnetlink_log.c
120758@@ -84,7 +84,7 @@ static int nfnl_log_net_id __read_mostly;
120759 struct nfnl_log_net {
120760 spinlock_t instances_lock;
120761 struct hlist_head instance_table[INSTANCE_BUCKETS];
120762- atomic_t global_seq;
120763+ atomic_unchecked_t global_seq;
120764 };
120765
120766 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
120767@@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log,
120768 /* global sequence number */
120769 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
120770 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
120771- htonl(atomic_inc_return(&log->global_seq))))
120772+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
120773 goto nla_put_failure;
120774
120775 if (data_len) {
120776diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
120777index 7f29cfc..917ef5f 100644
120778--- a/net/netfilter/nft_compat.c
120779+++ b/net/netfilter/nft_compat.c
120780@@ -321,14 +321,7 @@ static void nft_match_eval(const struct nft_expr *expr,
120781 return;
120782 }
120783
120784- switch (ret ? 1 : 0) {
120785- case 1:
120786- regs->verdict.code = NFT_CONTINUE;
120787- break;
120788- case 0:
120789- regs->verdict.code = NFT_BREAK;
120790- break;
120791- }
120792+ regs->verdict.code = ret ? NFT_CONTINUE : NFT_BREAK;
120793 }
120794
120795 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
120796diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
120797new file mode 100644
120798index 0000000..c566332
120799--- /dev/null
120800+++ b/net/netfilter/xt_gradm.c
120801@@ -0,0 +1,51 @@
120802+/*
120803+ * gradm match for netfilter
120804